projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert make_shared<> change which breaks build on some platforms; don't know why...
[dcpomatic.git]
/
src
/
lib
/
json_server.cc
diff --git
a/src/lib/json_server.cc
b/src/lib/json_server.cc
index 6e53f9819c3fcddd2bc1c21324705037556ef5ef..0006201e66c3b6a04bb52d01c4fa222ad55d3a37 100644
(file)
--- 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 "util.h"
#include "film.h"
#include "transcode_job.h"
-#include <boost/make_shared.hpp>
#include <iostream>
using std::string;
#include <iostream>
using std::string;
@@
-36,7
+35,6
@@
using std::map;
using std::list;
using boost::thread;
using boost::shared_ptr;
using std::list;
using boost::thread;
using boost::shared_ptr;
-using boost::make_shared;
using boost::dynamic_pointer_cast;
using boost::asio::ip::tcp;
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 {
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);
}
a.accept (*s);
handle (s);
}