diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-21 01:14:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-21 01:14:06 +0100 |
| commit | 5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f (patch) | |
| tree | 769dca1358e35017ce5a5b3ab2dfafe2b24d61ed /test/import_dcp_test.cc | |
| parent | 4e83acad0c2a5c528709a175a80261b8147d3b49 (diff) | |
Use make_shared<>.
Diffstat (limited to 'test/import_dcp_test.cc')
| -rw-r--r-- | test/import_dcp_test.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc index 69ffa9cc4..3dc9333da 100644 --- a/test/import_dcp_test.cc +++ b/test/import_dcp_test.cc @@ -29,9 +29,11 @@ #include "lib/cross.h" #include <dcp/cpl.h> #include <boost/test/unit_test.hpp> +#include <boost/make_shared.hpp> using std::vector; using boost::shared_ptr; +using boost::make_shared; /** Make an encrypted DCP, import it and make a new unencrypted DCP */ BOOST_AUTO_TEST_CASE (import_dcp_test) @@ -41,7 +43,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_test) A->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); A->set_name ("frobozz"); - shared_ptr<FFmpegContent> c (new FFmpegContent (A, "test/data/test.mp4")); + shared_ptr<FFmpegContent> c = make_shared<FFmpegContent> (A, "test/data/test.mp4"); A->examine_and_add_content (c); A->set_encrypted (true); wait_for_jobs (); @@ -52,7 +54,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_test) dcp::DCP A_dcp ("build/test/import_dcp_test/" + A->dcp_name()); A_dcp.read (); - Config::instance()->set_decryption_chain (shared_ptr<dcp::CertificateChain> (new dcp::CertificateChain (openssl_path ()))); + Config::instance()->set_decryption_chain (make_shared<dcp::CertificateChain> (openssl_path ())); dcp::EncryptedKDM kdm = A->make_kdm ( Config::instance()->decryption_chain()->leaf (), @@ -68,7 +70,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_test) B->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); B->set_name ("frobozz"); - shared_ptr<DCPContent> d (new DCPContent (B, "build/test/import_dcp_test/" + A->dcp_name())); + shared_ptr<DCPContent> d = boost::make_shared<DCPContent> (B, "build/test/import_dcp_test/" + A->dcp_name()); d->add_kdm (kdm); B->examine_and_add_content (d); wait_for_jobs (); |