From c04fec82d25127fafa73c3daff87bece9aa8c8e8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 27 Aug 2020 20:37:32 +0000 Subject: Build fixes for Boost >= 1.73 Forward-ported-from: d1e9749ca290673639a49d693a8fe5c6557cc2de --- src/tools/dcpomatic.cc | 3 +++ src/tools/dcpomatic_batch.cc | 3 +++ src/tools/dcpomatic_playlist.cc | 3 +++ src/tools/dcpomatic_server.cc | 3 +++ src/tools/server_test.cc | 3 +++ 5 files changed, 15 insertions(+) (limited to 'src/tools') diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 12b8e71df..60f11752e 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -131,6 +131,9 @@ using boost::optional; using boost::function; using boost::is_any_of; using boost::algorithm::find; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::raw_convert; class FilmChangedClosingDialog : public boost::noncopyable diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index e3beb8dc6..3517de9fe 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -53,6 +53,9 @@ using boost::shared_ptr; using boost::thread; using boost::scoped_array; using boost::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif static list films_to_load; diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc index b2b5c458a..77dd643d7 100644 --- a/src/tools/dcpomatic_playlist.cc +++ b/src/tools/dcpomatic_playlist.cc @@ -49,6 +49,9 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::bind; using boost::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif class ContentDialog : public wxDialog, public ContentStore { diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index a4ef0bc62..696fec09a 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -51,6 +51,9 @@ using boost::thread; using boost::bind; using boost::optional; using boost::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif enum { ID_status = 1, diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index 03a99b2e5..99a6b4caf 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -43,6 +43,9 @@ using std::pair; using boost::shared_ptr; using boost::optional; using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::Data; static shared_ptr film; -- cgit v1.2.3