#ifndef LYX_REGEXP_H
#define LYX_REGEXP_H
-#if defined(LYX_USE_TR1) && defined(LYX_USE_TR1_REGEX)
-# ifdef _MSC_VER
-# include <regex>
-# define match_partial _Match_partial
-# else
-# include <tr1/regex>
-// TODO no match_partial in gcc, how to replace?
-# define match_partial match_default
-# endif
-# define LR_NS std::tr1
-#else
+#if defined(LYX_USE_CXX11) && defined(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
+#else
# include <boost/regex.hpp>
# define LR_NS boost
#endif
namespace lyx {
using LR_NS::regex;
-using LR_NS::smatch;
+using LR_NS::regex_match;
using LR_NS::regex_replace;
-using LR_NS::basic_regex;
-using LR_NS::regex_error;
using LR_NS::regex_search;
using LR_NS::sregex_iterator;
+using LR_NS::smatch;
+using LR_NS::basic_regex;
+using LR_NS::regex_error;
using LR_NS::match_results;
namespace regex_constants