std::shared_ptr

80 files changed, 120 insertions, 123 deletions

diff --git a/test/4k_test.cc b/test/4k_test.cc
index cbbede0a9..e09aeeb5c 100644
--- a/test/4k_test.cc
+++ b/test/4k_test.cc
@@ -36,7 +36,7 @@
 #include "lib/dcpomatic_log.h"
 #include "test.h"
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (fourk_test)
 {
diff --git a/test/atmos_test.cc b/test/atmos_test.cc
index fe64ed6a9..95c43ce34 100644
--- a/test/atmos_test.cc
+++ b/test/atmos_test.cc
@@ -32,7 +32,7 @@
 using std::string;
 using std::vector;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 BOOST_AUTO_TEST_CASE (atmos_passthrough_test)
diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index c3a83186e..9da286746 100644
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -41,7 +41,7 @@
 #include <iostream>
 
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcpomatic;
 
 static float
diff --git a/test/audio_delay_test.cc b/test/audio_delay_test.cc
index 2645cf517..f229446f0 100644
--- a/test/audio_delay_test.cc
+++ b/test/audio_delay_test.cc
@@ -45,7 +45,7 @@
 using std::string;
 using std::cout;
 using boost::lexical_cast;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 static
 void test_audio_delay (int delay_in_ms)
diff --git a/test/audio_filter_test.cc b/test/audio_filter_test.cc
index b0bb1449c..13b098910 100644
--- a/test/audio_filter_test.cc
+++ b/test/audio_filter_test.cc
@@ -27,7 +27,7 @@
 #include "lib/audio_filter.h"
 #include "lib/audio_buffers.h"
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 static void
 audio_filter_impulse_test_one (AudioFilter& f, int block_size, int num_blocks)
diff --git a/test/audio_merger_test.cc b/test/audio_merger_test.cc
index db8b33a9b..d8e5b0e26 100644
--- a/test/audio_merger_test.cc
+++ b/test/audio_merger_test.cc
@@ -39,7 +39,7 @@ using std::pair;
 using std::list;
 using std::cout;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::bind;
 using namespace dcpomatic;
 
diff --git a/test/audio_processor_delay_test.cc b/test/audio_processor_delay_test.cc
index bb0538661..6fd644a7e 100644
--- a/test/audio_processor_delay_test.cc
+++ b/test/audio_processor_delay_test.cc
@@ -31,7 +31,7 @@
 
 using std::cerr;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 #define CHECK_SAMPLE(c,f,r) \
 	if (fabs(out->data(c)[f] - (r)) > 0.1) {			\
diff --git a/test/audio_processor_test.cc b/test/audio_processor_test.cc
index d814ab421..fcb81e104 100644
--- a/test/audio_processor_test.cc
+++ b/test/audio_processor_test.cc
@@ -32,7 +32,7 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Test the mid-side decoder for analysis and DCP-making */
 BOOST_AUTO_TEST_CASE (audio_processor_test)
diff --git a/test/audio_ring_buffers_test.cc b/test/audio_ring_buffers_test.cc
index 782451a7d..95927537f 100644
--- a/test/audio_ring_buffers_test.cc
+++ b/test/audio_ring_buffers_test.cc
@@ -23,7 +23,7 @@
 #include <iostream>
 
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcpomatic;
 
 #define CANARY 9999
diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index 2a1360c78..4a056dbf7 100644
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -49,8 +49,8 @@
 
 using std::cout;
 using std::map;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using namespace dcpomatic;
 
 /** Build a small DCP with no picture and a single subtitle overlaid onto it from a SubRip file */
diff --git a/test/butler_test.cc b/test/butler_test.cc
index 9340ebe75..8a588dcc9 100644
--- a/test/butler_test.cc
+++ b/test/butler_test.cc
@@ -28,7 +28,7 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index e7ab5ec7a..675d1eb24 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -42,10 +42,10 @@
 #include <boost/thread.hpp>
 
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::thread;
 using boost::optional;
-using boost::weak_ptr;
+using std::weak_ptr;
 using dcp::ArrayData;
 
 void
diff --git a/test/closed_caption_test.cc b/test/closed_caption_test.cc
index 86666a44c..4c59be72b 100644
--- a/test/closed_caption_test.cc
+++ b/test/closed_caption_test.cc
@@ -29,7 +29,7 @@
 #include <boost/test/unit_test.hpp>
 
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Basic test that Interop closed captions are written */
 BOOST_AUTO_TEST_CASE (closed_caption_test1)
diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index 94284f879..f277edd9a 100644
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -32,7 +32,7 @@
 #include <iostream>
 
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test1)
 {
diff --git a/test/content_test.cc b/test/content_test.cc
index de9ca7774..0815e16c2 100644
--- a/test/content_test.cc
+++ b/test/content_test.cc
@@ -32,7 +32,7 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcpomatic;
 
 /** There has been garbled audio with this piece of content */
diff --git a/test/cpl_hash_test.cc b/test/cpl_hash_test.cc
index 28a9420da..5b15c6ee0 100644
--- a/test/cpl_hash_test.cc
+++ b/test/cpl_hash_test.cc
@@ -34,7 +34,7 @@
 
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 BOOST_AUTO_TEST_CASE (hash_added_to_imported_dcp_test)
diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc
index 231a99da2..0cd972249 100644
--- a/test/dcp_decoder_test.cc
+++ b/test/dcp_decoder_test.cc
@@ -39,7 +39,7 @@
 using std::list;
 using std::string;
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /* Check that DCPDecoder reuses old data when it should */
 BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
@@ -91,12 +91,12 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	BOOST_REQUIRE (!wait_for_jobs());
 	shared_ptr<Player> player (new Player(test));
 
-	shared_ptr<DCPDecoder> decoder = boost::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
+	shared_ptr<DCPDecoder> decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);
 	list<shared_ptr<dcp::Reel> > reels = decoder->reels();
 
 	ov_content->set_position (test, dcpomatic::DCPTime(96000));
-	decoder = boost::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
+	decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);
 	BOOST_REQUIRE (reels == decoder->reels());
 
@@ -109,14 +109,14 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	BOOST_REQUIRE (!wait_for_jobs());
 	player.reset (new Player(test));
 
-	decoder = boost::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
+	decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);
 	reels = decoder->reels();
 
 	vf_content->add_ov (ov->dir(ov->dcp_name(false)));
 	JobManager::instance()->add (shared_ptr<Job>(new ExamineContentJob(test, vf_content)));
 	BOOST_REQUIRE (!wait_for_jobs());
-	decoder = boost::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
+	decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);
 	BOOST_REQUIRE (reels != decoder->reels());
 
@@ -127,14 +127,14 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	BOOST_REQUIRE (!wait_for_jobs());
 	player.reset (new Player(test));
 
-	decoder = boost::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
+	decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);
 	reels = decoder->reels();
 
 	encrypted_content->add_kdm (kdm);
 	JobManager::instance()->add (shared_ptr<Job>(new ExamineContentJob(test, encrypted_content)));
 	BOOST_REQUIRE (!wait_for_jobs());
-	decoder = boost::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
+	decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);
 	BOOST_REQUIRE (reels != decoder->reels());
 }
diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index 05554f4ed..fd4c939bd 100644
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -26,7 +26,7 @@
 #include <boost/test/unit_test.hpp>
 
 using std::pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index f7e7fe795..a3ef673fe 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -40,7 +40,7 @@
 
 using std::cout;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/test/digest_test.cc b/test/digest_test.cc
index b1effc906..5145ee7e3 100644
--- a/test/digest_test.cc
+++ b/test/digest_test.cc
@@ -36,7 +36,7 @@
 
 using std::list;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 static string
 openssl_hash (boost::filesystem::path file)
diff --git a/test/empty_test.cc b/test/empty_test.cc
index 9a1f98ed2..9f55499da 100644
--- a/test/empty_test.cc
+++ b/test/empty_test.cc
@@ -35,7 +35,7 @@
 #include <boost/test/unit_test.hpp>
 
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/test/ffmpeg_audio_only_test.cc b/test/ffmpeg_audio_only_test.cc
index 5e2c130a5..020c2cc13 100644
--- a/test/ffmpeg_audio_only_test.cc
+++ b/test/ffmpeg_audio_only_test.cc
@@ -40,14 +40,14 @@ using std::min;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
-using boost::shared_ptr;
+using std::shared_ptr;
 
 static SNDFILE* ref = 0;
 static int ref_buffer_size = 0;
 static float* ref_buffer = 0;
 
 static void
-audio (boost::shared_ptr<AudioBuffers> audio, int channels)
+audio (std::shared_ptr<AudioBuffers> audio, int channels)
 {
 	/* Check that we have a big enough buffer */
 	BOOST_CHECK (audio->frames() * audio->channels() < ref_buffer_size);
diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index a54ffa081..fc315ec2d 100644
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -42,7 +42,7 @@
 #include <boost/test/unit_test.hpp>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 {
diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 8de8feeba..ea3b8d4f9 100644
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -35,7 +35,7 @@
 #include "lib/video_content.h"
 #include "test.h"
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 {
diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
index 33b407a97..01eec0110 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -42,7 +42,7 @@ using std::cerr;
 using std::vector;
 using std::list;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index bf6668586..f81ebda9c 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -39,7 +39,7 @@
 using std::cout;
 using std::cerr;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using boost::bind;
 #if BOOST_VERSION >= 106100
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 505bca766..684a67cf5 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -35,7 +35,7 @@
 #include <boost/test/unit_test.hpp>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using namespace dcpomatic;
 
diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index fbc3e51f0..9c3311719 100644
--- a/test/ffmpeg_examiner_test.cc
+++ b/test/ffmpeg_examiner_test.cc
@@ -29,7 +29,7 @@
 #include "lib/ffmpeg_audio_stream.h"
 #include "test.h"
 
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcpomatic;
 
 /** Check that the FFmpegExaminer can extract the first video and audio time
diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc
index 35996f01a..134881c0d 100644
--- a/test/ffmpeg_pts_offset_test.cc
+++ b/test/ffmpeg_pts_offset_test.cc
@@ -31,7 +31,7 @@
 #include "lib/audio_content.h"
 #include "test.h"
 
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcpomatic;
 
 BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index ebc89d6b1..6fce51060 100644
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -36,7 +36,7 @@
 #include <boost/regex.hpp>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 class Keep
 {
diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 6af4b7ffe..d1c30c398 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -33,7 +33,7 @@
 
 using std::string;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (film_metadata_test)
 {
diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc
index 2a0aa9415..76a8ed5cb 100644
--- a/test/frame_rate_test.cc
+++ b/test/frame_rate_test.cc
@@ -35,7 +35,7 @@
 #include "lib/audio_content.h"
 #include "test.h"
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /* Test Playlist::best_dcp_frame_rate and FrameRateChange
    with a single piece of content.
diff --git a/test/hints_test.cc b/test/hints_test.cc
index 5222f9046..1be36193a 100644
--- a/test/hints_test.cc
+++ b/test/hints_test.cc
@@ -28,14 +28,13 @@
 #include "lib/text_content.h"
 #include "lib/util.h"
 #include "test.h"
-#include <boost/shared_ptr.hpp>
 #include <boost/test/unit_test.hpp>
 
 
 using std::string;
 using std::vector;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 vector<string> current_hints;
diff --git a/test/image_content_fade_test.cc b/test/image_content_fade_test.cc
index 30da3ef3a..61f1c4848 100644
--- a/test/image_content_fade_test.cc
+++ b/test/image_content_fade_test.cc
@@ -27,7 +27,7 @@
 
 using std::string;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (image_content_fade_test)
 {
diff --git a/test/image_proxy_test.cc b/test/image_proxy_test.cc
index a80a97f07..9dedb854a 100644
--- a/test/image_proxy_test.cc
+++ b/test/image_proxy_test.cc
@@ -22,11 +22,10 @@
 #include "lib/ffmpeg_image_proxy.h"
 #include "lib/j2k_image_proxy.h"
 #include "test.h"
-#include <boost/shared_ptr.hpp>
 #include <boost/test/unit_test.hpp>
 
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 static const boost::filesystem::path data_file0 = TestPaths::private_data() / "player_seek_test_0.png";
diff --git a/test/image_test.cc b/test/image_test.cc
index 3d599b82d..88bb00b8d 100644
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -34,7 +34,7 @@
 using std::string;
 using std::list;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (aligned_image_test)
 {
@@ -460,9 +460,9 @@ BOOST_AUTO_TEST_CASE (make_black_test)
 
 	int N = 0;
 	for (list<AVPixelFormat>::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) {
-		boost::shared_ptr<Image> foo (new Image (*i, in_size, true));
+		std::shared_ptr<Image> foo (new Image (*i, in_size, true));
 		foo->make_black ();
-		boost::shared_ptr<Image> bar = foo->scale (out_size, dcp::YUV_TO_RGB_REC601, AV_PIX_FMT_RGB24, true, false);
+		std::shared_ptr<Image> bar = foo->scale (out_size, dcp::YUV_TO_RGB_REC601, AV_PIX_FMT_RGB24, true, false);
 
 		uint8_t* p = bar->data()[0];
 		for (int y = 0; y < bar->size().height; ++y) {
diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index cb485e68a..05b020e1c 100644
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -43,8 +43,8 @@
 using std::vector;
 using std::string;
 using std::map;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 /** Make an encrypted DCP, import it and make a new unencrypted DCP */
 BOOST_AUTO_TEST_CASE (import_dcp_test)
diff --git a/test/interrupt_encoder_test.cc b/test/interrupt_encoder_test.cc
index 85428e7d3..e146d2916 100644
--- a/test/interrupt_encoder_test.cc
+++ b/test/interrupt_encoder_test.cc
@@ -33,7 +33,7 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Interrupt a DCP encode when it is in progress, as this used to (still does?)
  *  sometimes give an error related to pthreads.
diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index 29bcff6ed..11886cbef 100644
--- a/test/isdcf_name_test.cc
+++ b/test/isdcf_name_test.cc
@@ -38,7 +38,7 @@
 #include <iostream>
 
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (isdcf_name_test)
 {
diff --git a/test/j2k_bandwidth_test.cc b/test/j2k_bandwidth_test.cc
index a1e6c1ac6..c114cbfe7 100644
--- a/test/j2k_bandwidth_test.cc
+++ b/test/j2k_bandwidth_test.cc
@@ -30,10 +30,10 @@
 #include "lib/video_content.h"
 #include <dcp/raw_convert.h>
 #include <boost/test/unit_test.hpp>
-#include <boost/shared_ptr.hpp>
+
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 static void
 check (int target_bits_per_second)
diff --git a/test/job_test.cc b/test/job_test.cc
index cc1c7ba89..c834ec12e 100644
--- a/test/job_test.cc
+++ b/test/job_test.cc
@@ -29,7 +29,7 @@
 #include "lib/cross.h"
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 class TestJob : public Job
 {
diff --git a/test/kdm_naming_test.cc b/test/kdm_naming_test.cc
index 4ff0233dc..bd329eeee 100644
--- a/test/kdm_naming_test.cc
+++ b/test/kdm_naming_test.cc
@@ -26,14 +26,14 @@
 #include "lib/kdm_with_metadata.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
-#include <boost/shared_ptr.hpp>
+
 
 using std::list;
 using std::string;
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 
 static
 bool
diff --git a/test/markers_test.cc b/test/markers_test.cc
index cbdad26c5..28c9eed42 100644
--- a/test/markers_test.cc
+++ b/test/markers_test.cc
@@ -37,7 +37,7 @@
 
 using std::string;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 /** Check that FFOC and LFOC are automatically added if not specified */
diff --git a/test/no_use_video_test.cc b/test/no_use_video_test.cc
index 46b7e2aef..3bda3ccc4 100644
--- a/test/no_use_video_test.cc
+++ b/test/no_use_video_test.cc
@@ -41,8 +41,8 @@
 #include <boost/test/unit_test.hpp>
 
 
-using boost::dynamic_pointer_cast;
-using boost::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::shared_ptr;
 
 
 /** Overlay two video-only bits of content, don't use the video on one and
diff --git a/test/optimise_stills_test.cc b/test/optimise_stills_test.cc
index a57518b2d..d0f2aaa6b 100644
--- a/test/optimise_stills_test.cc
+++ b/test/optimise_stills_test.cc
@@ -39,8 +39,8 @@ using std::string;
 using std::vector;
 using boost::starts_with;
 using boost::split;
-using boost::dynamic_pointer_cast;
-using boost::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::shared_ptr;
 
 static
 void
diff --git a/test/player_test.cc b/test/player_test.cc
index b5f082e74..46bd01609 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -46,7 +46,7 @@
 using std::cout;
 using std::list;
 using std::pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::bind;
 using boost::optional;
 #if BOOST_VERSION >= 106100
diff --git a/test/pulldown_detect_test.cc b/test/pulldown_detect_test.cc
index e6adb288f..3c2df826c 100644
--- a/test/pulldown_detect_test.cc
+++ b/test/pulldown_detect_test.cc
@@ -26,7 +26,7 @@
 #include <boost/test/unit_test.hpp>
 
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 BOOST_AUTO_TEST_CASE (pulldown_detect_test1)
diff --git a/test/recover_test.cc b/test/recover_test.cc
index 01afa5e92..aa8da8ba9 100644
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -37,7 +37,7 @@
 
 using std::cout;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/test/reel_writer_test.cc b/test/reel_writer_test.cc
index a5a3ed83b..1223a217a 100644
--- a/test/reel_writer_test.cc
+++ b/test/reel_writer_test.cc
@@ -39,7 +39,7 @@
 #include <boost/test/unit_test.hpp>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 
 static bool equal (dcp::FrameInfo a, ReelWriter const & writer, shared_ptr<InfoFileHandle> file, Frame frame, Eyes eyes)
diff --git a/test/reels_test.cc b/test/reels_test.cc
index 01b2f9b4a..b609052b9 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -41,7 +41,7 @@ using std::list;
 using std::cout;
 using std::vector;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::function;
 using namespace dcpomatic;
 
diff --git a/test/remake_id_test.cc b/test/remake_id_test.cc
index 2a96a1488..488fada90 100644
--- a/test/remake_id_test.cc
+++ b/test/remake_id_test.cc
@@ -32,9 +32,9 @@
 
 using std::string;
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 
 /** Check for bug #1126 whereby making a new DCP using the same video asset as an old one
  *  corrupts the old one.
diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc
index 27d76ed31..81738c2ea 100644
--- a/test/remake_with_subtitle_test.cc
+++ b/test/remake_with_subtitle_test.cc
@@ -25,8 +25,8 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 /** Check that if we remake a DCP having turned off subtitles the code notices
  *  and doesn't re-use the old video data.
diff --git a/test/repeat_frame_test.cc b/test/repeat_frame_test.cc
index 125f46686..fbbaba3f1 100644
--- a/test/repeat_frame_test.cc
+++ b/test/repeat_frame_test.cc
@@ -34,7 +34,7 @@
 #include "lib/dcp_content_type.h"
 #include "lib/video_content.h"
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (repeat_frame_test)
 {
diff --git a/test/required_disk_space_test.cc b/test/required_disk_space_test.cc
index d1ff82ca6..a4be8b9b7 100644
--- a/test/required_disk_space_test.cc
+++ b/test/required_disk_space_test.cc
@@ -29,8 +29,8 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 void check_within_n (int64_t a, int64_t b, int64_t n)
 {
diff --git a/test/resampler_test.cc b/test/resampler_test.cc
index 893fad3b5..2978d27f9 100644
--- a/test/resampler_test.cc
+++ b/test/resampler_test.cc
@@ -31,7 +31,7 @@
 
 using std::pair;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 static void
 resampler_test_one (int from, int to)
diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index 491b63723..809748e28 100644
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -32,7 +32,7 @@
 #include "test.h"
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 static void scaling_test_for (shared_ptr<Film> film, shared_ptr<Content> content, float ratio, std::string image, string container)
 {
diff --git a/test/shuffler_test.cc b/test/shuffler_test.cc
index aac8285a6..f6a2a358c 100644
--- a/test/shuffler_test.cc
+++ b/test/shuffler_test.cc
@@ -4,8 +4,8 @@
 #include <boost/test/unit_test.hpp>
 
 using std::list;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 9c432d3e2..e1d893ccb 100644
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -39,7 +39,7 @@
 
 using std::string;
 using boost::lexical_cast;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 static void
 test_silence_padding (int channels)
diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
index 4b137c991..928d173df 100644
--- a/test/skip_frame_test.cc
+++ b/test/skip_frame_test.cc
@@ -34,7 +34,7 @@
 #include "lib/dcp_content_type.h"
 #include "lib/video_content.h"
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (skip_frame_test)
 {
diff --git a/test/socket_test.cc b/test/socket_test.cc
index 872136a71..b9aaba9d2 100644
--- a/test/socket_test.cc
+++ b/test/socket_test.cc
@@ -23,13 +23,12 @@
 #include <dcp/raw_convert.h>
 #include <boost/thread.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/shared_ptr.hpp>
 #include <cstring>
 #include <iostream>
 
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::bind;
 
 
@@ -83,7 +82,7 @@ public:
 	}
 
 private:
-	void handle (boost::shared_ptr<Socket> socket)
+	void handle (std::shared_ptr<Socket> socket)
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		BOOST_REQUIRE (_size);
diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 1ea4538ba..d07d70ba0 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -36,7 +36,7 @@
 
 using std::string;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcpomatic;
 
 /** Make a very short DCP with a single subtitle from .srt with no specified fonts */
diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc
index c07666aa0..0756deed9 100644
--- a/test/ssa_subtitle_test.cc
+++ b/test/ssa_subtitle_test.cc
@@ -36,7 +36,7 @@
 
 using std::string;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Make a DCP with subs from a .ssa file */
 BOOST_AUTO_TEST_CASE (ssa_subtitle_test1)
diff --git a/test/stream_test.cc b/test/stream_test.cc
index b4b7c260b..a706906f8 100644
--- a/test/stream_test.cc
+++ b/test/stream_test.cc
@@ -34,7 +34,7 @@ DCPOMATIC_ENABLE_WARNINGS
 
 using std::pair;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (stream_test)
 {
diff --git a/test/subtitle_charset_test.cc b/test/subtitle_charset_test.cc
index 67bde8927..ada358a63 100644
--- a/test/subtitle_charset_test.cc
+++ b/test/subtitle_charset_test.cc
@@ -26,8 +26,8 @@
 #include "lib/string_text_file_content.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 /** Test parsing of UTF16 CR/LF input */
 BOOST_AUTO_TEST_CASE (subtitle_charset_test1)
diff --git a/test/subtitle_language_test.cc b/test/subtitle_language_test.cc
index 50efb71a1..28c278c94 100644
--- a/test/subtitle_language_test.cc
+++ b/test/subtitle_language_test.cc
@@ -33,7 +33,7 @@
 
 using std::string;
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 BOOST_AUTO_TEST_CASE (subtitle_language_interop_test)
diff --git a/test/subtitle_metadata_test.cc b/test/subtitle_metadata_test.cc
index a60d0675c..f79aa08f8 100644
--- a/test/subtitle_metadata_test.cc
+++ b/test/subtitle_metadata_test.cc
@@ -27,12 +27,11 @@
 #include "lib/film.h"
 #include "test.h"
 #include <boost/filesystem.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/test/unit_test.hpp>
 
 
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 BOOST_AUTO_TEST_CASE (subtitle_metadata_test1)
diff --git a/test/subtitle_reel_number_test.cc b/test/subtitle_reel_number_test.cc
index 23e03b7bc..e5f1667ef 100644
--- a/test/subtitle_reel_number_test.cc
+++ b/test/subtitle_reel_number_test.cc
@@ -33,8 +33,8 @@
 #include <boost/test/unit_test.hpp>
 
 using std::string;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 /* Check that ReelNumber is setup correctly when making multi-reel subtitled DCPs */
 BOOST_AUTO_TEST_CASE (subtitle_reel_number_test)
diff --git a/test/subtitle_reel_test.cc b/test/subtitle_reel_test.cc
index 2c5c364d0..6e55ee62f 100644
--- a/test/subtitle_reel_test.cc
+++ b/test/subtitle_reel_test.cc
@@ -38,7 +38,7 @@
 using std::list;
 using std::string;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 /* Check that timings are done correctly for multi-reel DCPs with PNG subs */
@@ -80,12 +80,12 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_test)
 	list<shared_ptr<dcp::Reel> >::const_iterator i = reels.begin ();
 	BOOST_REQUIRE ((*i)->main_subtitle());
 	BOOST_REQUIRE ((*i)->main_subtitle()->asset());
-	shared_ptr<dcp::InteropSubtitleAsset> A = boost::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
+	shared_ptr<dcp::InteropSubtitleAsset> A = std::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
 	BOOST_REQUIRE (A);
 	++i;
 	BOOST_REQUIRE ((*i)->main_subtitle());
 	BOOST_REQUIRE ((*i)->main_subtitle()->asset());
-	shared_ptr<dcp::InteropSubtitleAsset> B = boost::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
+	shared_ptr<dcp::InteropSubtitleAsset> B = std::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
 	BOOST_REQUIRE (B);
 
 	BOOST_REQUIRE_EQUAL (A->subtitles().size(), 1U);
diff --git a/test/subtitle_trim_test.cc b/test/subtitle_trim_test.cc
index 966fc66b6..3a615c8d8 100644
--- a/test/subtitle_trim_test.cc
+++ b/test/subtitle_trim_test.cc
@@ -23,7 +23,7 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcpomatic;
 
 /** Check for no crash when trimming DCP subtitles (#1275) */
diff --git a/test/test.cc b/test/test.cc
index a8c3eb1e4..19e8f978a 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -68,9 +68,9 @@ using std::cout;
 using std::cerr;
 using std::list;
 using std::abs;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::scoped_array;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/test/test.h b/test/test.h
index 4968d3301..44ca706f6 100644
--- a/test/test.h
+++ b/test/test.h
@@ -18,9 +18,10 @@
 
 */
 
+
 #include "lib/warnings.h"
 #include <boost/filesystem.hpp>
-#include <boost/shared_ptr.hpp>
+
 
 class Film;
 class Image;
@@ -36,10 +37,10 @@ public:
 
 extern bool wait_for_jobs ();
 extern void setup_test_config ();
-extern boost::shared_ptr<Film> new_test_film (std::string);
-extern boost::shared_ptr<Film> new_test_film2 (std::string);
+extern std::shared_ptr<Film> new_test_film (std::string);
+extern std::shared_ptr<Film> new_test_film2 (std::string);
 extern void check_dcp (boost::filesystem::path, boost::filesystem::path);
-extern void check_dcp (boost::filesystem::path, boost::shared_ptr<const Film>);
+extern void check_dcp (boost::filesystem::path, std::shared_ptr<const Film>);
 extern void check_file (boost::filesystem::path ref, boost::filesystem::path check);
 extern void check_wav_file (boost::filesystem::path ref, boost::filesystem::path check);
 extern void check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check);
@@ -49,19 +50,19 @@ extern void check_file (boost::filesystem::path, boost::filesystem::path);
 extern void check_ffmpeg (boost::filesystem::path, boost::filesystem::path, int audio_tolerance);
 extern void check_image (boost::filesystem::path, boost::filesystem::path, double threshold = 4);
 extern boost::filesystem::path test_film_dir (std::string);
-extern void write_image (boost::shared_ptr<const Image> image, boost::filesystem::path file);
-boost::filesystem::path dcp_file (boost::shared_ptr<const Film> film, std::string prefix);
+extern void write_image (std::shared_ptr<const Image> image, boost::filesystem::path file);
+boost::filesystem::path dcp_file (std::shared_ptr<const Film> film, std::string prefix);
 void check_one_frame (boost::filesystem::path dcp, int64_t index, boost::filesystem::path ref);
-extern boost::filesystem::path subtitle_file (boost::shared_ptr<Film> film);
+extern boost::filesystem::path subtitle_file (std::shared_ptr<Film> film);
 extern void make_random_file (boost::filesystem::path path, size_t size);
 
 class LogSwitcher
 {
 public:
-	LogSwitcher (boost::shared_ptr<Log> log);
+	LogSwitcher (std::shared_ptr<Log> log);
 	~LogSwitcher ();
 
 private:
-	boost::shared_ptr<Log> _old;
+	std::shared_ptr<Log> _old;
 };
 
diff --git a/test/threed_test.cc b/test/threed_test.cc
index b181d15cb..e6a91a910 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -37,7 +37,7 @@
 #include <iostream>
 
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Basic sanity check of 3D_LEFT_RIGHT */
 BOOST_AUTO_TEST_CASE (threed_test1)
diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index 8c57a9fdb..d0cf63bb2 100644
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -33,7 +33,7 @@
 
 using std::string;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcpomatic;
 
 static string const xml = "<Content>"
diff --git a/test/torture_test.cc b/test/torture_test.cc
index 27b4b5d14..23eb3ca8e 100644
--- a/test/torture_test.cc
+++ b/test/torture_test.cc
@@ -43,8 +43,8 @@
 
 using std::list;
 using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using namespace dcpomatic;
 
 /** Test start/end trim and positioning of some audio content */
diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc
index 085a0dd04..35224ff23 100644
--- a/test/upmixer_a_test.cc
+++ b/test/upmixer_a_test.cc
@@ -34,7 +34,7 @@
 #include "lib/upmixer_a.h"
 #include "test.h"
 
-using boost::shared_ptr;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/test/util_test.cc b/test/util_test.cc
index 9f03b6a47..56de057a6 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -34,7 +34,7 @@
 using std::string;
 using std::vector;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc
index 5d16e3be5..7a9c30263 100644
--- a/test/vf_kdm_test.cc
+++ b/test/vf_kdm_test.cc
@@ -38,7 +38,7 @@
 
 using std::vector;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (vf_kdm_test)
 {
diff --git a/test/vf_test.cc b/test/vf_test.cc
index ad4bcf8a4..9fc02412a 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -43,8 +43,8 @@
 using std::list;
 using std::string;
 using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using namespace dcpomatic;
 
 /** Test the logic which decides whether a DCP can be referenced or not */
diff --git a/test/video_level_test.cc b/test/video_level_test.cc
index 056a500ee..95b69d2aa 100644
--- a/test/video_level_test.cc
+++ b/test/video_level_test.cc
@@ -55,12 +55,12 @@ using std::make_pair;
 using std::max;
 using std::pair;
 using std::string;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 static
diff --git a/test/video_mxf_content_test.cc b/test/video_mxf_content_test.cc
index 84c3f4733..e5241b687 100644
--- a/test/video_mxf_content_test.cc
+++ b/test/video_mxf_content_test.cc
@@ -32,8 +32,8 @@
 #include <dcp/mono_picture_asset.h>
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 static boost::filesystem::path ref_mxf = "test/data/scaling_test_185_185/j2c_c75af074-2809-453c-9192-6affb76b4ba3.mxf";