X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fbind.h;h=efd3267de5ceb17667e94ed351b114d447ebf368;hb=faa87bf9f30b943397429a04254d96963bbf38bc;hp=f00d1629b4a687ab346d117679d6b4b1e4b1cd5c;hpb=4654a8bf96b144b7d89b595abdbdbf4c8f082965;p=lyx.git

diff --git a/src/support/bind.h b/src/support/bind.h
index f00d1629b4..efd3267de5 100644
--- a/src/support/bind.h
+++ b/src/support/bind.h
@@ -12,19 +12,27 @@
 #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_TR1
+
+namespace lyx
+{
+	using std::tr1::bind;
+	using std::tr1::placeholders::_1;
+	using std::tr1::placeholders::_2;
+	using std::tr1::ref;
+}
 
 #else
 
-#include "boost/bind.hpp"
-using boost::bind;
-using boost::ref;
+#include <boost/bind.hpp>
+
+namespace lyx
+{
+	using boost::bind;
+	using boost::ref;
+}
 
 #endif