X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fbind.h;h=08dd71a88598b4822455775286ba896a25da875e;hb=9c55af4a223ce4db29d643251109e245665344bd;hp=2c636dce6de1d7486fad17c9ac8f1b4e1a114734;hpb=61b2bd5e7fd9399128342d9048aa814ae5f086fc;p=lyx.git

diff --git a/src/support/bind.h b/src/support/bind.h
index 2c636dce6d..08dd71a885 100644
--- a/src/support/bind.h
+++ b/src/support/bind.h
@@ -12,23 +12,32 @@
 #ifndef LYX_BIND_H
 #define LYX_BIND_H
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+#include "support/functional.h"
 
-#include <functional>
-using std::tr1::bind;
-using std::tr1::placeholders::_1;
-using std::tr1::placeholders::_2;
-using std::tr1::ref;
+#if __cplusplus >= 201103L
+
+#define LYX_BIND_NS std
+
+namespace lyx
+{
+	using std::placeholders::_1;
+	using std::placeholders::_2;
+}
 
 #else
 
-#include "support/bind.h"
-using boost::bind;
-using boost::_1;
-using boost::_2;
-using boost::ref;
+#include <boost/bind.hpp>
+#define LYX_BIND_NS boost
 
 #endif
 
+namespace lyx
+{
+	using LYX_BIND_NS::bind;
+	using LYX_BIND_NS::ref;
+}
+
+#undef LYX_BIND_NS
+
 
 #endif