diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-11-13 14:53:56 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-11-13 15:14:27 +0100 |
| commit | 970315483257522808270ca0f7a72c2c5c7fc26a (patch) | |
| tree | 134ba2e58dd499c53f49f4dcb36688762cf16dc6 | |
| parent | cbdb96e4bb93c409fca737b1a5141ab3d48fb30e (diff) | |
Disambiguate make_shared for Windows build.new-mxe
| -rw-r--r-- | src/smpte_subtitle_asset.cc | 2 | ||||
| -rw-r--r-- | test/decryption_test.cc | 2 | ||||
| -rw-r--r-- | test/interop_subtitle_test.cc | 6 | ||||
| -rw-r--r-- | test/smpte_subtitle_test.cc | 6 | ||||
| -rw-r--r-- | test/test.cc | 2 | ||||
| -rw-r--r-- | test/verify_test.cc | 2 |
6 files changed, 10 insertions, 10 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..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, |