Fix some ambiguous shared_ptrs, seen on Arch Linux.

6 files changed, 39 insertions, 41 deletions

diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index 0693323c..9d728cc6 100644
--- a/src/smpte_subtitle_asset.cc
+++ b/src/smpte_subtitle_asset.cc
@@ -109,7 +109,7 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file)
 			xml->read_string (xml_string);
 			parse_xml (xml);
 			read_mxf_descriptor (reader);
-			read_mxf_resources (reader, make_shared<DecryptionContext>(optional<Key>(), Standard::SMPTE));
+			read_mxf_resources(reader, std::make_shared<DecryptionContext>(optional<Key>(), Standard::SMPTE));
 		} else {
 			read_mxf_descriptor (reader);
 		}
diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 0f32a6f4..2ce34b51 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -64,7 +64,6 @@
 
 using std::dynamic_pointer_cast;
 using std::make_pair;
-using std::make_shared;
 using std::map;
 using std::pair;
 using std::shared_ptr;
@@ -155,7 +154,7 @@ BOOST_AUTO_TEST_CASE (decryption_test2)
 	auto context_id = dcp::make_uuid();
 	dcp::Key key;
 
-	auto picture_asset = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
+	auto picture_asset = std::make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
 	picture_asset->set_key (key);
 	picture_asset->set_context_id (context_id);
 	auto picture_writer = picture_asset->start_write(dir / "picture.mxf", false);
@@ -165,7 +164,7 @@ BOOST_AUTO_TEST_CASE (decryption_test2)
 	}
 	picture_writer->finalize();
 
-	auto sound_asset = make_shared<dcp::SoundAsset>(dcp::Fraction(24, 1), 48000, 2, dcp::LanguageTag("en-GB"), dcp::Standard::SMPTE);
+	auto sound_asset = std::make_shared<dcp::SoundAsset>(dcp::Fraction(24, 1), 48000, 2, dcp::LanguageTag("en-GB"), dcp::Standard::SMPTE);
 	sound_asset->set_key (key);
 	sound_asset->set_context_id (context_id);
 	auto sound_writer = sound_asset->start_write(dir / "sound.mxf");
@@ -181,10 +180,10 @@ BOOST_AUTO_TEST_CASE (decryption_test2)
 	sound_writer->write (audio.data(), 48000);
 	sound_writer->finalize ();
 
-	auto subs_asset = make_shared<dcp::SMPTESubtitleAsset>();
+	auto subs_asset = std::make_shared<dcp::SMPTESubtitleAsset>();
 	subs_asset->set_key (key);
 	subs_asset->set_context_id (context_id);
-	subs_asset->add(make_shared<dcp::SubtitleString>(
+	subs_asset->add(std::make_shared<dcp::SubtitleString>(
 		optional<string>(),
 		false, false, false,
 		dcp::Colour(255, 255, 255),
@@ -203,10 +202,10 @@ BOOST_AUTO_TEST_CASE (decryption_test2)
 		));
 	subs_asset->write (dir / "subs.mxf");
 
-	auto reel = make_shared<dcp::Reel>();
-	auto reel_picture_asset = make_shared<dcp::ReelMonoPictureAsset>(picture_asset, 0);
-	auto reel_sound_asset = make_shared<dcp::ReelSoundAsset>(sound_asset, 0);
-	auto reel_subs_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(subs_asset, dcp::Fraction(24, 1), 120, 0);
+	auto reel = std::make_shared<dcp::Reel>();
+	auto reel_picture_asset = std::make_shared<dcp::ReelMonoPictureAsset>(picture_asset, 0);
+	auto reel_sound_asset = std::make_shared<dcp::ReelSoundAsset>(sound_asset, 0);
+	auto reel_subs_asset = std::make_shared<dcp::ReelSMPTESubtitleAsset>(subs_asset, dcp::Fraction(24, 1), 120, 0);
 	reel->add(reel_picture_asset);
 	reel->add(reel_sound_asset);
 	reel->add(reel_subs_asset);
diff --git a/test/interop_subtitle_test.cc b/test/interop_subtitle_test.cc
index 76aafe32..ca131ba6 100644
--- a/test/interop_subtitle_test.cc
+++ b/test/interop_subtitle_test.cc
@@ -43,7 +43,6 @@
 
 
 using std::dynamic_pointer_cast;
-using std::make_shared;
 using std::shared_ptr;
 using std::string;
 using std::vector;
@@ -709,7 +708,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 	c.set_movie_title ("Test");
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			string ("Frutiger"),
 			false,
 			false,
@@ -735,7 +734,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 		);
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			boost::optional<string> (),
 			true,
 			true,
@@ -761,7 +760,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 		);
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			boost::optional<string> (),
 			true,
 			true,
@@ -821,7 +820,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 	c.set_movie_title ("Test");
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			string ("Frutiger"),
 			false,
 			false,
@@ -847,7 +846,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 		);
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			boost::optional<string>(),
 			true,
 			true,
@@ -901,13 +900,13 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
 {
 	RNGFixer fix;
 
-	auto c = make_shared<dcp::InteropSubtitleAsset>();
+	auto c = std::make_shared<dcp::InteropSubtitleAsset>();
 	c->set_reel_number ("1");
 	c->set_language ("EN");
 	c->set_movie_title ("Test");
 
 	c->add (
-		make_shared<dcp::SubtitleImage>(
+		std::make_shared<dcp::SubtitleImage>(
 			dcp::ArrayData ("test/data/sub.png"),
 			dcp::Time (0, 4,  9, 22, 24),
 			dcp::Time (0, 4, 11, 22, 24),
@@ -926,15 +925,16 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
 	boost::filesystem::create_directories ("build/test/write_interop_subtitle_test3");
 	c->write ("build/test/write_interop_subtitle_test3/subs.xml");
 
-	auto reel = make_shared<dcp::Reel>();
-	reel->add(make_shared<dcp::ReelInteropSubtitleAsset>(c, dcp::Fraction(24, 1), 6046, 0));
+	auto reel = std::make_shared<dcp::Reel>();
+	reel->add(std::make_shared<dcp::ReelInteropSubtitleAsset>(c, dcp::Fraction(24, 1), 6046, 0));
 
 	string const issue_date = "2018-09-02T04:45:18+00:00";
 	string const issuer = "libdcp";
 	string const creator = "libdcp";
 	string const annotation_text = "Created by libdcp";
 
-	auto cpl = make_shared<dcp::CPL>("My film", dcp::ContentKind::FEATURE, dcp::Standard::INTEROP);
+using std::make_shared;
+	auto cpl = std::make_shared<dcp::CPL>("My film", dcp::ContentKind::FEATURE, dcp::Standard::INTEROP);
 	cpl->add (reel);
 	cpl->set_issuer (issuer);
 	cpl->set_creator (creator);
diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index b59d6020..67265271 100644
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -42,10 +42,9 @@
 #include <boost/test/unit_test.hpp>
 
 
-using std::make_shared;
-using std::string;
-using std::shared_ptr;
 using std::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::string;
 using std::vector;
 using boost::optional;
 
@@ -54,7 +53,7 @@ BOOST_AUTO_TEST_CASE (smpte_subtitle_id_test)
 {
 	dcp::SMPTESubtitleAsset subs;
 	subs.add(
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			optional<string>(),
 			false, false, false,
 			dcp::Colour(),
@@ -181,7 +180,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 	c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
 
 	c.add (
-		make_shared<dcp::SubtitleString> (
+		std::make_shared<dcp::SubtitleString> (
 			string ("Frutiger"),
 			false,
 			false,
@@ -207,7 +206,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 		);
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			boost::optional<string> (),
 			true,
 			true,
@@ -233,7 +232,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 		);
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			boost::optional<string> (),
 			true,
 			true,
@@ -300,7 +299,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 	c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			string ("Arial"),
 			false,
 			false,
@@ -326,7 +325,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 		);
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			string ("Arial"),
 			true,
 			false,
@@ -352,7 +351,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 		);
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			string ("Arial"),
 			false,
 			false,
@@ -378,7 +377,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 		);
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			string ("Arial"),
 			false,
 			false,
@@ -404,7 +403,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 		);
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			string ("Arial"),
 			true,
 			false,
@@ -430,7 +429,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 		);
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			string ("Arial"),
 			false,
 			false,
@@ -493,7 +492,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test3)
 	boost::filesystem::path const sub_image = "test/data/sub.png";
 
 	c.add (
-		make_shared<dcp::SubtitleImage>(
+		std::make_shared<dcp::SubtitleImage>(
 			dcp::ArrayData(sub_image),
 			dcp::Time (0, 4,  9, 22, 24),
 			dcp::Time (0, 4, 11, 22, 24),
@@ -544,7 +543,7 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_top_alignment)
 	c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			string ("Arial"),
 			false,
 			false,
@@ -570,7 +569,7 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_top_alignment)
 		);
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			string ("Arial"),
 			false,
 			false,
@@ -632,7 +631,7 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_bottom_alignment)
 	c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			string ("Arial"),
 			false,
 			false,
@@ -658,7 +657,7 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_bottom_alignment)
 		);
 
 	c.add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			string ("Arial"),
 			false,
 			false,
diff --git a/test/test.cc b/test/test.cc
index a2016e92..450ff514 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -386,7 +386,7 @@ make_simple (boost::filesystem::path path, int reels, int frames, dcp::Standard
 shared_ptr<dcp::Subtitle>
 simple_subtitle ()
 {
-	return make_shared<dcp::SubtitleString>(
+	return std::make_shared<dcp::SubtitleString>(
 		optional<string>(),
 		false,
 		false,
diff --git a/test/verify_test.cc b/test/verify_test.cc
index 6dfcc58a..3acdf49a 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -1242,7 +1242,7 @@ void
 add_test_subtitle (shared_ptr<dcp::SubtitleAsset> asset, int start_frame, int end_frame, float v_position = 0, dcp::VAlign v_align = dcp::VAlign::CENTER, string text = "Hello")
 {
 	asset->add (
-		make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::SubtitleString>(
 			optional<string>(),
 			false,
 			false,