Remove non-copyable idioms

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

diff --git a/src/support/bind.h b/src/support/bind.h
index 4d2968048d087760de846fd03c6bfbc62da35dfe..5a734ff931ae31460bcb8f36caeb8bca2c5ee1ee 100644 (file)
--- a/src/support/bind.h
+++ b/src/support/bind.h
@@ -12,33 +12,15 @@
 #ifndef LYX_BIND_H
 #define LYX_BIND_H
 
-#ifdef LYX_USE_TR1
-
-#include <functional>
-
-#ifdef __GNUC__
-#include <tr1/functional>
-#endif
+#include "support/functional.h"
 
 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;
+       using std::bind;
+       using std::ref;
 }
 
-#else
-
-#include <boost/bind.hpp>
-
-namespace lyx
-{
-       using boost::bind;
-       using boost::ref;
-}
-
-#endif
-
 
 #endif