From 970315483257522808270ca0f7a72c2c5c7fc26a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 13 Nov 2022 14:53:56 +0100
Subject: Disambiguate make_shared for Windows build.

---
 test/decryption_test.cc       | 2 +-
 test/interop_subtitle_test.cc | 6 +++---
 test/smpte_subtitle_test.cc   | 6 +++---
 test/test.cc                  | 2 +-
 test/verify_test.cc           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'test')

diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 0f32a6f4..c0505c62 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -184,7 +184,7 @@ BOOST_AUTO_TEST_CASE (decryption_test2)
 	auto subs_asset = 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),
diff --git a/test/interop_subtitle_test.cc b/test/interop_subtitle_test.cc
index 76aafe32..c86e9b49 100644
--- a/test/interop_subtitle_test.cc
+++ b/test/interop_subtitle_test.cc
@@ -735,7 +735,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 +761,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,
@@ -847,7 +847,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,
diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index b59d6020..b5044a58 100644
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -54,7 +54,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(),
@@ -207,7 +207,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 +233,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,
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,
-- 
cgit v1.2.3