TR1: check in cmake for GCC version, fallback in checktr1.h for other build systems...

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

diff --git a/src/support/bind.h b/src/support/bind.h
index 6d3d83e9ad6ca4a1720454263ebc1485f6e02cff..f613bdb40851d32329d95ad87b5b87f249fb560b 100644 (file)
--- a/src/support/bind.h
+++ b/src/support/bind.h
@@ -12,10 +12,17 @@
 #ifndef LYX_BIND_H
 #define LYX_BIND_H
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+#include "checktr1.h"
+
+
+#ifdef LYX_USE_TR1
 
 #include <functional>
 
+#ifdef __GNUC__
+#include <tr1/functional>
+#endif
+
 namespace lyx
 {
        using std::tr1::bind;