From e669b562937786bf5b771c927cc03a4074b01be8 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 21 Jun 2016 23:08:44 +0100
Subject: Revert "Revert make_shared<> change which breaks build on some
 platforms; don't know why yet."

This reverts commit eb3f28f4e614455a4d070d5fa2caaa24b9d9139c.
---
 src/lib/json_server.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/lib/json_server.cc')

diff --git a/src/lib/json_server.cc b/src/lib/json_server.cc
index 0006201e6..6e53f9819 100644
--- a/src/lib/json_server.cc
+++ b/src/lib/json_server.cc
@@ -27,6 +27,7 @@
 #include "util.h"
 #include "film.h"
 #include "transcode_job.h"
+#include <boost/make_shared.hpp>
 #include <iostream>
 
 using std::string;
@@ -35,6 +36,7 @@ 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;
 
@@ -61,7 +63,7 @@ try
 	tcp::acceptor a (io_service, tcp::endpoint (tcp::v4 (), port));
 	while (true) {
 		try {
-			shared_ptr<tcp::socket> s (new tcp::socket (io_service));
+			shared_ptr<tcp::socket> s = make_shared<tcp::socket> (io_service);
 			a.accept (*s);
 			handle (s);
 		}
-- 
cgit v1.2.3