diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-10-21 09:23:12 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-10-21 22:22:18 +0200 |
| commit | 1a7c50245309bb0b99001940b2203a267de942ca (patch) | |
| tree | 58f5c4c820730a303d2567bc5d5fb727400c85bf /src/tools | |
| parent | dec38a44157da230e1dbd0dc3b7b0860c6859493 (diff) | |
macOS / new boost build fixes.v2.15.104
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_combiner.cc | 3 | ||||
| -rw-r--r-- | src/tools/dcpomatic_disk.cc | 4 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm.cc | 3 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm_cli.cc | 4 | ||||
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 3 | ||||
| -rw-r--r-- | src/tools/swaroop_dcpomatic_playlist.cc | 4 |
6 files changed, 21 insertions, 0 deletions
diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc index 5f1a7722a..d55df303f 100644 --- a/src/tools/dcpomatic_combiner.cc +++ b/src/tools/dcpomatic_combiner.cc @@ -43,6 +43,9 @@ using std::vector; using boost::dynamic_pointer_cast; using boost::optional; using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif static string diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc index 7bea4d8e9..92429aa53 100644 --- a/src/tools/dcpomatic_disk.cc +++ b/src/tools/dcpomatic_disk.cc @@ -53,6 +53,10 @@ using std::cout; using std::cerr; using boost::shared_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + class DOMFrame : public wxFrame { diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 1d623abcd..cc070b454 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -79,6 +79,9 @@ using boost::bind; using boost::optional; using boost::ref; using boost::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; enum { diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index adb14f49e..b9f73d357 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -46,8 +46,12 @@ using boost::shared_ptr; using boost::optional; using boost::bind; using boost::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; + static void help () { diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 9b88ee2c3..a82e67b88 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -95,6 +95,9 @@ using boost::optional; using boost::dynamic_pointer_cast; using boost::thread; using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::raw_convert; using namespace dcpomatic; diff --git a/src/tools/swaroop_dcpomatic_playlist.cc b/src/tools/swaroop_dcpomatic_playlist.cc index a15a7c6bd..e22961240 100644 --- a/src/tools/swaroop_dcpomatic_playlist.cc +++ b/src/tools/swaroop_dcpomatic_playlist.cc @@ -45,6 +45,10 @@ 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 { |