Merge pull request #806.

Get bind placeholders from boost::placeholders namespace.
lballabio · May 1, 2020 · f11da1e · f11da1e
2 parents 60b2be1 + 855f352
commit f11da1e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/ql/functional.hpp b/ql/functional.hpp
@@ -34,7 +34,7 @@
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #endif
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/ref.hpp>
 #if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)) || (__GNUC__ > 4))
 #pragma GCC diagnostic pop
@@ -59,6 +59,9 @@ namespace QuantLib {
         using boost::ref;
         using boost::cref;
         namespace placeholders {
+            #if BOOST_VERSION >= 106000
+            using namespace boost::placeholders;
+            #else
             using ::_1;
             using ::_2;
             using ::_3;
@@ -68,6 +71,7 @@ namespace QuantLib {
             using ::_7;
             using ::_8;
             using ::_9;
+            #endif
         }
         #endif
 

diff --git a/ql/patterns/observable.cpp b/ql/patterns/observable.cpp
@@ -96,7 +96,13 @@ namespace QuantLib {
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #endif
-#include <boost/bind.hpp>
+
+#if !defined(BOOST_BIND_NO_PLACEHOLDERS)
+#define BOOST_BIND_NO_PLACEHOLDERS
+#include <boost/bind/bind.hpp>
+#undef BOOST_BIND_NO_PLACEHOLDERS
+#endif
+
 #if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)) || (__GNUC__ > 4))
 #pragma GCC diagnostic pop
 #endif