Use make_shared<>.

[dcpomatic.git] / src / lib / config.cc

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 891d832a24c6575a6e4b1130bb149334416e673b..8e1997325593f6845889bfc6096858593ecfb738 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -39,6 +39,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 #include <boost/thread.hpp>
+#include <boost/make_shared.hpp>
 #include <cstdlib>
 #include <fstream>
 #include <iostream>
@@ -55,6 +56,7 @@ using std::remove;
 using std::exception;
 using std::cerr;
 using boost::shared_ptr;
+using boost::make_shared;
 using boost::optional;
 using boost::algorithm::trim;
 
@@ -267,7 +269,7 @@ Config::read ()
 
        cxml::NodePtr signer = f.optional_node_child ("Signer");
        if (signer) {
-               shared_ptr<dcp::CertificateChain> c (new dcp::CertificateChain ());
+               shared_ptr<dcp::CertificateChain> c = make_shared<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 ()));
@@ -281,7 +283,7 @@ Config::read ()
 
        cxml::NodePtr decryption = f.optional_node_child ("Decryption");
        if (decryption) {
-               shared_ptr<dcp::CertificateChain> c (new dcp::CertificateChain ());
+               shared_ptr<dcp::CertificateChain> c = make_shared<dcp::CertificateChain> ();
                BOOST_FOREACH (cxml::NodePtr i, decryption->node_children ("Certificate")) {
                        c->add (dcp::Certificate (i->content ()));
                }
@@ -559,7 +561,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> cinema (new Cinema (*i));
+               shared_ptr<Cinema> cinema = make_shared<Cinema> (*i);
                cinema->read_screens (*i);
                _cinemas.push_back (cinema);
        }