diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-21 23:08:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-21 23:08:53 +0100 |
| commit | a8a0dfd1b21de6c0facf965ab119833ff6f790bf (patch) | |
| tree | 88bd3a7dd6d4ae56a1efa9b7443c341550759869 /test/vf_test.cc | |
| parent | e669b562937786bf5b771c927cc03a4074b01be8 (diff) | |
Revert "Use make_shared<>."
Support for this seems to vary wildly across DoM's build
targets. Stuff that builds on 16.04 won't build on 14.04,
for example. Seems to not be worth the hassle now.
This reverts commit 5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f.
Diffstat (limited to 'test/vf_test.cc')
| -rw-r--r-- | test/vf_test.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/vf_test.cc b/test/vf_test.cc index 480df0bd7..ae7c30be3 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -24,18 +24,16 @@ #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 = make_shared<DCPContent> (film, "test/data/reels_test2"); + shared_ptr<DCPContent> dcp (new DCPContent (film, "test/data/reels_test2")); film->examine_and_add_content (dcp); wait_for_jobs (); @@ -53,7 +51,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 = make_shared<FFmpegContent> (film, "test/data/test.mp4"); + shared_ptr<FFmpegContent> other (new FFmpegContent (film, "test/data/test.mp4")); film->examine_and_add_content (other); wait_for_jobs (); |
