summaryrefslogtreecommitdiff
path: root/src/lib/encode_server.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-21 23:08:53 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-21 23:08:53 +0100
commita8a0dfd1b21de6c0facf965ab119833ff6f790bf (patch)
tree88bd3a7dd6d4ae56a1efa9b7443c341550759869 /src/lib/encode_server.cc
parente669b562937786bf5b771c927cc03a4074b01be8 (diff)
Revert "Use make_shared<>."
Support for this seems to vary wildly across DoM's build targets. Stuff that builds on 16.04 won't build on 14.04, for example. Seems to not be worth the hassle now. This reverts commit 5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f.
Diffstat (limited to 'src/lib/encode_server.cc')
-rw-r--r--src/lib/encode_server.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 635913cc2..f318da03b 100644
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -41,7 +41,6 @@
#include <boost/algorithm/string.hpp>
#include <boost/scoped_array.hpp>
#include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
#include <string>
#include <vector>
#include <iostream>
@@ -64,7 +63,6 @@ using boost::thread;
using boost::bind;
using boost::scoped_array;
using boost::optional;
-using boost::make_shared;
using dcp::Size;
using dcp::Data;
@@ -110,7 +108,7 @@ EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, st
socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
string s (buffer.get());
- shared_ptr<cxml::Document> xml = make_shared<cxml::Document> ("EncodingRequest");
+ shared_ptr<cxml::Document> xml (new cxml::Document ("EncodingRequest"));
xml->read_string (s);
/* This is a double-check; the server shouldn't even be on the candidate list
if it is the wrong version, but it doesn't hurt to make sure here.
@@ -121,7 +119,7 @@ EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, st
return -1;
}
- shared_ptr<PlayerVideo> pvf = make_shared<PlayerVideo> (xml, socket);
+ shared_ptr<PlayerVideo> pvf (new PlayerVideo (xml, socket));
DCPVideo dcp_video_frame (pvf, xml, _log);
@@ -266,7 +264,7 @@ EncodeServer::broadcast_received ()
if (_verbose) {
cout << "Offering services to master " << _broadcast.send_endpoint.address().to_string () << "\n";
}
- shared_ptr<Socket> socket = make_shared<Socket> ();
+ shared_ptr<Socket> socket (new Socket);
try {
socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), Config::instance()->server_port_base() + 1));
socket->write (xml.length() + 1);