std::shared_ptr

31 files changed, 48 insertions, 48 deletions

diff --git a/test/asset_test.cc b/test/asset_test.cc
index 13f4773e..a6fa4b33 100644
--- a/test/asset_test.cc
+++ b/test/asset_test.cc
@@ -37,7 +37,7 @@
 #include <boost/test/unit_test.hpp>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 class DummyAsset : public dcp::Asset
 {
diff --git a/test/certificates_test.cc b/test/certificates_test.cc
index 692b169e..1dc11932 100644
--- a/test/certificates_test.cc
+++ b/test/certificates_test.cc
@@ -41,7 +41,7 @@
 
 using std::list;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Check that loading certificates from files via strings works */
 BOOST_AUTO_TEST_CASE (certificates1)
diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index 16661b03..5a6bdd85 100644
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -38,7 +38,7 @@
 #include <cmath>
 
 using std::pow;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcp;
 
 static void
diff --git a/test/combine_test.cc b/test/combine_test.cc
index c5d2f4a7..6db968f6 100644
--- a/test/combine_test.cc
+++ b/test/combine_test.cc
@@ -53,7 +53,7 @@ using std::list;
 using std::string;
 using std::vector;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 static void
diff --git a/test/cpl_metadata_test.cc b/test/cpl_metadata_test.cc
index a97daaa9..6fef2c74 100644
--- a/test/cpl_metadata_test.cc
+++ b/test/cpl_metadata_test.cc
@@ -39,14 +39,14 @@
 #include "reel.h"
 #include "reel_subtitle_asset.h"
 #include "test.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/test/unit_test.hpp>
 
 
 using std::list;
 using std::string;
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 BOOST_AUTO_TEST_CASE (cpl_metadata_bad_values_test)
diff --git a/test/cpl_ratings_test.cc b/test/cpl_ratings_test.cc
index ae846998..931359b4 100644
--- a/test/cpl_ratings_test.cc
+++ b/test/cpl_ratings_test.cc
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE (cpl_ratings)
 	ratings.push_back (dcp::Rating("http://www.movielabs.com/md/ratings/GB/BBFC/1/12A%3C/Agency", "12A"));
 	cpl.set_ratings (ratings);
 
-	cpl.write_xml ("build/test/cpl_ratings.xml", dcp::SMPTE, boost::shared_ptr<dcp::CertificateChain>());
+	cpl.write_xml ("build/test/cpl_ratings.xml", dcp::SMPTE, std::shared_ptr<dcp::CertificateChain>());
 
 	list<string> ignore;
 	ignore.push_back ("Id");
diff --git a/test/cpl_sar_test.cc b/test/cpl_sar_test.cc
index 1988fa22..60945aae 100644
--- a/test/cpl_sar_test.cc
+++ b/test/cpl_sar_test.cc
@@ -39,7 +39,7 @@
 #include <boost/test/unit_test.hpp>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 static void
 check (shared_ptr<dcp::ReelMonoPictureAsset> pa, dcp::Fraction far, string sar)
diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc
index 313ff939..1a78bfd2 100644
--- a/test/dcp_font_test.cc
+++ b/test/dcp_font_test.cc
@@ -44,8 +44,8 @@
 
 using std::list;
 using std::string;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using boost::shared_array;
 
 /** Create a DCP with interop subtitles and check that the font is written and read back correctly */
diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 135887d5..347d433d 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -54,8 +54,8 @@
 
 using std::string;
 using std::vector;
-using boost::dynamic_pointer_cast;
-using boost::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 65f1fe87..6a7dde9d 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -49,8 +49,8 @@
 
 using std::pair;
 using std::make_pair;
-using boost::dynamic_pointer_cast;
-using boost::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::shared_ptr;
 using boost::scoped_array;
 
 pair<uint8_t*, dcp::Size>
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 2793e8ad..9748ee3f 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -51,11 +51,11 @@
 #include <asdcp/KM_util.h>
 #include <sndfile.h>
 #include <boost/test/unit_test.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 using std::vector;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Load a certificate chain from build/test/data/ *.pem and then build
  *  an encrypted DCP and a KDM using it.
diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc
index 2d08669e..e01181d1 100644
--- a/test/frame_info_hash_test.cc
+++ b/test/frame_info_hash_test.cc
@@ -38,7 +38,7 @@
 #include <boost/test/unit_test.hpp>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 static void
 check (unsigned int* seed, shared_ptr<dcp::PictureAssetWriter> writer, string hash)
diff --git a/test/gamma_transfer_function_test.cc b/test/gamma_transfer_function_test.cc
index 46af4dd7..993f4e9b 100644
--- a/test/gamma_transfer_function_test.cc
+++ b/test/gamma_transfer_function_test.cc
@@ -35,7 +35,7 @@
 #include "modified_gamma_transfer_function.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Check GammaTransferFunction::about_equal */
 BOOST_AUTO_TEST_CASE (gamma_transfer_function_test)
diff --git a/test/kdm_test.cc b/test/kdm_test.cc
index bf5c14c5..21c922a2 100644
--- a/test/kdm_test.cc
+++ b/test/kdm_test.cc
@@ -51,7 +51,7 @@
 using std::list;
 using std::string;
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 
 /** Check reading and decryption of a KDM */
diff --git a/test/markers_test.cc b/test/markers_test.cc
index f42f33c5..fe4fbb05 100644
--- a/test/markers_test.cc
+++ b/test/markers_test.cc
@@ -33,14 +33,14 @@
 
 
 #include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/test/unit_test.hpp>
 #include "cpl.h"
 #include "reel.h"
 #include "reel_markers_asset.h"
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (markers_write_test)
 {
diff --git a/test/mca_test.cc b/test/mca_test.cc
index 3df03bd1..b573daf1 100644
--- a/test/mca_test.cc
+++ b/test/mca_test.cc
@@ -47,7 +47,7 @@
 using std::list;
 using std::string;
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 /** Check that when we read a MXF and write its MCA metadata to a CPL we get the same answer
diff --git a/test/read_dcp_test.cc b/test/read_dcp_test.cc
index 66a4b43f..c885523a 100644
--- a/test/read_dcp_test.cc
+++ b/test/read_dcp_test.cc
@@ -37,7 +37,7 @@
 #include "cpl.h"
 
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Read a SMPTE DCP that is in git and make sure that basic stuff is read in correctly */
 BOOST_AUTO_TEST_CASE (read_dcp_test1)
diff --git a/test/read_interop_subtitle_test.cc b/test/read_interop_subtitle_test.cc
index 2860a725..c665bcc2 100644
--- a/test/read_interop_subtitle_test.cc
+++ b/test/read_interop_subtitle_test.cc
@@ -40,8 +40,8 @@
 
 using std::list;
 using std::string;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 /** Load some subtitle content from Interop XML and check that it is read correctly */
 BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
diff --git a/test/read_smpte_subtitle_test.cc b/test/read_smpte_subtitle_test.cc
index 9cf1451d..7c367bd4 100644
--- a/test/read_smpte_subtitle_test.cc
+++ b/test/read_smpte_subtitle_test.cc
@@ -41,8 +41,8 @@
 #include <boost/optional/optional_io.hpp>
 
 using std::list;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 /** Check reading of a SMPTE subtitle file */
 BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test)
diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index afeba6d7..76dff195 100644
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -39,7 +39,7 @@
 #include <boost/filesystem.hpp>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Check that recovery from a partially-written MXF works */
 BOOST_AUTO_TEST_CASE (recovery)
diff --git a/test/reel_asset_test.cc b/test/reel_asset_test.cc
index 42d76525..bf609c2c 100644
--- a/test/reel_asset_test.cc
+++ b/test/reel_asset_test.cc
@@ -40,7 +40,7 @@
 
 using std::string;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 /** Test the XML constructor of ReelPictureAsset */
diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc
index 724f424d..a6c708e3 100644
--- a/test/rewrite_subs.cc
+++ b/test/rewrite_subs.cc
@@ -43,7 +43,7 @@ using std::cout;
 using std::cerr;
 using std::list;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcp;
 
 /** Load a DCP then re-write its subtitle XML or MXF in-place */
@@ -62,7 +62,7 @@ main (int argc, char* argv[])
 		dcp->read ();
 
 		list<shared_ptr<CPL> > cpls = dcp->cpls ();
-		for (list<boost::shared_ptr<CPL> >::iterator i = cpls.begin(); i != cpls.end(); ++i) {
+		for (list<std::shared_ptr<CPL> >::iterator i = cpls.begin(); i != cpls.end(); ++i) {
 
 			list<shared_ptr<Reel> > reels = (*i)->reels ();
 			for (list<shared_ptr<Reel> >::iterator j = reels.begin(); j != reels.end(); ++j) {
diff --git a/test/rgb_xyz_test.cc b/test/rgb_xyz_test.cc
index 5dcfe673..af79b1e3 100644
--- a/test/rgb_xyz_test.cc
+++ b/test/rgb_xyz_test.cc
@@ -42,7 +42,7 @@ using std::max;
 using std::list;
 using std::string;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using boost::scoped_array;
 
diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index 10b7b6fe..49da5b65 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -57,7 +57,7 @@
 using std::list;
 using std::vector;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::scoped_array;
 
 /** Build an encrypted picture asset and a KDM for it and check that the KDM can be decrypted */
diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index 35ad5550..6f72511e 100644
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -36,7 +36,7 @@
 
 using std::string;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (smpte_subtitle_id_test)
 {
diff --git a/test/sound_frame_test.cc b/test/sound_frame_test.cc
index a9088e26..a8060bd4 100644
--- a/test/sound_frame_test.cc
+++ b/test/sound_frame_test.cc
@@ -39,7 +39,7 @@
 #include "exceptions.h"
 #include <sndfile.h>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (sound_frame_test)
 {
diff --git a/test/sync_test.cc b/test/sync_test.cc
index 0bffdb83..cbfd7400 100644
--- a/test/sync_test.cc
+++ b/test/sync_test.cc
@@ -37,14 +37,14 @@
 #include "sound_asset_writer.h"
 #include "test.h"
 #include <boost/filesystem.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/test/unit_test.hpp>
 #include <vector>
 
 
 using std::vector;
 using boost::shared_array;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 static const int sample_A = 0.038 * 8388608;
diff --git a/test/test.cc b/test/test.cc
index 69772e98..76a6c4c5 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -68,7 +68,7 @@ using std::string;
 using std::min;
 using std::list;
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 
 
diff --git a/test/test.h b/test/test.h
index ea697e40..fdc3c4d7 100644
--- a/test/test.h
+++ b/test/test.h
@@ -42,14 +42,14 @@ extern boost::filesystem::path xsd_test;
 extern void check_xml (xmlpp::Element* ref, xmlpp::Element* test, std::list<std::string> ignore_tags, bool ignore_whitespace = false);
 extern void check_xml (std::string ref, std::string test, std::list<std::string> ignore);
 extern void check_file (boost::filesystem::path ref, boost::filesystem::path check);
-extern boost::shared_ptr<dcp::MonoPictureAsset> simple_picture (boost::filesystem::path path, std::string suffix);
-extern boost::shared_ptr<dcp::DCP> make_simple (boost::filesystem::path path, int reels = 1);
-extern boost::shared_ptr<dcp::DCP> make_simple_with_interop_subs (boost::filesystem::path path);
-extern boost::shared_ptr<dcp::DCP> make_simple_with_smpte_subs (boost::filesystem::path path);
-extern boost::shared_ptr<dcp::DCP> make_simple_with_interop_ccaps (boost::filesystem::path path);
-extern boost::shared_ptr<dcp::DCP> make_simple_with_smpte_ccaps (boost::filesystem::path path);
-extern boost::shared_ptr<dcp::OpenJPEGImage> black_image ();
-extern boost::shared_ptr<dcp::ReelAsset> black_picture_asset (boost::filesystem::path dir, int frames = 24);
+extern std::shared_ptr<dcp::MonoPictureAsset> simple_picture (boost::filesystem::path path, std::string suffix);
+extern std::shared_ptr<dcp::DCP> make_simple (boost::filesystem::path path, int reels = 1);
+extern std::shared_ptr<dcp::DCP> make_simple_with_interop_subs (boost::filesystem::path path);
+extern std::shared_ptr<dcp::DCP> make_simple_with_smpte_subs (boost::filesystem::path path);
+extern std::shared_ptr<dcp::DCP> make_simple_with_interop_ccaps (boost::filesystem::path path);
+extern std::shared_ptr<dcp::DCP> make_simple_with_smpte_ccaps (boost::filesystem::path path);
+extern std::shared_ptr<dcp::OpenJPEGImage> black_image ();
+extern std::shared_ptr<dcp::ReelAsset> black_picture_asset (boost::filesystem::path dir, int frames = 24);
 
 /** Creating an object of this class will make asdcplib's random number generation
  *  (more) predictable.
diff --git a/test/verify_test.cc b/test/verify_test.cc
index 9b9111d2..fdf85100 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -58,7 +58,7 @@ using std::string;
 using std::vector;
 using std::make_pair;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 static list<pair<string, optional<boost::filesystem::path> > > stages;
diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index c3217dbc..deb18339 100644
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -47,7 +47,7 @@
 using std::list;
 using std::string;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Test dcp::order::Font::take_intersection */
 BOOST_AUTO_TEST_CASE (take_intersection_test)