diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
| commit | 8c7a308c03e4b4196b4e2379a26d432b100ae2b1 (patch) | |
| tree | 605c8b62f56c5f9be2ff77161eb18ac372083a35 /src/lib/server_finder.cc | |
| parent | 04acfa42cdffd5938358847ebee822399ef978e6 (diff) | |
| parent | a6d6a794b28c3b3e6679f01c1890f396453eb5ac (diff) | |
Merge master.
Diffstat (limited to 'src/lib/server_finder.cc')
| -rw-r--r-- | src/lib/server_finder.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc index 9b0cd0376..14cb3af59 100644 --- 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)) { |