Build fixes for Boost >= 1.73

Forward-ported-from: d1e9749ca290673639a49d693a8fe5c6557cc2de

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index acd730a68bc1e4588546a64cdabed407ba5aac80..6ba6b5ecfe62999243f84f4b1516bafcaccb49c7 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -50,6 +50,9 @@ using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 int const AnalyseAudioJob::_num_points = 1024;
 

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index 33938ece4025bd1e059715ac916002874245ab55..39da0bd5c10434a04449eaf782098cff29cfe13e 100644 (file)
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -39,6 +39,9 @@ using boost::bind;
 using boost::optional;
 using boost::function;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 /** Minimum video readahead in frames */
 #define MINIMUM_VIDEO_READAHEAD 10

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index d6b9d4f278fb20a9437cbaecbce9e860dd6f26be..36928b3fcfb8ac4f22c1cf674fa612d2a755a6a3 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -62,6 +62,9 @@ using boost::shared_ptr;
 using dcp::Size;
 using dcp::Data;
 using dcp::raw_convert;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 #define DCI_COEFFICENT (48.0 / 52.37)
 
@@ -120,7 +123,7 @@ DCPVideo::encode_locally ()
 {
        string const comment = Config::instance()->dcp_j2k_comment();
 
-       Data enc = compress_j2k (
+       Data enc = dcp::compress_j2k (
                convert_to_xyz (_frame, boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2)),
                _j2k_bandwidth,
                _frames_per_second,

diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index 7297734ecf892c9e9051d6fcdd20c4edba383fc9..1c612025733f9f95a3232394c7eceb843df529ab 100644 (file)
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -27,6 +27,7 @@
 #include "dcpomatic_socket.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
+#include <boost/bind/placeholders.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <iostream>
 
@@ -40,6 +41,9 @@ using boost::shared_ptr;
 using boost::scoped_array;
 using boost::weak_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::raw_convert;
 
 EncodeServerFinder* EncodeServerFinder::_instance = 0;

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 786f97dd706ddec92394dd391df6834812ba7ecd..8f9b3defc676af3f81494c2b7796649a1e53fe16 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -43,6 +43,9 @@ using boost::bind;
 using boost::weak_ptr;
 using boost::optional;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 /** @param key Key to use to encrypt MP4 outputs */
 FFmpegEncoder::FFmpegEncoder (

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index d15bdabde676723922cba737d6c50839ab085805..511730185716ddba8368b828f76228f775d5eeba 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -40,6 +40,9 @@ using boost::bind;
 using boost::weak_ptr;
 using boost::optional;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 int FFmpegFileEncoder::_video_stream_index = 0;
 int FFmpegFileEncoder::_audio_stream_index_base = 1;

diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index e936332a27b6465bbdadd9c9d0cfa3eb79dabc5e..34a7a8392f513299adf450b385f7b4b4fafa65fc 100644 (file)
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -50,6 +50,9 @@ using boost::weak_ptr;
 using boost::optional;
 using boost::bind;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 Hints::Hints (weak_ptr<const Film> film)
        : _film (film)

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index b96b0fbe0edf48a809ba93f89c28e87de56a5b08..89990a42796b34c9b54aa7f9e1844c4fb048424a 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -34,6 +34,7 @@
 #include "compose.hpp"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
+#include <boost/bind/placeholders.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -52,6 +53,9 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 Playlist::Playlist ()
        : _sequence (true)

diff --git a/src/lib/upload_job.cc b/src/lib/upload_job.cc
index fbfbb92d83459bc1c89189cf3016a5880ad1c273..c07e0c3d495d336709a4e9c17918b5297d81feae 100644 (file)
--- a/src/lib/upload_job.cc
+++ b/src/lib/upload_job.cc
@@ -38,6 +38,9 @@ using std::string;
 using std::min;
 using boost::shared_ptr;
 using boost::scoped_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 UploadJob::UploadJob (shared_ptr<const Film> film)
        : Job (film)

diff --git a/src/lib/verify_dcp_job.cc b/src/lib/verify_dcp_job.cc
index c1dcbc7924f4e8b5de653e8f6d53ef5f00a0faaf..3d28fe759d83c4c7d5862a9913883d1406b4e6d1 100644 (file)
--- a/src/lib/verify_dcp_job.cc
+++ b/src/lib/verify_dcp_job.cc
@@ -28,6 +28,9 @@ using std::string;
 using std::vector;
 using boost::shared_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 VerifyDCPJob::VerifyDCPJob (vector<boost::filesystem::path> directories)
        : Job (shared_ptr<Film>())

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 12b8e71dfbe325eba3d80e3143daba8e3a7c0da1..60f11752e89988687192314ec451490e0094d262 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -131,6 +131,9 @@ using boost::optional;
 using boost::function;
 using boost::is_any_of;
 using boost::algorithm::find;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::raw_convert;
 
 class FilmChangedClosingDialog : public boost::noncopyable

diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index e3beb8dc6deb1760199488c65b60b68abe63c6ef..3517de9fef04650675663cf49132c25b710e8c2e 100644 (file)
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -53,6 +53,9 @@ using boost::shared_ptr;
 using boost::thread;
 using boost::scoped_array;
 using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 static list<boost::filesystem::path> films_to_load;
 

diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index b2b5c458a915b96dd263bf0882658009757f1ff1..77dd643d72a80acd9731781583105b19fe14e772 100644 (file)
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -49,6 +49,9 @@ 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/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index a4ef0bc62a28ec8f37fd28b6cd7a3919173992fc..696fec09ae1b37c73071b9707e204ac0f3a55f79 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -51,6 +51,9 @@ using boost::thread;
 using boost::bind;
 using boost::optional;
 using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 enum {
        ID_status = 1,

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 03a99b2e521be6329e3b73b8018ad60064ed69d4..99a6b4cafedf4d02b74bb48a5d3f8dc7837ce709 100644 (file)
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -43,6 +43,9 @@ using std::pair;
 using boost::shared_ptr;
 using boost::optional;
 using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::Data;
 
 static shared_ptr<Film> film;

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 0f6bace2590282c8ad792513e22afd1fcdf03ab0..748bd72d07e545d8b5cf41019278d1902e52022e 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -44,6 +44,9 @@ using boost::optional;
 using boost::const_pointer_cast;
 using boost::dynamic_pointer_cast;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 /** @param parent Parent window.
  *  @param film Film we are using.

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index e1c96fdebe962d35784f5940c63aa03a52ed9a33..438b1e8569037ba557d192191f3f74792e28656f 100644 (file)
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -49,6 +49,9 @@ using std::pair;
 using std::make_pair;
 using boost::shared_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::locale_convert;
 
 #define INDICATOR_SIZE 20

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 8c3d6f6caa09932c1b7c311ae11c0fd1642a9881..76dcbad67889ebb59377975046151d0ffe1389d5 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -46,6 +46,9 @@ using std::pair;
 using boost::dynamic_pointer_cast;
 using boost::shared_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 AudioPanel::AudioPanel (ContentPanel* p)
        : ContentSubPanel (p, _("Audio"))

diff --git a/src/wx/barco_alchemy_certificate_panel.cc b/src/wx/barco_alchemy_certificate_panel.cc
index d105b4a9cb2a6eaaa1d77ee9d80d385dc3860853..a1d6167aacf6ab553b85eda94c4806cc81f0b03c 100644 (file)
--- a/src/wx/barco_alchemy_certificate_panel.cc
+++ b/src/wx/barco_alchemy_certificate_panel.cc
@@ -27,6 +27,9 @@
 
 using std::string;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 BarcoAlchemyCertificatePanel::BarcoAlchemyCertificatePanel (DownloadCertificateDialog* dialog)
        : CredentialsDownloadCertificatePanel (

diff --git a/src/wx/christie_certificate_panel.cc b/src/wx/christie_certificate_panel.cc
index 2a42a178e77b652d65f95b968f164eafa58fe3f1..c4584ed3c304f8a096664571f1eca431a61d9c3f 100644 (file)
--- a/src/wx/christie_certificate_panel.cc
+++ b/src/wx/christie_certificate_panel.cc
@@ -28,6 +28,9 @@
 using std::string;
 using boost::optional;
 using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 ChristieCertificatePanel::ChristieCertificatePanel (DownloadCertificateDialog* dialog)
        : CredentialsDownloadCertificatePanel (

diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
index 04391774bd5fcfb5e79bbdef43f25f0f3620d89c..a4372ae779156c1fb006dcefb9bcaf3e9a1062d2 100644 (file)
--- a/src/wx/cinema_dialog.cc
+++ b/src/wx/cinema_dialog.cc
@@ -31,6 +31,9 @@ using std::back_inserter;
 using std::list;
 using std::cout;
 using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 static string
 column (string s)

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 352c8ae482d73f1fba9b693de3953334a4a45817..7a4bb92c9e16e1589785d8aac07377e6ebd2e102 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -36,6 +36,9 @@ using boost::bind;
 using boost::optional;
 using boost::shared_ptr;
 using boost::function;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 static
 bool

diff --git a/src/wx/confirm_kdm_email_dialog.cc b/src/wx/confirm_kdm_email_dialog.cc
index df6131fe1d05005b88631c6ed0460acd0ccd4df3..5b0c1510f154be7bfb906ffe7df852c6545e1285 100644 (file)
--- a/src/wx/confirm_kdm_email_dialog.cc
+++ b/src/wx/confirm_kdm_email_dialog.cc
@@ -27,6 +27,9 @@
 
 using std::list;
 using std::string;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 ConfirmKDMEmailDialog::ConfirmKDMEmailDialog (wxWindow* parent, list<string> emails)
        : QuestionDialog (parent, _("Confirm KDM email"), _("Send emails"), _("Don't send emails"))

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index ef770484c3928ba01d85c719bd9cd5c120629a54..3a162d7713504981139c847925a27b0962ecb824 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -62,6 +62,9 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 class LimitedSplitter : public wxSplitterWindow
 {

diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index e4adc685b03fa11000bb23b25f1c0cb7cb625916..8cf04b93c49112c1047a452fe471bc35a60e6bd4 100644 (file)
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -30,6 +30,9 @@
 using std::list;
 using std::string;
 using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
        : wxScrolledWindow (p->notebook(), wxID_ANY)

diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h
index de7ebedc5022b321e0d92679c5a22a41b1d46e4f..52a5e5851a9b09ecaef7bcea415b1c7b66007be5 100644 (file)
--- a/src/wx/content_widget.h
+++ b/src/wx/content_widget.h
@@ -108,7 +108,11 @@ public:
                update_from_model ();
 
                for (typename List::iterator i = _content.begin(); i != _content.end(); ++i) {
+#if BOOST_VERSION >= 106100
+                       _connections.push_back ((*i)->Change.connect (boost::bind (&ContentWidget::model_changed, this, boost::placeholders::_1, boost::placeholders::_3)));
+#else
                        _connections.push_back ((*i)->Change.connect (boost::bind (&ContentWidget::model_changed, this, _1, _3)));
+#endif
                }
        }
 

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index bed9b97a04680158954526bc9731d66e704b8eca..5046c51048ddfac577b977e70655609a6477e36d 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -59,6 +59,9 @@ using std::make_pair;
 using boost::lexical_cast;
 using boost::shared_ptr;
 using boost::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::locale_convert;
 
 DCPPanel::DCPPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)

diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index 0ad3058c287babf1ba645732f7e63328ece6b415..e30ef30a4396bac5ae01b9a8f42b49588968a7ca 100644 (file)
--- a/src/wx/dolby_doremi_certificate_panel.cc
+++ b/src/wx/dolby_doremi_certificate_panel.cc
@@ -36,6 +36,9 @@ using std::cout;
 using std::list;
 using boost::function;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::raw_convert;
 
 DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel (DownloadCertificateDialog* dialog)

diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index ca58009a4b7059027700b9fde7181380742f26a1..58d0e388511b38169febc63babfc5267522fe851 100644 (file)
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -136,7 +136,11 @@ public:
 
                _list->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&EditableList::selection_changed, this));
                _list->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&EditableList::selection_changed, this));
+#if BOOST_VERSION >= 106100
+               _list->Bind (wxEVT_SIZE, boost::bind (&EditableList::resized, this, boost::placeholders::_1));
+#else
                _list->Bind (wxEVT_SIZE, boost::bind (&EditableList::resized, this, _1));
+#endif
 
                refresh ();
                selection_changed ();

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 894d1d4bf1b3d0baf5c1218096e78e35ff0aac64..c0d383821b6da0c5cf81fbd5ec6ea36770f771d7 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -41,6 +41,9 @@ using std::list;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
        : wxPanel (parent)

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 5f609856fbf6afcca3a02545f172c514f12a8382..151b578cd8d4f05923fc1c4b7f33ad91d948580f 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -69,6 +69,9 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::weak_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::Size;
 using namespace dcpomatic;
 

diff --git a/src/wx/focus_manager.cc b/src/wx/focus_manager.cc
index e10075f3ad30418c2eb2e5a7712753ad3e1e054c..b530f7481634c5c8cd14d032e2969fe07f189918 100644 (file)
--- a/src/wx/focus_manager.cc
+++ b/src/wx/focus_manager.cc
@@ -24,6 +24,10 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <wx/textctrl.h>
 DCPOMATIC_ENABLE_WARNINGS
 
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
 FocusManager* FocusManager::_instance;
 
 FocusManager *

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index af1592d26e060a202401034216324304138416fd..508d06c67575ec2c70f7d70e4fe5af27cd0ec13e 100644 (file)
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -71,6 +71,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 FullGeneralPage : public GeneralPage

diff --git a/src/wx/gdc_certificate_panel.cc b/src/wx/gdc_certificate_panel.cc
index ffd7de52f444626d58cc2e6568e7aba6d8220da2..bc1087fd164a46b21d832f2830c82e2f9d9008c0 100644 (file)
--- a/src/wx/gdc_certificate_panel.cc
+++ b/src/wx/gdc_certificate_panel.cc
@@ -28,6 +28,9 @@
 using std::string;
 using boost::optional;
 using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 GDCCertificatePanel::GDCCertificatePanel (DownloadCertificateDialog* dialog)
        : CredentialsDownloadCertificatePanel (

diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index c98cbae07b2c16bb9e2b002706212cac13c5b557..9ceefda4a372644a75d2dafa5dae17a4987a58eb 100644 (file)
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -39,6 +39,9 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::bind;
 using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film, bool ok)
        : wxDialog (parent, wxID_ANY, _("Hints"))

diff --git a/src/wx/html_dialog.cc b/src/wx/html_dialog.cc
index 873aa718cf5026da1bd3b29c1cca1395b1dae0aa..57038f77f6d533301bd77450c4b157b141cb40a6 100644 (file)
--- a/src/wx/html_dialog.cc
+++ b/src/wx/html_dialog.cc
@@ -29,6 +29,10 @@ DCPOMATIC_DISABLE_WARNINGS
 DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
 HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html)
        : wxDialog (parent, wxID_ANY, title)
 {

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 42d5f9dbeb5e5aade18cec6c3216abc3ff4a5234..a0430ca811128a9f3bd62e7adfa7c200e19611f9 100644 (file)
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -42,6 +42,9 @@ using std::cout;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 /** @param parent Parent window.
  *  @param batch true to use BatchJobView, false to use NormalJobView.

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index d3bbf02c998e164ec4f317a00db7c80a04d9718c..86326cbe6127d399cc040fc84156d5c7b68727d5 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -51,6 +51,9 @@ using std::runtime_error;
 using boost::shared_ptr;
 using boost::bind;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
        : wxDialog (parent, wxID_ANY, _("Make KDMs"))

diff --git a/src/wx/nag_dialog.cc b/src/wx/nag_dialog.cc
index abe460869b88e477ad2218729c9f9ce92999eb85..a4c88103977c9cd04b9e526b22775c47f0d715db 100644 (file)
--- a/src/wx/nag_dialog.cc
+++ b/src/wx/nag_dialog.cc
@@ -25,6 +25,9 @@
 #include <boost/foreach.hpp>
 
 using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 NagDialog::NagDialog (wxWindow* parent, Config::Nag nag, wxString message, bool can_cancel)
        : wxDialog (parent, wxID_ANY, _("Important notice"))

diff --git a/src/wx/recreate_chain_dialog.cc b/src/wx/recreate_chain_dialog.cc
index ae6afdd08d46c5bf10dfb588ed48a4619da3a4bb..322d5964ce729049858c944189d4a145380aa6df 100644 (file)
--- a/src/wx/recreate_chain_dialog.cc
+++ b/src/wx/recreate_chain_dialog.cc
@@ -28,6 +28,9 @@
 using std::list;
 using std::string;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 RecreateChainDialog::RecreateChainDialog (wxWindow* parent, wxString title, wxString message, wxString cancel, optional<Config::Nag> nag)
        : QuestionDialog (parent, _("Certificate chain"), title, cancel)

diff --git a/src/wx/save_template_dialog.cc b/src/wx/save_template_dialog.cc
index 691d37a1ad46e5444094b92a34a85cf9723616be..0440063508dfc2df05b924e3519b54fca25b6c7c 100644 (file)
--- a/src/wx/save_template_dialog.cc
+++ b/src/wx/save_template_dialog.cc
@@ -24,6 +24,9 @@
 #include <boost/foreach.hpp>
 
 using std::string;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 SaveTemplateDialog::SaveTemplateDialog (wxWindow* parent)
        : TableDialog (parent, _("Save template"), 2, 1, true)

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index bc7065f294ede1d823e749bdfba09c0e84dd5abe..f6245f01018fac19c5bcd2ed379d4774e767101f 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -41,6 +41,9 @@ using std::cout;
 using std::vector;
 using boost::optional;
 using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 static string
 column (TrustedDevice d)

diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc
index 6d905292eff2b4e8965dc9d92c875a7136f5425c..46edacd97258ca8b8256c9081a523b0846e5dfd8 100644 (file)
--- a/src/wx/subtitle_appearance_dialog.cc
+++ b/src/wx/subtitle_appearance_dialog.cc
@@ -44,6 +44,9 @@ using boost::bind;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 int const SubtitleAppearanceDialog::NONE = 0;
 int const SubtitleAppearanceDialog::OUTLINE = 1;

diff --git a/src/wx/templates_dialog.cc b/src/wx/templates_dialog.cc
index 4ddd3ad929ac7cc7ada410a0bb03b023d0882ccf..53eb2e4220ab804d4a51b0e3958d6c3af776de39 100644 (file)
--- a/src/wx/templates_dialog.cc
+++ b/src/wx/templates_dialog.cc
@@ -28,6 +28,9 @@
 
 using std::string;
 using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 TemplatesDialog::TemplatesDialog (wxWindow* parent)
        : wxDialog (parent, wxID_ANY, _("Templates"))

diff --git a/src/wx/text_view.cc b/src/wx/text_view.cc
index 271e02d41a357a4050a27715362c0d921a0f0564..66c1446285e5f8cf6cd60859cb737552971d9ba9 100644 (file)
--- a/src/wx/text_view.cc
+++ b/src/wx/text_view.cc
@@ -36,6 +36,9 @@ using boost::weak_ptr;
 using boost::bind;
 using boost::dynamic_pointer_cast;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 TextView::TextView (
        wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content, shared_ptr<TextContent> text, shared_ptr<Decoder> decoder, weak_ptr<FilmViewer> viewer

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index c9a6dc9f172e056d5e29310a98ac87fe9857ec40..7b9758febd16a4b3a27e300ab0f259745a3c5c42 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -56,6 +56,9 @@ using boost::dynamic_pointer_cast;
 using boost::bind;
 using boost::optional;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 /* 3 hours in 640 pixels */
 double const Timeline::_minimum_pixels_per_second = 640.0 / (60 * 60 * 3);

diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 474b8d07f19554bf0bed1fda4a26c4f592089681..2af1c28ac3ce69086407df9daa431dad6aa8ed2f 100644 (file)
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -28,6 +28,9 @@
 using std::list;
 using boost::shared_ptr;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
        : TimelineView (tl)

diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 0d0d4f9f98facbe2fcfc33db4c0debb33cbdc419..261177e36815e55b2a8d7ad52f812892ffbed585 100644 (file)
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -34,6 +34,9 @@ using std::cout;
 using std::string;
 using boost::shared_ptr;
 using boost::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
        : wxDialog (

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 8db975d548e4aed726b3933b11405a9163067f4f..97f3beca6d617c987ec01bbfb340fef1e8ce40ec 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -54,6 +54,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::locale_convert;
 using namespace dcpomatic;
 

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 7a892bb742571e343e0f9cedbad5e55b063a0596..5d82c17b3955e5d5d60358180a4e6b599034dad5 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -56,6 +56,9 @@ using boost::dynamic_pointer_cast;
 using boost::bind;
 using boost::optional;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 
 VideoPanel::VideoPanel (ContentPanel* p)