projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
server_finder.cc
diff --git
a/src/lib/server_finder.cc
b/src/lib/server_finder.cc
index de8a3852c5cf45c0abd52faaf94b4f08ee24e94c..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;
#include "ui_signaller.h"
using std::string;
-using std::stringstream;
using std::list;
using std::vector;
using std::cout;
using std::list;
using std::vector;
using std::cout;
@@
-103,7
+102,7
@@
void
ServerFinder::listen_thread ()
try
{
ServerFinder::listen_thread ()
try
{
- while (
1
) {
+ while (
true
) {
shared_ptr<Socket> sock (new Socket (60));
try {
shared_ptr<Socket> sock (new Socket (60));
try {
@@
-116,9
+115,9
@@
try
scoped_array<char> buffer (new char[length]);
sock->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
scoped_array<char> buffer (new char[length]);
sock->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
- string
stream
s (buffer.get());
+ string s (buffer.get());
shared_ptr<cxml::Document> xml (new cxml::Document ("ServerAvailable"));
shared_ptr<cxml::Document> xml (new cxml::Document ("ServerAvailable"));
- xml->read_str
eam
(s);
+ xml->read_str
ing
(s);
string const ip = sock->socket().remote_endpoint().address().to_string ();
if (!server_found (ip)) {
string const ip = sock->socket().remote_endpoint().address().to_string ();
if (!server_found (ip)) {