projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add our own raw_convert that uses SafeStringStream.
[dcpomatic.git]
/
src
/
lib
/
server.h
diff --git
a/src/lib/server.h
b/src/lib/server.h
index b340bba077953c7320c0fb9f1820e3ca2cf2a556..1dc3b7b4edf92d1c3545458c30ea1c8185c67f1c 100644
(file)
--- a/
src/lib/server.h
+++ b/
src/lib/server.h
@@
-25,14
+25,14
@@
* encoding work, and a class to implement such a server.
*/
* encoding work, and a class to implement such a server.
*/
-#include <string>
+#include "log.h"
+#include "exceptions.h"
+#include <libxml++/libxml++.h>
#include <boost/thread.hpp>
#include <boost/asio.hpp>
#include <boost/thread/condition.hpp>
#include <boost/optional.hpp>
#include <boost/thread.hpp>
#include <boost/asio.hpp>
#include <boost/thread/condition.hpp>
#include <boost/optional.hpp>
-#include <libxml++/libxml++.h>
-#include "log.h"
-#include "exceptions.h"
+#include <string>
class Socket;
class Socket;
@@
-115,8
+115,6
@@
private:
boost::asio::io_service _io_service;
boost::asio::ip::tcp::acceptor _acceptor;
boost::asio::io_service _io_service;
boost::asio::ip::tcp::acceptor _acceptor;
- int _num_threads;
-
struct Broadcast {
Broadcast ()
struct Broadcast {
Broadcast ()