#ifndef LYX_REGEXP_H
#define LYX_REGEXP_H
-#include "config.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; \
- } \
-
-
-
#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
+# 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
+# include <boost/regex.hpp>
+# define LR_NS boost
#endif
-namespace lyx
+namespace lyx {
+using LR_NS::regex;
+using LR_NS::smatch;
+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::match_results;
+
+namespace regex_constants
{
- LYX_REGEX_TO_LYX(std::tr1);
+using namespace LR_NS::regex_constants;
+using LR_NS::regex_constants::match_flag_type;
}
-#else
-
-#include "boost/regex.hpp"
-
-namespace lyx
-{
- LYX_REGEX_TO_LYX(boost);
}
-#endif
-
+#undef LR_NS
#endif