Merge remote-tracking branch 'features/scroll-reloaded'

[lyx.git] / src / support / bind.h

diff --git a/src/support/bind.h b/src/support/bind.h
index efd3267de5ceb17667e94ed351b114d447ebf368..08dd71a88598b4822455775286ba896a25da875e 100644 (file)
--- a/src/support/bind.h
+++ b/src/support/bind.h
@@ -14,27 +14,30 @@
 
 #include "support/functional.h"
 
-#ifdef LYX_USE_TR1
+#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>
+#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