Some C++11 stuff.

[dcpomatic.git] / src / tools / dcpomatic_combiner.cc

diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 5f1a7722a7ebd7fab5f93a9922ea1f18d10760a4..886c1c613b28fe51e683a05afc9d8968aa99d9ec 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>
 
@@ -40,9 +40,12 @@ DCPOMATIC_ENABLE_WARNINGS
 using std::exception;
 using std::string;
 using std::vector;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 
 static string