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

diff --git a/src/support/bind.h b/src/support/bind.h
index f613bdb408..08dd71a885 100644
--- a/src/support/bind.h
+++ b/src/support/bind.h
@@ -12,36 +12,32 @@
 #ifndef LYX_BIND_H
 #define LYX_BIND_H
 
-#include "checktr1.h"
+#include "support/functional.h"
 
+#if __cplusplus >= 201103L
 
-#ifdef LYX_USE_TR1
-
-#include <functional>
-
-#ifdef __GNUC__
-#include <tr1/functional>
-#endif
+#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