From 1a7c50245309bb0b99001940b2203a267de942ca Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 21 Oct 2020 09:23:12 +0200 Subject: [PATCH] macOS / new boost build fixes. --- src/lib/analyse_subtitles_job.cc | 3 +++ src/lib/dcp_content.cc | 3 +++ src/lib/dcp_encoder.cc | 3 +++ src/lib/film.cc | 3 +++ src/lib/player.cc | 3 +++ src/lib/reel_writer.cc | 3 +++ src/lib/writer.cc | 3 +++ src/tools/dcpomatic_combiner.cc | 3 +++ src/tools/dcpomatic_disk.cc | 4 ++++ src/tools/dcpomatic_kdm.cc | 3 +++ src/tools/dcpomatic_kdm_cli.cc | 4 ++++ src/tools/dcpomatic_player.cc | 3 +++ src/tools/swaroop_dcpomatic_playlist.cc | 4 ++++ src/wx/audio_plot.cc | 3 +++ src/wx/closed_captions_dialog.cc | 3 +++ src/wx/content_advanced_dialog.cc | 3 +++ src/wx/content_menu.cc | 4 ++++ src/wx/controls.cc | 4 ++++ src/wx/dkdm_dialog.cc | 4 ++++ src/wx/gl_video_view.cc | 3 +++ src/wx/i18n_hook.cc | 4 ++++ src/wx/interop_metadata_dialog.cc | 4 ++++ src/wx/kdm_output_panel.cc | 4 ++++ src/wx/language_tag_dialog.cc | 3 +++ src/wx/player_config_dialog.cc | 3 +++ src/wx/recipient_dialog.cc | 3 +++ src/wx/simple_video_view.cc | 4 ++++ src/wx/smpte_metadata_dialog.cc | 3 +++ src/wx/video_waveform_dialog.cc | 4 ++++ src/wx/video_waveform_plot.cc | 5 +++++ 30 files changed, 103 insertions(+) diff --git a/src/lib/analyse_subtitles_job.cc b/src/lib/analyse_subtitles_job.cc index 7a1c4ab00..92fb9657c 100644 --- a/src/lib/analyse_subtitles_job.cc +++ b/src/lib/analyse_subtitles_job.cc @@ -33,6 +33,9 @@ using std::string; using boost::shared_ptr; using boost::weak_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif AnalyseSubtitlesJob::AnalyseSubtitlesJob (shared_ptr film, shared_ptr content) : Job (film) diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index f50778420..b4ee1444c 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -56,6 +56,9 @@ using boost::scoped_ptr; using boost::optional; using boost::function; using boost::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::raw_convert; using namespace dcpomatic; diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc index 438a73fd6..345e5511c 100644 --- a/src/lib/dcp_encoder.cc +++ b/src/lib/dcp_encoder.cc @@ -50,6 +50,9 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; /** Construct a DCP encoder. diff --git a/src/lib/film.cc b/src/lib/film.cc index e2e77cce2..87037f51f 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -102,6 +102,9 @@ using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; using boost::is_any_of; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::raw_convert; using namespace dcpomatic; diff --git a/src/lib/player.cc b/src/lib/player.cc index 57fc7a67c..4417c940d 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -78,6 +78,9 @@ using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; using boost::scoped_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; int const PlayerProperty::VIDEO_CONTAINER_SIZE = 700; diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 9272bfa30..a42c6182a 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -64,6 +64,9 @@ using std::vector; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::Data; using dcp::raw_convert; using namespace dcpomatic; diff --git a/src/lib/writer.cc b/src/lib/writer.cc index e2054dc03..d3fdc5128 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -62,6 +62,9 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::Data; using namespace dcpomatic; 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 { diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc index b8b14b2e6..35f2c93ad 100644 --- a/src/wx/audio_plot.cc +++ b/src/wx/audio_plot.cc @@ -39,6 +39,9 @@ using boost::bind; using boost::optional; using boost::shared_ptr; using boost::weak_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; int const AudioPlot::_minimum = -70; diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc index 666547d16..5522e5c4c 100644 --- a/src/wx/closed_captions_dialog.cc +++ b/src/wx/closed_captions_dialog.cc @@ -35,6 +35,9 @@ using std::make_pair; using boost::shared_ptr; using boost::weak_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer) diff --git a/src/wx/content_advanced_dialog.cc b/src/wx/content_advanced_dialog.cc index 79e6da9fa..8ab2e8dc0 100644 --- a/src/wx/content_advanced_dialog.cc +++ b/src/wx/content_advanced_dialog.cc @@ -37,6 +37,9 @@ using std::vector; using boost::bind; using boost::dynamic_pointer_cast; using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index d3115ce49..3c3b1ed3a 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -54,6 +54,10 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + enum { /* Start at 256 so we can have IDs on _cpl_menu from 1 to 255 */ diff --git a/src/wx/controls.cc b/src/wx/controls.cc index caa0dc823..86329efb3 100644 --- a/src/wx/controls.cc +++ b/src/wx/controls.cc @@ -52,8 +52,12 @@ using boost::optional; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; + Controls::Controls (wxWindow* parent, shared_ptr viewer, bool editor_controls) : wxPanel (parent) , _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096)) diff --git a/src/wx/dkdm_dialog.cc b/src/wx/dkdm_dialog.cc index c77123526..5b89d28fa 100644 --- a/src/wx/dkdm_dialog.cc +++ b/src/wx/dkdm_dialog.cc @@ -49,6 +49,10 @@ using std::runtime_error; using boost::shared_ptr; using boost::bind; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr film) : wxDialog (parent, wxID_ANY, _("Make DKDMs")) diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index a82d5a276..79ede0d8e 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -51,6 +51,9 @@ using std::cout; using boost::shared_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif static void diff --git a/src/wx/i18n_hook.cc b/src/wx/i18n_hook.cc index b2cd6df8e..b2797fa51 100644 --- a/src/wx/i18n_hook.cc +++ b/src/wx/i18n_hook.cc @@ -27,6 +27,10 @@ using std::map; using std::string; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + map I18NHook::_translations; diff --git a/src/wx/interop_metadata_dialog.cc b/src/wx/interop_metadata_dialog.cc index f91bdcf7f..186e9bbcd 100644 --- a/src/wx/interop_metadata_dialog.cc +++ b/src/wx/interop_metadata_dialog.cc @@ -29,6 +29,10 @@ using std::string; using std::vector; using boost::weak_ptr; using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + static string column (dcp::Rating r, int c) diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index 294fdd4df..35ce4fc27 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -50,6 +50,10 @@ using std::exception; using std::make_pair; using boost::shared_ptr; using boost::function; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) : wxPanel (parent, wxID_ANY) diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc index f4e54e94b..2854479a7 100644 --- a/src/wx/language_tag_dialog.cc +++ b/src/wx/language_tag_dialog.cc @@ -43,6 +43,9 @@ using std::vector; using boost::optional; using boost::shared_ptr; using boost::weak_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif class SubtagListCtrl : public wxListCtrl diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc index 4c3e2ca17..a68376530 100644 --- a/src/wx/player_config_dialog.cc +++ b/src/wx/player_config_dialog.cc @@ -68,6 +68,9 @@ using boost::bind; using boost::shared_ptr; using boost::function; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::locale_convert; class PlayerGeneralPage : public GeneralPage diff --git a/src/wx/recipient_dialog.cc b/src/wx/recipient_dialog.cc index 1d36046dd..d59226a96 100644 --- a/src/wx/recipient_dialog.cc +++ b/src/wx/recipient_dialog.cc @@ -42,6 +42,9 @@ using std::vector; using std::list; using boost::optional; using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif static string diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index d68ea48dd..97e582ce7 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -33,8 +33,12 @@ using std::max; using std::string; using boost::optional; using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; + SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent) : VideoView (viewer) { diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc index 6b567de75..ba45329f2 100644 --- a/src/wx/smpte_metadata_dialog.cc +++ b/src/wx/smpte_metadata_dialog.cc @@ -33,6 +33,9 @@ using std::vector; using boost::optional; using boost::shared_ptr; using boost::weak_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif static string diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc index 8becbd5fb..3603c5dd2 100644 --- a/src/wx/video_waveform_dialog.cc +++ b/src/wx/video_waveform_dialog.cc @@ -30,6 +30,10 @@ using std::cout; using boost::bind; using boost::weak_ptr; using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr film, weak_ptr viewer) : wxDialog ( diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc index c6fa883fa..9674d0af2 100644 --- a/src/wx/video_waveform_plot.cc +++ b/src/wx/video_waveform_plot.cc @@ -38,12 +38,17 @@ using std::max; using std::string; using boost::weak_ptr; using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::locale_convert; + int const VideoWaveformPlot::_vertical_margin = 8; int const VideoWaveformPlot::_pixel_values = 4096; int const VideoWaveformPlot::_x_axis_width = 52; + VideoWaveformPlot::VideoWaveformPlot (wxWindow* parent, weak_ptr film, weak_ptr viewer) : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE) , _film (film) -- 2.30.2