diff --git a/include/boost/re_detail/regex_config.hpp b/include/boost/re_detail/regex_config.hpp index 6d27f254..3aba5933 100644 --- a/include/boost/re_detail/regex_config.hpp +++ b/include/boost/re_detail/regex_config.hpp @@ -49,7 +49,15 @@ Do not change this file unless you really really have to, add options to #include #include #else +// +// C build, +// don't include because that may +// do C++ specific things in future... +// #include +#ifdef _MSC_VER +#define BOOST_MSVC _MSC_VER +#endif #endif /* this will increase in future versions: */ @@ -201,7 +209,7 @@ Do not change this file unless you really really have to, add options to #define BOOST_RE_NO_STRING_DEF_ARGS #endif - #ifndef _CPPUNWIND + #if !defined(_CPPUNWIND) && defined(__cplusplus) #error exception handling support required #endif @@ -1211,5 +1219,6 @@ namespace std{ + diff --git a/include/boost/regex.h b/include/boost/regex.h index e0a2ccd8..af64f18e 100644 --- a/include/boost/regex.h +++ b/include/boost/regex.h @@ -54,6 +54,11 @@ using boost::REG_ASSERT; using boost::REG_INVARG; using boost::REG_ATOI; using boost::REG_ITOA; + +using boost::REG_NOTBOL; +using boost::REG_NOTEOL; +using boost::REG_STARTEND; + using boost::reg_comp_flags; using boost::reg_exec_flags; using boost::regcompA; @@ -93,3 +98,4 @@ using boost::reg_errcode_t; #endif // __cplusplus #endif // BOOST_RE_REGEX_H +