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 /src/lib/video_mxf_content.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 'src/lib/video_mxf_content.cc')
| -rw-r--r-- | src/lib/video_mxf_content.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/video_mxf_content.cc b/src/lib/video_mxf_content.cc index f5fab485e..d86fc4cf6 100644 --- a/src/lib/video_mxf_content.cc +++ b/src/lib/video_mxf_content.cc @@ -28,14 +28,12 @@ #include <dcp/stereo_picture_asset.h> #include <dcp/exceptions.h> #include <libxml++/libxml++.h> -#include <boost/make_shared.hpp> #include "i18n.h" using std::list; using std::string; using boost::shared_ptr; -using boost::make_shared; VideoMXFContent::VideoMXFContent (shared_ptr<const Film> film, boost::filesystem::path path) : Content (film, path) @@ -53,7 +51,7 @@ bool VideoMXFContent::valid_mxf (boost::filesystem::path path) { try { - shared_ptr<dcp::MonoPictureAsset> mp = make_shared<dcp::MonoPictureAsset> (path); + shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (path)); return true; } catch (dcp::MXFFileError& e) { @@ -62,7 +60,7 @@ VideoMXFContent::valid_mxf (boost::filesystem::path path) } try { - shared_ptr<dcp::StereoPictureAsset> sp = make_shared<dcp::StereoPictureAsset> (path); + shared_ptr<dcp::StereoPictureAsset> sp (new dcp::StereoPictureAsset (path)); return true; } catch (dcp::MXFFileError& e) { @@ -81,7 +79,7 @@ VideoMXFContent::examine (shared_ptr<Job> job) Content::examine (job); video.reset (new VideoContent (this)); - shared_ptr<VideoMXFExaminer> examiner = make_shared<VideoMXFExaminer> (shared_from_this ()); + shared_ptr<VideoMXFExaminer> examiner (new VideoMXFExaminer (shared_from_this ())); video->take_from_examiner (examiner); } |
