summaryrefslogtreecommitdiff
path: root/src/lib/json_server.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-21 01:36:09 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-21 01:36:09 +0100
commiteb3f28f4e614455a4d070d5fa2caaa24b9d9139c (patch)
tree3831bb8b6c3e533b1376a207b45c67c4425fa365 /src/lib/json_server.cc
parent5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f (diff)
Revert make_shared<> change which breaks build on some platforms; don't know why yet.
Diffstat (limited to 'src/lib/json_server.cc')
-rw-r--r--src/lib/json_server.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/json_server.cc b/src/lib/json_server.cc
index 6e53f9819..0006201e6 100644
--- a/src/lib/json_server.cc
+++ b/src/lib/json_server.cc
@@ -27,7 +27,6 @@
#include "util.h"
#include "film.h"
#include "transcode_job.h"
-#include <boost/make_shared.hpp>
#include <iostream>
using std::string;
@@ -36,7 +35,6 @@ using std::map;
using std::list;
using boost::thread;
using boost::shared_ptr;
-using boost::make_shared;
using boost::dynamic_pointer_cast;
using boost::asio::ip::tcp;
@@ -63,7 +61,7 @@ try
tcp::acceptor a (io_service, tcp::endpoint (tcp::v4 (), port));
while (true) {
try {
- shared_ptr<tcp::socket> s = make_shared<tcp::socket> (io_service);
+ shared_ptr<tcp::socket> s (new tcp::socket (io_service));
a.accept (*s);
handle (s);
}