From: Carl Hetherington <cth@carlh.net>
Date: Tue, 21 Jun 2016 00:36:09 +0000 (+0100)
Subject: Revert make_shared<> change which breaks build on some platforms; don't know why... 
X-Git-Tag: v2.8.13~11
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=eb3f28f4e614455a4d070d5fa2caaa24b9d9139c

Revert make_shared<> change which breaks build on some platforms; don't know why yet.
---

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);
 		}