From bd7f4bbde17d2087ba4c4bddf6439b3df869b1db Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 10 Dec 2020 19:27:53 +0100
Subject: [PATCH] Fix lots of macOS warnings by using a different boost/bind
 include.

---
 src/lib/dcpomatic_socket.cc          | 2 +-
 src/lib/json_server.cc               | 2 +-
 src/lib/subtitle_encoder.cc          | 5 ++++-
 src/tools/dcpomatic_combiner.cc      | 2 +-
 src/tools/dcpomatic_kdm.cc           | 2 +-
 src/tools/dcpomatic_player.cc        | 2 +-
 src/wx/audio_plot.cc                 | 2 +-
 src/wx/closed_captions_dialog.cc     | 2 +-
 src/wx/content_advanced_dialog.cc    | 2 +-
 src/wx/download_certificate_panel.cc | 2 +-
 src/wx/export_subtitles_dialog.cc    | 2 +-
 src/wx/export_video_file_dialog.cc   | 2 +-
 src/wx/gl_video_view.cc              | 2 +-
 src/wx/i18n_hook.cc                  | 2 +-
 src/wx/instant_i18n_dialog.cc        | 2 +-
 src/wx/language_tag_dialog.cc        | 2 +-
 src/wx/markers_dialog.cc             | 2 +-
 src/wx/player_stress_tester.cc       | 2 +-
 src/wx/simple_video_view.cc          | 2 +-
 src/wx/time_picker.cc                | 2 +-
 src/wx/video_waveform_dialog.cc      | 2 +-
 src/wx/video_waveform_plot.cc        | 2 +-
 test/audio_merger_test.cc            | 2 +-
 test/util_test.cc                    | 2 +-
 24 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/lib/dcpomatic_socket.cc b/src/lib/dcpomatic_socket.cc
index a0a7a1cf3..580c7d36b 100644
--- a/src/lib/dcpomatic_socket.cc
+++ b/src/lib/dcpomatic_socket.cc
@@ -22,7 +22,7 @@
 #include "compose.hpp"
 #include "exceptions.h"
 #include "dcpomatic_assert.h"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <iostream>
 
diff --git a/src/lib/json_server.cc b/src/lib/json_server.cc
index 4cff27b6f..211d0c846 100644
--- a/src/lib/json_server.cc
+++ b/src/lib/json_server.cc
@@ -26,7 +26,7 @@
 #include "transcode_job.h"
 #include <dcp/raw_convert.h>
 #include <boost/asio.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/thread.hpp>
 #include <iostream>
 
diff --git a/src/lib/subtitle_encoder.cc b/src/lib/subtitle_encoder.cc
index 1ef7fcd94..b018dcfb4 100644
--- a/src/lib/subtitle_encoder.cc
+++ b/src/lib/subtitle_encoder.cc
@@ -28,7 +28,7 @@
 #include <dcp/smpte_subtitle_asset.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/filesystem.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include "i18n.h"
 
@@ -38,6 +38,9 @@ using std::pair;
 using std::vector;
 using boost::shared_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::raw_convert;
 
 /** @param output Directory, if there will be multiple output files, or a filename.
diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index d55df303f..19103fc33 100644
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -32,7 +32,7 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 DCPOMATIC_ENABLE_WARNINGS
 #include <wx/wx.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/filesystem.hpp>
 #include <exception>
 
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index aa7cf8340..1d72af4d5 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -58,7 +58,7 @@ DCPOMATIC_ENABLE_WARNINGS
 #ifdef __WXOSX__
 #include <ApplicationServices/ApplicationServices.h>
 #endif
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/foreach.hpp>
 
 #ifdef check
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index d4e247d62..f37f77c22 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -69,7 +69,7 @@
 #ifdef __WXGTK__
 #include <X11/Xlib.h>
 #endif
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/algorithm/string.hpp>
 #include <iostream>
 
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 35f2c93ad..74c10348e 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -25,7 +25,7 @@
 #include "lib/audio_analysis.h"
 #include "lib/compose.hpp"
 #include <wx/graphics.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <iostream>
 #include <cfloat>
 
diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index e37bd5910..7411fa153 100644
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -25,7 +25,7 @@
 #include "lib/butler.h"
 #include "lib/text_content.h"
 #include "lib/compose.hpp"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 using std::list;
 using std::max;
diff --git a/src/wx/content_advanced_dialog.cc b/src/wx/content_advanced_dialog.cc
index 4d1d70129..d170032a4 100644
--- a/src/wx/content_advanced_dialog.cc
+++ b/src/wx/content_advanced_dialog.cc
@@ -36,7 +36,7 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <wx/propgrid/property.h>
 #include <wx/propgrid/props.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 
 using std::string;
diff --git a/src/wx/download_certificate_panel.cc b/src/wx/download_certificate_panel.cc
index 34e6136ae..bbaddeef2 100644
--- a/src/wx/download_certificate_panel.cc
+++ b/src/wx/download_certificate_panel.cc
@@ -26,7 +26,7 @@
 #include <dcp/util.h>
 #include <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 using std::string;
 using boost::function;
diff --git a/src/wx/export_subtitles_dialog.cc b/src/wx/export_subtitles_dialog.cc
index b2b6a63ed..3fc5dcdb2 100644
--- a/src/wx/export_subtitles_dialog.cc
+++ b/src/wx/export_subtitles_dialog.cc
@@ -27,7 +27,7 @@
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 
 using std::string;
diff --git a/src/wx/export_video_file_dialog.cc b/src/wx/export_video_file_dialog.cc
index 062fcc81f..f1b2d2622 100644
--- a/src/wx/export_video_file_dialog.cc
+++ b/src/wx/export_video_file_dialog.cc
@@ -26,7 +26,7 @@
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 using std::string;
 using boost::bind;
diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 08b62dee4..e7125501e 100644
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -27,7 +27,7 @@
 #include "lib/cross.h"
 #include "lib/player_video.h"
 #include "lib/butler.h"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <iostream>
 
 #ifdef DCPOMATIC_OSX
diff --git a/src/wx/i18n_hook.cc b/src/wx/i18n_hook.cc
index b2797fa51..827e81bc9 100644
--- a/src/wx/i18n_hook.cc
+++ b/src/wx/i18n_hook.cc
@@ -23,7 +23,7 @@
 #include "wx_util.h"
 #include "lib/cross.h"
 #include <wx/wx.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 using std::map;
 using std::string;
diff --git a/src/wx/instant_i18n_dialog.cc b/src/wx/instant_i18n_dialog.cc
index e86e48ced..364b4dd18 100644
--- a/src/wx/instant_i18n_dialog.cc
+++ b/src/wx/instant_i18n_dialog.cc
@@ -20,7 +20,7 @@
 
 #include "instant_i18n_dialog.h"
 #include "wx_util.h"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 using boost::bind;
 
diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc
index 94e266f2c..245dee2db 100644
--- a/src/wx/language_tag_dialog.cc
+++ b/src/wx/language_tag_dialog.cc
@@ -26,7 +26,7 @@
 #include <wx/srchctrl.h>
 #include <wx/wx.h>
 #include <boost/algorithm/string.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/src/wx/markers_dialog.cc b/src/wx/markers_dialog.cc
index dba4c0c0e..c8529f108 100644
--- a/src/wx/markers_dialog.cc
+++ b/src/wx/markers_dialog.cc
@@ -28,7 +28,7 @@
 #include "lib/film.h"
 #include <dcp/types.h>
 #include <wx/gbsizer.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <iostream>
 
 using std::cout;
diff --git a/src/wx/player_stress_tester.cc b/src/wx/player_stress_tester.cc
index 726db2a70..dfe2d181e 100644
--- a/src/wx/player_stress_tester.cc
+++ b/src/wx/player_stress_tester.cc
@@ -25,7 +25,7 @@
 #include <wx/wx.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <string>
 #include <vector>
 #include <iostream>
diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 117eee218..808f885f8 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -27,7 +27,7 @@
 #include "lib/butler.h"
 #include <dcp/util.h>
 #include <wx/wx.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 using std::max;
 using std::string;
diff --git a/src/wx/time_picker.cc b/src/wx/time_picker.cc
index 0d9668d7b..966671be9 100644
--- a/src/wx/time_picker.cc
+++ b/src/wx/time_picker.cc
@@ -23,7 +23,7 @@
 #include "static_text.h"
 #include <dcp/locale_convert.h>
 #include <wx/spinctrl.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <iomanip>
 
 using std::setfill;
diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index 3603c5dd2..e61043cc1 100644
--- a/src/wx/video_waveform_dialog.cc
+++ b/src/wx/video_waveform_dialog.cc
@@ -23,7 +23,7 @@
 #include "film_viewer.h"
 #include "wx_util.h"
 #include "static_text.h"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <iostream>
 
 using std::cout;
diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc
index 866f5f568..edec4d6eb 100644
--- a/src/wx/video_waveform_plot.cc
+++ b/src/wx/video_waveform_plot.cc
@@ -29,7 +29,7 @@
 #include <dcp/openjpeg_image.h>
 #include <wx/rawbmp.h>
 #include <wx/graphics.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <iostream>
 
 using std::cout;
diff --git a/test/audio_merger_test.cc b/test/audio_merger_test.cc
index 3a274ff1a..db8b33a9b 100644
--- a/test/audio_merger_test.cc
+++ b/test/audio_merger_test.cc
@@ -30,7 +30,7 @@
 #include "test.h"
 #include <dcp/raw_convert.h>
 #include <boost/test/unit_test.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>
 #include <iostream>
diff --git a/test/util_test.cc b/test/util_test.cc
index df494b0f4..9f03b6a47 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -29,7 +29,7 @@
 #include "test.h"
 #include <dcp/certificate_chain.h>
 #include <boost/test/unit_test.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 using std::string;
 using std::vector;
-- 
2.30.2