Fix bugs #6078 and #9364

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

diff --git a/src/support/regex.h b/src/support/regex.h
index db365ca4e6c8d03004bdf555f274163b30034f08..dd4875e35fe587370b9f02a7832036aa3d783ec6 100644 (file)
--- a/src/support/regex.h
+++ b/src/support/regex.h
@@ -12,13 +12,14 @@
 #ifndef LYX_REGEXP_H
 #define LYX_REGEXP_H
 
-#if __cplusplus >= 201103L && defined(LYX_USE_STD_REGEX)
+#if defined(LYX_USE_CXX11) && defined(LYX_USE_STD_REGEX)
 #  include <regex>
 #  ifdef _MSC_VER
-#    define match_partial _Match_partial
 namespace lyx {
   // inheriting 'private' to see which functions are used and if there are
   // other ECMAScrip defaults
+  // FIXME: Is this really needed?
+  //        If yes, then the MSVC regex implementation is not standard-conforming.
   class regex : private std::regex
   {
   public:
@@ -59,7 +60,6 @@ namespace lyx {
 #  else
 // <regex> in gcc is unusable in versions less than 4.9.0
 // see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
-// TODO no match_partial in std, how to replace?
 #  define LR_NS std
 namespace lyx {
 using LR_NS::regex;