summaryrefslogtreecommitdiff
path: root/src/tools/dcpomatic.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-21 23:08:53 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-21 23:08:53 +0100
commita8a0dfd1b21de6c0facf965ab119833ff6f790bf (patch)
tree88bd3a7dd6d4ae56a1efa9b7443c341550759869 /src/tools/dcpomatic.cc
parente669b562937786bf5b771c927cc03a4074b01be8 (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/tools/dcpomatic.cc')
-rw-r--r--src/tools/dcpomatic.cc22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 6c789632a..6b1d4d260 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -72,7 +72,6 @@
#endif
#include <boost/filesystem.hpp>
#include <boost/noncopyable.hpp>
-#include <boost/make_shared.hpp>
#include <iostream>
#include <fstream>
#include <sstream>
@@ -94,7 +93,6 @@ using std::exception;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
-using boost::make_shared;
class FilmChangedDialog : public boost::noncopyable
{
@@ -277,7 +275,7 @@ public:
void new_film (boost::filesystem::path path)
{
- shared_ptr<Film> film = make_shared<Film> (path);
+ shared_ptr<Film> film (new Film (path));
film->write_metadata ();
film->set_name (path.filename().generic_string());
set_film (film);
@@ -286,7 +284,7 @@ public:
void load_film (boost::filesystem::path file)
try
{
- shared_ptr<Film> film = make_shared<Film> (file);
+ shared_ptr<Film> film (new Film (file));
list<string> const notes = film->read_metadata ();
if (film->state_version() == 4) {
@@ -492,14 +490,14 @@ private:
);
} else {
JobManager::instance()->add (
- boost::make_shared<SendKDMEmailJob> (
- _film->name(),
- _film->dcp_name(),
- d->from(),
- d->until(),
- CinemaKDMs::collect (screen_kdms),
- _film->log()
- )
+ shared_ptr<Job> (new SendKDMEmailJob (
+ _film->name(),
+ _film->dcp_name(),
+ d->from(),
+ d->until(),
+ CinemaKDMs::collect (screen_kdms),
+ _film->log()
+ ))
);
}
} catch (dcp::NotEncryptedError& e) {