Use make_shared<>.

5 files changed, 33 insertions, 23 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 6b1d4d260..6c789632a 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -72,6 +72,7 @@
 #endif
 #include <boost/filesystem.hpp>
 #include <boost/noncopyable.hpp>
+#include <boost/make_shared.hpp>
 #include <iostream>
 #include <fstream>
 #include <sstream>
@@ -93,6 +94,7 @@ using std::exception;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using boost::make_shared;
 
 class FilmChangedDialog : public boost::noncopyable
 {
@@ -275,7 +277,7 @@ public:
 
 	void new_film (boost::filesystem::path path)
 	{
-		shared_ptr<Film> film (new Film (path));
+		shared_ptr<Film> film = make_shared<Film> (path);
 		film->write_metadata ();
 		film->set_name (path.filename().generic_string());
 		set_film (film);
@@ -284,7 +286,7 @@ public:
 	void load_film (boost::filesystem::path file)
 	try
 	{
-		shared_ptr<Film> film (new Film (file));
+		shared_ptr<Film> film = make_shared<Film> (file);
 		list<string> const notes = film->read_metadata ();
 
 		if (film->state_version() == 4) {
@@ -490,14 +492,14 @@ private:
 					);
 			} else {
 				JobManager::instance()->add (
-					shared_ptr<Job> (new SendKDMEmailJob (
-								 _film->name(),
-								 _film->dcp_name(),
-								 d->from(),
-								 d->until(),
-								 CinemaKDMs::collect (screen_kdms),
-								 _film->log()
-								 ))
+					boost::make_shared<SendKDMEmailJob> (
+						_film->name(),
+						_film->dcp_name(),
+						d->from(),
+						d->until(),
+						CinemaKDMs::collect (screen_kdms),
+						_film->log()
+						)
 					);
 			}
 		} catch (dcp::NotEncryptedError& e) {
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index a112e457a..3570dda08 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -36,12 +36,14 @@
 #include <wx/cmdline.h>
 #include <wx/preferences.h>
 #include <wx/wx.h>
+#include <boost/make_shared.hpp>
 #include <iostream>
 
 using std::exception;
 using std::string;
 using std::cout;
 using boost::shared_ptr;
+using boost::make_shared;
 using boost::thread;
 using boost::scoped_array;
 
@@ -128,7 +130,7 @@ public:
 	void start_job (boost::filesystem::path path)
 	{
 		try {
-			shared_ptr<Film> film (new Film (path));
+			shared_ptr<Film> film = make_shared<Film> (path);
 			film->read_metadata ();
 			film->make_dcp ();
 		} catch (std::exception& e) {
diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index fd950807c..3697b4e8b 100644
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -31,6 +31,7 @@
 #include "lib/video_content.h"
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
+#include <boost/make_shared.hpp>
 #include <getopt.h>
 #include <string>
 #include <iostream>
@@ -43,6 +44,7 @@ using std::cerr;
 using std::list;
 using std::exception;
 using boost::shared_ptr;
+using boost::make_shared;
 using boost::dynamic_pointer_cast;
 
 static void
@@ -206,7 +208,7 @@ main (int argc, char* argv[])
 	}
 
 	try {
-		shared_ptr<Film> film (new Film (output, false));
+		shared_ptr<Film> film = make_shared<Film> (output, false);
 		film->set_name (name);
 
 		film->set_container (container_ratio);
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index c686a974d..eb44b4997 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -51,6 +51,7 @@
 #endif
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
 
 #ifdef check
 #undef check
@@ -61,6 +62,7 @@ using std::list;
 using std::string;
 using std::vector;
 using boost::shared_ptr;
+using boost::make_shared;
 using boost::bind;
 
 enum {
@@ -301,13 +303,13 @@ private:
 				if (film_name.empty ()) {
 					film_name = decrypted.content_title_text ();
 				}
-				shared_ptr<Job> job (new SendKDMEmailJob (
-							     film_name,
-							     decrypted.content_title_text(),
-							     _timing->from(), _timing->until(),
-							     CinemaKDMs::collect (screen_kdms),
-							     shared_ptr<Log> ()
-							     ));
+				shared_ptr<Job> job = boost::make_shared<SendKDMEmailJob> (
+					film_name,
+					decrypted.content_title_text(),
+					_timing->from(), _timing->until(),
+					CinemaKDMs::collect (screen_kdms),
+					shared_ptr<Log> ()
+					);
 
 				JobManager::instance()->add (job);
 				if (_job_view) {
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 5e50df227..0de05c342 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -31,6 +31,7 @@
 #include "lib/player.h"
 #include "lib/player_video.h"
 #include "lib/encode_server_description.h"
+#include <boost/make_shared.hpp>
 #include <getopt.h>
 #include <iostream>
 #include <iomanip>
@@ -41,18 +42,19 @@ using std::cerr;
 using std::string;
 using std::pair;
 using boost::shared_ptr;
+using boost::make_shared;
 using dcp::Data;
 
 static shared_ptr<Film> film;
 static EncodeServerDescription* server;
-static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
+static shared_ptr<FileLog> log_ = make_shared<FileLog> ("servomatictest.log");
 static int frame_count = 0;
 
 void
 process_video (shared_ptr<PlayerVideo> pvf)
 {
-	shared_ptr<DCPVideo> local  (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
-	shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
+	shared_ptr<DCPVideo> local = make_shared<DCPVideo> (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_);
+	shared_ptr<DCPVideo> remote = make_shared<DCPVideo> (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_);
 
 	cout << "Frame " << frame_count << ": ";
 	cout.flush ();
@@ -144,7 +146,7 @@ main (int argc, char* argv[])
 		film.reset (new Film (film_dir));
 		film->read_metadata ();
 
-		shared_ptr<Player> player (new Player (film, film->playlist ()));
+		shared_ptr<Player> player = make_shared<Player> (film, film->playlist ());
 
 		DCPTime const frame = DCPTime::from_frames (1, film->video_frame_rate ());
 		for (DCPTime t; t < film->length(); t += frame) {