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

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