Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/support/bind.h b/src/support/bind.h
index f00d1629b4a687ab346d117679d6b4b1e4b1cd5c..1449c4394a7e6569b77138743d606700a97ac0b6 100644 (file)
--- a/src/support/bind.h
+++ b/src/support/bind.h
@@ -12,21 +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;
+#ifdef LYX_USE_CXX11
+
+#define LYX_BIND_NS std
+
+namespace lyx
+{
+       using std::placeholders::_1;
+       using std::placeholders::_2;
+}
 
 #else
 
-#include "boost/bind.hpp"
-using boost::bind;
-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