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: 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 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/lib')

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.
-- 
cgit v1.2.3