diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-08-08 14:38:47 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-08-08 14:38:47 +0200 |
| commit | 20b6a9862bbde42e9ce038b33ec049194a8146a5 (patch) | |
| tree | a198e280033c6636191590159293b64b1e02b426 | |
| parent | 474aeac068c193bc429d2c1f417290b2b8cd1810 (diff) | |
Fix boost bind placeholder warnings.
| -rw-r--r-- | test/asset_test.cc | 6 | ||||
| -rw-r--r-- | test/make_digest_test.cc | 7 | ||||
| -rw-r--r-- | test/markers_test.cc | 5 | ||||
| -rw-r--r-- | test/rgb_xyz_test.cc | 5 | ||||
| -rw-r--r-- | tools/dcpverify.cc | 5 |
5 files changed, 23 insertions, 5 deletions
diff --git a/test/asset_test.cc b/test/asset_test.cc index c52ebdd1..b4a48296 100644 --- a/test/asset_test.cc +++ b/test/asset_test.cc @@ -34,13 +34,17 @@ #include "asset.h" #include "equality_options.h" -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include <boost/test/unit_test.hpp> using std::string; using std::shared_ptr; using std::make_shared; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + class DummyAsset : public dcp::Asset diff --git a/test/make_digest_test.cc b/test/make_digest_test.cc index 98792e62..c710f572 100644 --- a/test/make_digest_test.cc +++ b/test/make_digest_test.cc @@ -34,12 +34,17 @@ #include "array_data.h" #include "util.h" -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include <boost/random.hpp> #include <boost/test/unit_test.hpp> #include <sys/time.h> +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + + void progress (float) { diff --git a/test/markers_test.cc b/test/markers_test.cc index 0537cbe8..316d7e9c 100644 --- a/test/markers_test.cc +++ b/test/markers_test.cc @@ -36,7 +36,7 @@ #include "equality_options.h" #include "reel.h" #include "reel_markers_asset.h" -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include <boost/test/unit_test.hpp> #include <memory> @@ -44,6 +44,9 @@ using std::make_shared; using std::shared_ptr; using std::string; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif BOOST_AUTO_TEST_CASE (markers_write_test) diff --git a/test/rgb_xyz_test.cc b/test/rgb_xyz_test.cc index 00787938..cf3eb9ff 100644 --- a/test/rgb_xyz_test.cc +++ b/test/rgb_xyz_test.cc @@ -37,7 +37,7 @@ #include "piecewise_lut.h" #include "rgb_xyz.h" #include "stream_operators.h" -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include <boost/random.hpp> #include <boost/scoped_array.hpp> #include <boost/test/unit_test.hpp> @@ -51,6 +51,9 @@ using std::shared_ptr; using std::string; using boost::optional; using boost::scoped_array; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif static diff --git a/tools/dcpverify.cc b/tools/dcpverify.cc index 1b9bab80..770dd78f 100644 --- a/tools/dcpverify.cc +++ b/tools/dcpverify.cc @@ -37,7 +37,7 @@ #include "raw_convert.h" #include "verify.h" #include "version.h" -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include <boost/filesystem.hpp> #include <boost/optional.hpp> #include <getopt.h> @@ -52,6 +52,9 @@ using std::string; using std::vector; using boost::bind; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif static void |