Build fixes for Boost >= 1.73

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index d52b4051534cc3937d9d42e24880573812d9b03b..1c3b1069aed8b5082bb6de938ba1960483ff3de9 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -47,6 +47,9 @@ using std::min;
 using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+#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 ab3e9b94ebf6221780619cdacbf7cf123b31550f..3e557cffa1b8a1f9e5e82cddb0d811279cbc2c90 100644 (file)
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -38,6 +38,9 @@ using boost::shared_ptr;
 using boost::bind;
 using boost::optional;
 using boost::function;
+#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 6f32b6686dca1ac44eeeb4d8d7a575f4c1e004fe..6111c3e141e4e3c0783fc886e45b5883a71d6a2d 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -59,6 +59,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)
 
@@ -115,7 +118,7 @@ DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
 Data
 DCPVideo::encode_locally ()
 {
-       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 6cdd8ce3cc11adb05062c9fd8fdc8744588e33b5..ef199e8db6cb12b530fe947c057e0b2874ae3a3d 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 25ad4a54c1b22e577d96d206be83720a807d9599..bf7bdbd040d97e920541297b1eb0cef96db6a0fc 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -41,6 +41,9 @@ using std::map;
 using boost::shared_ptr;
 using boost::bind;
 using boost::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 FFmpegEncoder::FFmpegEncoder (
        shared_ptr<const Film> film,

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 294b031621b91076606bc716b273096ade261d61..2c5faa461e75b5120ca390e81cf25e3c4ccacdb8 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -38,6 +38,9 @@ using std::pair;
 using boost::shared_ptr;
 using boost::bind;
 using boost::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 int FFmpegFileEncoder::_video_stream_index = 0;
 int FFmpegFileEncoder::_audio_stream_index = 1;

diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index df29a333699de0cabee2f9588e1ac38aaae3148a..1e5101e16d78ec87f45a81a18b53acf488597793 100644 (file)
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -49,6 +49,9 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
 using boost::bind;
+#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 6d125afa63ba93d592a7bd7f4580d9f1d6e9ea12..64c50f905ec0b2f35844d246ae203d0da3e137c4 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>
@@ -51,6 +52,9 @@ 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
 
 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 35d3225f1d0133dc05be6057e6d5aa7653768167..daf8d0005a7d3face37c0bad67429539bb45fae8 100644 (file)
--- a/src/lib/verify_dcp_job.cc
+++ b/src/lib/verify_dcp_job.cc
@@ -27,6 +27,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 9d40ff3bde4bd90b01d4ffc67fbf9636779a2a9c..d0d8320083517fabe80a9b1344e1f5d1128066e5 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -125,6 +125,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 64549765fd8acad416c823bf3fdc69694c519a39..b7f831420a2556c6889abf9e8bbdf5830df59bbe 100644 (file)
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -44,6 +44,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 1554c02f4541ff11374b06ceddc41afffc5c43f3..95dea5b12ff88a1360a935b2ba81d432e866cb44 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -48,6 +48,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 1dc6fa6ca8ffe559f6d6d1f06c658fbd4aa176d2..d49b4178034872306abbfe80340b75da37817194 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 fadda5951aba1af8097b044814976a3cf7ac6f40..a7d43ece873434bd5186a4e18dfecaf263adc760 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -42,6 +42,9 @@ using boost::bind;
 using boost::optional;
 using boost::const_pointer_cast;
 using boost::dynamic_pointer_cast;
+#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 634d2fe73b0d123341710727deddad73aed36ac0..32f4233804f9a4b1a48652070407b0380777e36f 100644 (file)
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -46,6 +46,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 ccdb579079dc166ef79acc1269760de64ae2f0ea..b2889270f724fda3c658e9642179329210724ed8 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 a4156a0e63755fb99f15a08baa7bd327266c60b9..20ff888ce1a8e25befe3f09792fd11f00a350bc2 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)
        : DownloadCertificatePanel (dialog)

diff --git a/src/wx/christie_certificate_panel.cc b/src/wx/christie_certificate_panel.cc
index 43a9a2432dd14f0ec7af6af9edfa59dcc0b6dfec..8877e998e55d99b82283bdc1750676a3e49f450c 100644 (file)
--- a/src/wx/christie_certificate_panel.cc
+++ b/src/wx/christie_certificate_panel.cc
@@ -27,6 +27,9 @@
 
 using std::string;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 ChristieCertificatePanel::ChristieCertificatePanel (DownloadCertificateDialog* dialog)
        : DownloadCertificatePanel (dialog)

diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
index 36aabf7766014b4cc12541914cb05179e8d71246..836d521bb377086ca4cce1f011c5437b91003c56 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 fecb55ea7ced2c0fcbc413f211da4ad7615f7de9..f6fb3c9484036262d8cf74800952e4fa8438d1bf 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -34,6 +34,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 eca34b5cfb1ff5901bcac03590ae78b74821d3ce..381658dab50b7adbb41764439eb49776462764a5 100644 (file)
--- a/src/wx/confirm_kdm_email_dialog.cc
+++ b/src/wx/confirm_kdm_email_dialog.cc
@@ -28,6 +28,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 9a3e5ce9ac8e88d1c84e6ca107a1e97f89b83b00..123e1f051f2468e22e6e8645b24fda710b423a3d 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -61,6 +61,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
 
 class LimitedSplitter : public wxSplitterWindow
 {

diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index 5cdd2e5c3c6a25e285167ce6b3cfe21223a51f07..0f32b8b61d39876f87c906f16f02aad2946350e4 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 c4ae4d591aaa5d97a472953d4e06626e0236019e..872784888a19f234de348715511d8bdb8d9513ec 100644 (file)
--- a/src/wx/content_widget.h
+++ b/src/wx/content_widget.h
@@ -105,7 +105,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 3defe75e4822b938f5dac5d6b40699fc54e2e937..9f868f9f4c210e2e0bbfb40277fdc2b134c06184 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -58,6 +58,9 @@ using std::max;
 using std::make_pair;
 using boost::lexical_cast;
 using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::locale_convert;
 
 DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)

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 a7c1a610295da46c6fdad210b7afb58881d4600d..ef8862b3a69076c83271903aae0d3b428b9e2cb9 100644 (file)
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -92,7 +92,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 a017175f522106d4663f1b98d37087d9e2304d19..18aedc6de7f51b43c49f879c56619fa3de42b4b5 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 f68b213091e7d26ab8f527552ba2081892bd09ef..428b5c4fa089ac4b842d9345f07d09df28910d18 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -67,6 +67,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;
 
 static

diff --git a/src/wx/focus_manager.cc b/src/wx/focus_manager.cc
index f4f23cb283c7dba8eff4a7e9546a80cb54c9271d..6169569514da5927d7e113302dbe458db54355f0 100644 (file)
--- a/src/wx/focus_manager.cc
+++ b/src/wx/focus_manager.cc
@@ -21,6 +21,10 @@
 #include "focus_manager.h"
 #include <wx/textctrl.h>
 
+#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 e6147c3eab706dfbfcfc62111362a3c3758c3875..a9db14c0f7b12e52ca0a890bbe6e57c6f6ffcb77 100644 (file)
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -70,6 +70,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 2d47b427ee95e8b1d56500373cd49de661de53d3..8897ec84c37a1dc54d1ef370460f6d3417067592 100644 (file)
--- a/src/wx/gdc_certificate_panel.cc
+++ b/src/wx/gdc_certificate_panel.cc
@@ -27,6 +27,9 @@
 
 using std::string;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 GDCCertificatePanel::GDCCertificatePanel (DownloadCertificateDialog* dialog)
        : DownloadCertificatePanel (dialog)

diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index f8d03626fe06459195362566d810e71b4fe24294..545d2330e1e859dbedfa6acb2835f1e565f3217b 100644 (file)
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -36,6 +36,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 b5f86e7a131de7c823fd4cb293e0d82d069f7e99..718d546c35e4d4d50b81e0713de63ac56ccce30b 100644 (file)
--- a/src/wx/html_dialog.cc
+++ b/src/wx/html_dialog.cc
@@ -26,6 +26,10 @@
 #include <wx/fs_mem.h>
 #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 920f54a3e9a4619074ace225f095756a5a86c690..6d3b7355abaedd0d842cb44e9fcd09805d27f849 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -51,6 +51,9 @@ using std::make_pair;
 using std::runtime_error;
 using boost::shared_ptr;
 using boost::bind;
+#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 1dd14e0c8da4a87494418ff130783500abde8c0b..9350169390e760f3cbbbe26bf5101ac8d3f31777 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;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 RecreateChainDialog::RecreateChainDialog (wxWindow* parent)
        : QuestionDialog (parent, _("Certificate chain"), _("Recreate signing certificates"), _("Do nothing"))

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 6bfc0da4cbd15816fcaca9203aa4279b08a768fc..8cb31baec457d1ad3a1580d7cf95741fe4bd24c5 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -38,6 +38,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 ad4c038503b1e25567e0baa8b8a03a49ef334284..45498c464c7eefdbc3a5f37adcc4ae611b71ff6a 100644 (file)
--- a/src/wx/subtitle_appearance_dialog.cc
+++ b/src/wx/subtitle_appearance_dialog.cc
@@ -40,6 +40,9 @@ using boost::shared_ptr;
 using boost::bind;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+#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 9b591b19161406408c88bef739a4c4323a1f91d0..1218fdb9e95acdabdf0d5939eeed70e90e79b098 100644 (file)
--- a/src/wx/text_view.cc
+++ b/src/wx/text_view.cc
@@ -35,6 +35,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
 
 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 de5f05ae78ae09703e4541876bab31fb4d8e46fe..0bb7502e9c7f58289b96058ffaee3c7710a23acb 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -54,6 +54,9 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
 using boost::optional;
+#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 a55526c88604378691ce162ebf485d20dc0b85a5..7304c0e2a89373abcc6c27d1bedac3e86acff7d4 100644 (file)
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -27,6 +27,9 @@
 
 using std::list;
 using boost::shared_ptr;
+#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 3af86b707753768aa77a0dc6c453d87c3a9a2aef..6fb195f86978fb4c6529567c848d79b272236636 100644 (file)
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -33,6 +33,9 @@ using std::list;
 using std::cout;
 using std::string;
 using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
        : wxDialog (

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index f2fd65930164569d6fb48257033a003e336be4d5..0b1b9771b61ba88eb63f22a0d696fcd9e8dc88f8 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -51,6 +51,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;
 
 TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer)

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index f74157faf1b7b719e1da9f9c71ceef5de827c45b..713ef9d2c25ad9ed3cc3ca237742e2d4a907688d 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -53,6 +53,9 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 static VideoContentScale
 index_to_scale (int n)