Revert "Use make_shared<>."

[dcpomatic.git] / src / tools / dcpomatic.cc

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 6c789632a2dff6e46c73f10fb91be54985dfe2b0..6b1d4d260dc3b044252ed5423502d3ca98541f2c 100644 (file)
--- 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) {