projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ec04e5a
)
Some macOS test build fixes.
author
Carl Hetherington
<cth@carlh.net>
Thu, 8 Oct 2020 19:30:00 +0000
(21:30 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 13 Oct 2020 16:51:11 +0000
(18:51 +0200)
13 files changed:
test/butler_test.cc
patch
|
blob
|
history
test/dcp_playback_test.cc
patch
|
blob
|
history
test/dcp_subtitle_test.cc
patch
|
blob
|
history
test/empty_test.cc
patch
|
blob
|
history
test/ffmpeg_audio_only_test.cc
patch
|
blob
|
history
test/ffmpeg_decoder_seek_test.cc
patch
|
blob
|
history
test/ffmpeg_decoder_sequential_test.cc
patch
|
blob
|
history
test/player_test.cc
patch
|
blob
|
history
test/recover_test.cc
patch
|
blob
|
history
test/shuffler_test.cc
patch
|
blob
|
history
test/test.cc
patch
|
blob
|
history
test/upmixer_a_test.cc
patch
|
blob
|
history
test/util_test.cc
patch
|
blob
|
history
diff --git
a/test/butler_test.cc
b/test/butler_test.cc
index 7575728fd3fce3bc6364df24145ff3013960cce2..9f87662fcfcc0b664e2d04fc638c996472083c57 100644
(file)
--- a/
test/butler_test.cc
+++ b/
test/butler_test.cc
@@
-29,6
+29,9
@@
#include <boost/test/unit_test.hpp>
using boost::shared_ptr;
#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)
using namespace dcpomatic;
BOOST_AUTO_TEST_CASE (butler_test1)
diff --git
a/test/dcp_playback_test.cc
b/test/dcp_playback_test.cc
index 2cabd0a0b266cc7dac24a309ebeab64d05e89297..120fecede9b17ab4dbfca8b3f43a7b63428f6c1a 100644
(file)
--- 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;
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 */
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 e94990798efff4fd0442bb438799d6edb5ff3c6b..4938cfb6dc1ee4759f54a1b9d53f94e562954fd7 100644
(file)
--- 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;
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;
using namespace dcpomatic;
optional<ContentStringText> stored;
diff --git
a/test/empty_test.cc
b/test/empty_test.cc
index 60427ca406b1cc983cb7a83f78fea7f52bde02dc..7b374ba49e9b8dd0d5938a119dc443c0fa4decf3 100644
(file)
--- a/
test/empty_test.cc
+++ b/
test/empty_test.cc
@@
-36,6
+36,9
@@
using std::list;
using boost::shared_ptr;
using std::list;
using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
bool
using namespace dcpomatic;
bool
diff --git
a/test/ffmpeg_audio_only_test.cc
b/test/ffmpeg_audio_only_test.cc
index 6fc9f9f2cda58f03a5beef38abaed9edc115589b..13b25e1a89dadd4e610c80316c7a7b592ed0ae2b 100644
(file)
--- a/
test/ffmpeg_audio_only_test.cc
+++ b/
test/ffmpeg_audio_only_test.cc
@@
-37,6
+37,9
@@
#include <iostream>
using std::min;
#include <iostream>
using std::min;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using boost::shared_ptr;
static SNDFILE* ref = 0;
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 7ee225d510943e3bf56998ad46a1608a052b1e5e..230c5476869c9aa70632be3b59f47ac1e152b142 100644
(file)
--- 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;
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;
using namespace dcpomatic;
static optional<ContentVideo> stored;
diff --git
a/test/ffmpeg_decoder_sequential_test.cc
b/test/ffmpeg_decoder_sequential_test.cc
index d8293b6fe3df69a0216f0d29e7fbdf387a9379a0..b4ff8ce5fd4b2369b862164ae85cdf88a93af16a 100644
(file)
--- 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;
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;
using namespace dcpomatic;
static DCPTime next;
diff --git
a/test/player_test.cc
b/test/player_test.cc
index 6dd78dbb298adaff8e3fc4110c99fe6202afc64d..c41920de805c6c698110396bdcdbf1238a07880b 100644
(file)
--- 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;
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;
using namespace dcpomatic;
static shared_ptr<AudioBuffers> accumulated;
diff --git
a/test/recover_test.cc
b/test/recover_test.cc
index ad7f475bc0eb5e554a73075cb93ba7c2a24a88c7..84e6a74e3984e96943ef6eaca52b83c1bf1c3f2a 100644
(file)
--- a/
test/recover_test.cc
+++ b/
test/recover_test.cc
@@
-38,6
+38,9
@@
using std::cout;
using std::string;
using boost::shared_ptr;
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)
static void
note (dcp::NoteType t, string n)
diff --git
a/test/shuffler_test.cc
b/test/shuffler_test.cc
index 6d90ba27d99092f32dc3d850bb49c882fe7f1043..aac8285a66992397b25eab589786d6c08dc636fd 100644
(file)
--- 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;
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)
static void
push (Shuffler& s, int frame, Eyes eyes)
diff --git
a/test/test.cc
b/test/test.cc
index e0cf11a467ebf668b77f831692606ee8bc119e1c..03e8768f406dec95180e7629082c294b0784c823 100644
(file)
--- 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;
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
boost::filesystem::path
diff --git
a/test/upmixer_a_test.cc
b/test/upmixer_a_test.cc
index ba07eafd157d11cda985371dc862c431713acbfa..2d1e652229cf2413adda872b9fc4d50693e2ae82 100644
(file)
--- a/
test/upmixer_a_test.cc
+++ b/
test/upmixer_a_test.cc
@@
-35,6
+35,9
@@
#include "test.h"
using boost::shared_ptr;
#include "test.h"
using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
static SNDFILE* L;
using namespace dcpomatic;
static SNDFILE* L;
diff --git
a/test/util_test.cc
b/test/util_test.cc
index 610555ad687a0ce2dc8400846acdd996d823fc95..c1d11b7612c5968696bb58a41a5bbe5d7815dc72 100644
(file)
--- 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;
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)
using namespace dcpomatic;
BOOST_AUTO_TEST_CASE (digest_head_tail_test)