diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-10-08 21:30:00 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-10-13 18:51:11 +0200 |
| commit | 497803ab4424ce23affd231a01d625ddf3cf3aca (patch) | |
| tree | 451c08c8e70d65df680f75aa4df114f1a7698826 | |
| parent | ec04e5a068b8040d47fa125b8414a49a34f7b1a6 (diff) | |
Some macOS test build fixes.
| -rw-r--r-- | test/butler_test.cc | 3 | ||||
| -rw-r--r-- | test/dcp_playback_test.cc | 3 | ||||
| -rw-r--r-- | test/dcp_subtitle_test.cc | 3 | ||||
| -rw-r--r-- | test/empty_test.cc | 3 | ||||
| -rw-r--r-- | test/ffmpeg_audio_only_test.cc | 3 | ||||
| -rw-r--r-- | test/ffmpeg_decoder_seek_test.cc | 3 | ||||
| -rw-r--r-- | test/ffmpeg_decoder_sequential_test.cc | 3 | ||||
| -rw-r--r-- | test/player_test.cc | 3 | ||||
| -rw-r--r-- | test/recover_test.cc | 3 | ||||
| -rw-r--r-- | test/shuffler_test.cc | 4 | ||||
| -rw-r--r-- | test/test.cc | 3 | ||||
| -rw-r--r-- | test/upmixer_a_test.cc | 3 | ||||
| -rw-r--r-- | test/util_test.cc | 3 |
13 files changed, 40 insertions, 0 deletions
diff --git a/test/butler_test.cc b/test/butler_test.cc index 7575728fd..9f87662fc 100644 --- a/test/butler_test.cc +++ b/test/butler_test.cc @@ -29,6 +29,9 @@ #include <boost/test/unit_test.hpp> using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; BOOST_AUTO_TEST_CASE (butler_test1) diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index 2cabd0a0b..120fecede 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -28,6 +28,9 @@ using std::pair; using boost::shared_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; /** Simulate the work that the player does, for profiling */ diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index e94990798..4938cfb6d 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -42,6 +42,9 @@ using std::cout; using std::list; using boost::shared_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; optional<ContentStringText> stored; diff --git a/test/empty_test.cc b/test/empty_test.cc index 60427ca40..7b374ba49 100644 --- a/test/empty_test.cc +++ b/test/empty_test.cc @@ -36,6 +36,9 @@ using std::list; using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; bool diff --git a/test/ffmpeg_audio_only_test.cc b/test/ffmpeg_audio_only_test.cc index 6fc9f9f2c..13b25e1a8 100644 --- a/test/ffmpeg_audio_only_test.cc +++ b/test/ffmpeg_audio_only_test.cc @@ -37,6 +37,9 @@ #include <iostream> using std::min; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using boost::shared_ptr; static SNDFILE* ref = 0; diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc index 7ee225d51..230c54768 100644 --- a/test/ffmpeg_decoder_seek_test.cc +++ b/test/ffmpeg_decoder_seek_test.cc @@ -44,6 +44,9 @@ using std::list; using std::cout; using boost::shared_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; static optional<ContentVideo> stored; diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc index d8293b6fe..b4ff8ce5f 100644 --- a/test/ffmpeg_decoder_sequential_test.cc +++ b/test/ffmpeg_decoder_sequential_test.cc @@ -42,6 +42,9 @@ using std::list; using boost::shared_ptr; using boost::optional; using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; static DCPTime next; diff --git a/test/player_test.cc b/test/player_test.cc index 6dd78dbb2..c41920de8 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -49,6 +49,9 @@ using std::pair; using boost::shared_ptr; using boost::bind; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; static shared_ptr<AudioBuffers> accumulated; diff --git a/test/recover_test.cc b/test/recover_test.cc index ad7f475bc..84e6a74e3 100644 --- a/test/recover_test.cc +++ b/test/recover_test.cc @@ -38,6 +38,9 @@ using std::cout; using std::string; using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif static void note (dcp::NoteType t, string n) diff --git a/test/shuffler_test.cc b/test/shuffler_test.cc index 6d90ba27d..aac8285a6 100644 --- a/test/shuffler_test.cc +++ b/test/shuffler_test.cc @@ -7,6 +7,10 @@ using std::list; using boost::shared_ptr; using boost::weak_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + static void push (Shuffler& s, int frame, Eyes eyes) diff --git a/test/test.cc b/test/test.cc index e0cf11a46..03e8768f4 100644 --- a/test/test.cc +++ b/test/test.cc @@ -71,6 +71,9 @@ using std::abs; using boost::shared_ptr; using boost::scoped_array; using boost::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif boost::filesystem::path diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc index ba07eafd1..2d1e65222 100644 --- a/test/upmixer_a_test.cc +++ b/test/upmixer_a_test.cc @@ -35,6 +35,9 @@ #include "test.h" using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; static SNDFILE* L; diff --git a/test/util_test.cc b/test/util_test.cc index 610555ad6..c1d11b761 100644 --- a/test/util_test.cc +++ b/test/util_test.cc @@ -35,6 +35,9 @@ using std::string; using std::vector; using std::list; using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; BOOST_AUTO_TEST_CASE (digest_head_tail_test) |
