projects
/
libdcp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
474aeac
)
Fix boost bind placeholder warnings.
author
Carl Hetherington
<cth@carlh.net>
Tue, 8 Aug 2023 12:38:47 +0000
(14:38 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 8 Aug 2023 12:38:47 +0000
(14:38 +0200)
test/asset_test.cc
patch
|
blob
|
history
test/make_digest_test.cc
patch
|
blob
|
history
test/markers_test.cc
patch
|
blob
|
history
test/rgb_xyz_test.cc
patch
|
blob
|
history
tools/dcpverify.cc
patch
|
blob
|
history
diff --git
a/test/asset_test.cc
b/test/asset_test.cc
index c52ebdd11c5b0ef61c1b598c5da874136ccbc88a..b4a48296c8cc388be264ef68c5afce85c9662060 100644
(file)
--- a/
test/asset_test.cc
+++ b/
test/asset_test.cc
@@
-34,13
+34,17
@@
#include "asset.h"
#include "equality_options.h"
#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;
#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
class DummyAsset : public dcp::Asset
diff --git
a/test/make_digest_test.cc
b/test/make_digest_test.cc
index 98792e62910a8da286a5638ef1a4dcc3567891da..c710f572872e98e6c8d3965b5f9ec69ab3c6ffec 100644
(file)
--- a/
test/make_digest_test.cc
+++ b/
test/make_digest_test.cc
@@
-34,12
+34,17
@@
#include "array_data.h"
#include "util.h"
#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>
#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)
{
void progress (float)
{
diff --git
a/test/markers_test.cc
b/test/markers_test.cc
index 0537cbe85885370d397581f8bb8fa64da1b7966a..316d7e9cd47bb9e4b60ad1dfc31d26b66fea6de7 100644
(file)
--- 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 "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>
#include <boost/test/unit_test.hpp>
#include <memory>
@@
-44,6
+44,9
@@
using std::make_shared;
using std::shared_ptr;
using std::string;
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)
BOOST_AUTO_TEST_CASE (markers_write_test)
diff --git
a/test/rgb_xyz_test.cc
b/test/rgb_xyz_test.cc
index 007879389bf0b7376967f5b69c52739825a98505..cf3eb9ffa35201034a721d295101465595a9f6af 100644
(file)
--- 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 "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>
#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;
using std::string;
using boost::optional;
using boost::scoped_array;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
static
static
diff --git
a/tools/dcpverify.cc
b/tools/dcpverify.cc
index 1b9bab80d9c294948f41799ad056830f7a4eca3a..770dd78fa75c93bf9f37df5e2329f15dbf17ca56 100644
(file)
--- a/
tools/dcpverify.cc
+++ b/
tools/dcpverify.cc
@@
-37,7
+37,7
@@
#include "raw_convert.h"
#include "verify.h"
#include "version.h"
#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>
#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;
using std::vector;
using boost::bind;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
static void
static void