Use make_shared<>.

[dcpomatic.git] / test / vf_test.cc

diff --git a/test/vf_test.cc b/test/vf_test.cc
index 124a9061abc95616f8ddbff0166de06e5dad736d..480df0bd738005b33d8c93a68b7ed828027ed13d 100644 (file)
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2015 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/>.
 
 */
 
@@ -23,16 +24,18 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
 
 using std::list;
 using std::string;
 using boost::shared_ptr;
+using boost::make_shared;
 
 /** Test the logic which decides whether a DCP can be referenced or not */
 BOOST_AUTO_TEST_CASE (vf_test1)
 {
        shared_ptr<Film> film = new_test_film ("vf_test1");
-       shared_ptr<DCPContent> dcp (new DCPContent (film, "test/data/reels_test2"));
+       shared_ptr<DCPContent> dcp = make_shared<DCPContent> (film, "test/data/reels_test2");
        film->examine_and_add_content (dcp);
        wait_for_jobs ();
 
@@ -50,7 +53,7 @@ BOOST_AUTO_TEST_CASE (vf_test1)
        /* (but reels_test2 has no subtitles to reference) */
        BOOST_CHECK (!dcp->can_reference_subtitle(why_not));
 
-       shared_ptr<FFmpegContent> other (new FFmpegContent (film, "test/data/test.mp4"));
+       shared_ptr<FFmpegContent> other = make_shared<FFmpegContent> (film, "test/data/test.mp4");
        film->examine_and_add_content (other);
        wait_for_jobs ();