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

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

diff --git a/src/support/regex.h b/src/support/regex.h
index 0826c9724ce6e82743e8bce9a6db0a4e1351fcfb..ef858743239cf56b1e7966040ac10a2cbbcc877e 100644 (file)
--- a/src/support/regex.h
+++ b/src/support/regex.h
@@ -33,14 +33,15 @@
 
 
 
-// TODO: only tested with msvc10
-#if defined(LYX_USE_TR1) && defined(_MSC_VER)
+#if defined(LYX_USE_TR1) && defined(LYX_USE_TR1_REGEX)
 
 #ifdef _MSC_VER
 #include <regex>
-#define match_partial _Match_partial // why is match_partial not public?
+#define match_partial _Match_partial
 #else
-#include <tr1/regexp>
+#include <tr1/regex>
+// TODO no match_partial in gcc, how to replace?
+#define match_partial match_default
 #endif
 
 namespace lyx