X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=891d832a24c6575a6e4b1130bb149334416e673b;hp=8e1997325593f6845889bfc6096858593ecfb738;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=e669b562937786bf5b771c927cc03a4074b01be8 diff --git a/src/lib/config.cc b/src/lib/config.cc index 8e1997325..891d832a2 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include @@ -56,7 +55,6 @@ using std::remove; using std::exception; using std::cerr; using boost::shared_ptr; -using boost::make_shared; using boost::optional; using boost::algorithm::trim; @@ -269,7 +267,7 @@ Config::read () cxml::NodePtr signer = f.optional_node_child ("Signer"); if (signer) { - shared_ptr c = make_shared (); + shared_ptr c (new dcp::CertificateChain ()); /* Read the signing certificates and private key in from the config file */ BOOST_FOREACH (cxml::NodePtr i, signer->node_children ("Certificate")) { c->add (dcp::Certificate (i->content ())); @@ -283,7 +281,7 @@ Config::read () cxml::NodePtr decryption = f.optional_node_child ("Decryption"); if (decryption) { - shared_ptr c = make_shared (); + shared_ptr c (new dcp::CertificateChain ()); BOOST_FOREACH (cxml::NodePtr i, decryption->node_children ("Certificate")) { c->add (dcp::Certificate (i->content ())); } @@ -561,7 +559,7 @@ Config::read_cinemas (cxml::Document const & f) /* Slightly grotty two-part construction of Cinema here so that we can use shared_from_this. */ - shared_ptr cinema = make_shared (*i); + shared_ptr cinema (new Cinema (*i)); cinema->read_screens (*i); _cinemas.push_back (cinema); }