projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop using static initialisation so that dcpomatic::write() can be called more than...
[dcpomatic.git]
/
src
/
lib
/
dcpomatic_socket.cc
diff --git
a/src/lib/dcpomatic_socket.cc
b/src/lib/dcpomatic_socket.cc
index a0a7a1cf3f3d877ee92aa204c2ad3c23f162a754..a92a294e6a05668dfa9ad10d8f982f85680a588d 100644
(file)
--- a/
src/lib/dcpomatic_socket.cc
+++ b/
src/lib/dcpomatic_socket.cc
@@
-22,14
+22,14
@@
#include "compose.hpp"
#include "exceptions.h"
#include "dcpomatic_assert.h"
#include "compose.hpp"
#include "exceptions.h"
#include "dcpomatic_assert.h"
-#include <boost/bind.hpp>
+#include <boost/bind
/bind
.hpp>
#include <boost/lambda/lambda.hpp>
#include <iostream>
#include "i18n.h"
#include <boost/lambda/lambda.hpp>
#include <iostream>
#include "i18n.h"
-using
boost
::shared_ptr;
-using
boost
::weak_ptr;
+using
std
::shared_ptr;
+using
std
::weak_ptr;
/** @param timeout Timeout in seconds */
Socket::Socket (int timeout)
/** @param timeout Timeout in seconds */
Socket::Socket (int timeout)