Fix lots of macOS warnings by using a different boost/bind include.

diff --git a/src/lib/dcpomatic_socket.cc b/src/lib/dcpomatic_socket.cc
index a0a7a1cf3f3d877ee92aa204c2ad3c23f162a754..580c7d36b8927358f2bd577f0a21fa9a2070fd59 100644 (file)
--- 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 4cff27b6f60a71e6439432cf8ce1650262d03a6a..211d0c846e0a0167abc1f4b62514564b1ebc49ba 100644 (file)
--- 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 1ef7fcd9469b0d6b70b4b6750dcbd96f0b1fe120..b018dcfb429a47073a946cff59298bfbc1a48730 100644 (file)
--- 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 d55df303f0e370d03482b9b8693467022a8d0020..19103fc335b17fbc3bf083be4ab22a9e887184d4 100644 (file)
--- 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 aa7cf8340ab6efce401580f4397bb6a3a18025e5..1d72af4d556d2625b2067efd81d552e87f6a3f7a 100644 (file)
--- 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 d4e247d62bb701be3ed8fffef1fd248ed425abb1..f37f77c22534b095c821a598501f76f65b233d1d 100644 (file)
--- 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 35f2c93add67a64bd040aa744a4a73d8e8ec2f85..74c10348e6bdb2fe9534988de1aec9cb632f43d4 100644 (file)
--- 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 e37bd5910e28ee801deaff8d45e94127569081dc..7411fa15377fbcd3a96179477128d21ffa7b958d 100644 (file)
--- 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 4d1d7012916533e2f4ba731d99a94fc6c3c9664e..d170032a4798be99b6bd47da71419dfc29624994 100644 (file)
--- 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 34e6136ae39d5085f875553e3b58554d832003a8..bbaddeef254f1eef268df98e3b65f148e661dfae 100644 (file)
--- 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 b2b6a63edc297cab156fee0af78d86d1810e370b..3fc5dcdb27ef22b2f66f4a2445d962bd664ee4c4 100644 (file)
--- 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 062fcc81f4732400104c63a845cc52499211393a..f1b2d2622e5e49322768a20d86e0ddbcada998a0 100644 (file)
--- 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 08b62dee4cf73f7b8afe1d89ac16bd9d97b48d35..e7125501eb469677d5061cac0310f074d7dc4d3b 100644 (file)
--- 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 b2797fa51272a020de4dcd69a2f6d586780f1607..827e81bc94612b0d547fa6e874f60878ce77a47d 100644 (file)
--- 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 e86e48ced4a323eb9d9462013e6629ef6cfdbe37..364b4dd187fda3035157dc6a4932a4febc96e420 100644 (file)
--- 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 94e266f2c5b88e2a4e601fc5b528632ba54eb84b..245dee2dbf37551becced762afc8bd31d1585af2 100644 (file)
--- 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 dba4c0c0e5a8aece6fa5b33990af41f0cbf866cc..c8529f108f64bc00b8d65c17a6a1e4a046332301 100644 (file)
--- 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 726db2a70b9144578ed6c1acee37e6ba5049c4c1..dfe2d181eb4e3e54803c2ecaf1617bb208e9c28c 100644 (file)
--- 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 117eee2181241768990be4adecb5c24ca5c03c49..808f885f8b6fea97e2bd83fd6317910251ae1a32 100644 (file)
--- 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 0d9668d7bf2c5114264345d049efbf264ba0ad39..966671be9ac100f8c876707a4ad8b8ff038068b3 100644 (file)
--- 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 3603c5dd29ba5e8bd00db4c1ee77e5717edfe66c..e61043cc12b6e0ff885118aa098bfff5acb8b2ba 100644 (file)
--- 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 866f5f568a528f2d769593bb16f23842f151dd08..edec4d6ebb9e737c90e2aa980d05ca3f9e0546c5 100644 (file)
--- 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 3a274ff1aeb8ba2d21f1c72d88b458d93d9ea5b0..db8b33a9b46203f2181719bcca095f56d68683d0 100644 (file)
--- 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 df494b0f4dc6f265e3cf9ef2ff9c91f034f0e7d4..9f03b6a4714a6120827ced463daa8af740dc5cde 100644 (file)
--- 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;