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/interrupt_encoder_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/interrupt_encoder_test.cc')
| -rw-r--r-- | test/interrupt_encoder_test.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/interrupt_encoder_test.cc b/test/interrupt_encoder_test.cc index 4d5787997..8883c2d6f 100644 --- a/test/interrupt_encoder_test.cc +++ b/test/interrupt_encoder_test.cc @@ -27,10 +27,8 @@ #include "lib/cross.h" #include "test.h" #include <boost/test/unit_test.hpp> -#include <boost/make_shared.hpp> using boost::shared_ptr; -using boost::make_shared; /** Interrupt a DCP encode when it is in progress, as this used to (still does?) * sometimes give an error related to pthreads. @@ -42,7 +40,7 @@ BOOST_AUTO_TEST_CASE (interrupt_encoder_test) film->set_container (Ratio::from_id ("185")); film->set_name ("interrupt_encoder_test"); - shared_ptr<FFmpegContent> content = make_shared<FFmpegContent> (film, private_data / "prophet_clip.mkv"); + shared_ptr<FFmpegContent> content (new FFmpegContent (film, private_data / "prophet_clip.mkv")); film->examine_and_add_content (content); wait_for_jobs (); |