Merge master.

[dcpomatic.git] / src / lib / server_finder.cc

diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index 9b0cd037679f9351c5a9112537dbef283235a4ed..14cb3af5999ac5ff7ccb434d39371addcbb18a6d 100644 (file)
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -27,7 +27,6 @@
 #include "ui_signaller.h"
 
 using std::string;
-using std::stringstream;
 using std::list;
 using std::vector;
 using std::cout;
@@ -116,9 +115,9 @@ try
                scoped_array<char> buffer (new char[length]);
                sock->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
                
-               stringstream s (buffer.get());
+               string s (buffer.get());
                shared_ptr<cxml::Document> xml (new cxml::Document ("ServerAvailable"));
-               xml->read_stream (s);
+               xml->read_string (s);
 
                string const ip = sock->socket().remote_endpoint().address().to_string ();
                if (!server_found (ip)) {