-#include "checktr1.h"
-
-
-#define LYX_REGEX_TO_LYX(X) \
- using X::regex; \
- using X::smatch; \
- using X::regex_replace; \
- using X::basic_regex; \
- using X::regex_error; \
- using X::regex_search; \
- using X::sregex_iterator; \
- using X::match_results; \
- \
- namespace regex_constants \
- { \
- using namespace X::regex_constants; \
- using X::regex_constants::match_flag_type; \
- } \
-
-
-
-// TODO: only tested with msvc10
-#if defined(LYX_USE_TR1) && defined(_MSC_VER)
-
-#ifdef _MSC_VER
-#include <regex>
-#define match_partial _Match_partial // why is match_partial not public?
+#ifdef LYX_USE_STD_REGEX
+# include <regex>
+// <regex> in gcc is unusable in versions less than 4.9.0
+// see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
+# define LR_NS std