Use make_shared<>.

[dcpomatic.git] / test / video_mxf_content_test.cc

diff --git a/test/video_mxf_content_test.cc b/test/video_mxf_content_test.cc
index a42fe1a68bcfc30d9216f3507cc16c473fe3ae85..4759cb69ce5e2177745050b8f36fb25e5ee5796a 100644 (file)
--- a/test/video_mxf_content_test.cc
+++ b/test/video_mxf_content_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -25,8 +26,10 @@
 #include "test.h"
 #include <dcp/mono_picture_asset.h>
 #include <boost/test/unit_test.hpp>
+#include <boost/make_shared.hpp>
 
 using boost::shared_ptr;
+using boost::make_shared;
 using boost::dynamic_pointer_cast;
 
 static boost::filesystem::path ref_mxf = "test/data/scaling_test_185_185/j2c_a41afbff-e1ad-41c4-9a84-de315b95dd0f.mxf";
@@ -52,9 +55,9 @@ BOOST_AUTO_TEST_CASE (video_mxf_content_test)
        film->make_dcp ();
        wait_for_jobs ();
 
-       shared_ptr<dcp::MonoPictureAsset> ref (new dcp::MonoPictureAsset (ref_mxf));
+       shared_ptr<dcp::MonoPictureAsset> ref = make_shared<dcp::MonoPictureAsset> (ref_mxf);
        boost::filesystem::directory_iterator i ("build/test/video_mxf_content_test/video");
-       shared_ptr<dcp::MonoPictureAsset> comp (new dcp::MonoPictureAsset (*i));
+       shared_ptr<dcp::MonoPictureAsset> comp = make_shared<dcp::MonoPictureAsset> (*i);
        dcp::EqualityOptions op;
        BOOST_CHECK (ref->equals (comp, op, note));
 }