diff --git a/include/boost/regex/detail/regex_match.hpp b/include/boost/regex/detail/regex_match.hpp index 1816ad3f..e7aeb10b 100644 --- a/include/boost/regex/detail/regex_match.hpp +++ b/include/boost/regex/detail/regex_match.hpp @@ -40,10 +40,6 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next, re_set_long* set_, const reg_expression& e) { -#ifdef BOOST_MSVC -# pragma warning(push) -# pragma warning(disable: 4800) -#endif const charT* p = (const charT*)(set_+1); iterator ptr; unsigned int i; @@ -144,9 +140,6 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next, if(traits_inst.is_class(col, set_->cclasses) == true) return set_->isnot ? next : ++next; return set_->isnot ? ++next : next; -#ifdef BOOST_MSVC -# pragma warning(pop) -#endif } template @@ -267,10 +260,6 @@ bool query_match_aux(iterator first, _priv_match_data& pd, iterator* restart) { -#ifdef BOOST_MSVC -# pragma warning(push) -# pragma warning(disable: 4800) -#endif typedef access_t access; if(e.flags() & regbase::failbit) @@ -955,9 +944,6 @@ bool query_match_aux(iterator first, // if we get to here then everything has failed // and no match was found: return false; -#ifdef BOOST_MSVC -# pragma warning(pop) -#endif } #if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE) } // namespace @@ -1033,7 +1019,7 @@ struct grep_search_predicate } }; -#if !defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) && !defined(BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING) +#if !defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) && !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) template inline const match_results_base& grep_out_type(const grep_search_predicate& o, const Allocator&) @@ -1545,9 +1531,6 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression& s, template bool regex_search(iterator first, iterator last, match_results& m, const reg_expression& e, unsigned flags = match_default) { -#ifdef BOOST_MSVC -# pragma warning(push) -# pragma warning(disable: 4800) -#endif if(e.flags() & regbase::failbit) return false; @@ -1704,14 +1683,11 @@ bool regex_search(iterator first, iterator last, match_results(&m), first, last, e, flags, m.allocator()); -#ifdef BOOST_MSVC -# pragma warning(pop) -#endif } // // regex_search convenience interfaces: -#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING +#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING // // this isn't really a partial specialisation, but template function // overloading - if the compiler doesn't support partial specialisation @@ -1782,7 +1758,7 @@ inline unsigned int regex_grep(Predicate foo, iterator first, iterator last, con // // regex_grep convenience interfaces: -#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING +#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING // // this isn't really a partial specialisation, but template function // overloading - if the compiler doesn't support partial specialisation diff --git a/include/boost/regex/detail/regex_split.hpp b/include/boost/regex/detail/regex_split.hpp index c546dd4a..cd5b906a 100644 --- a/include/boost/regex/detail/regex_split.hpp +++ b/include/boost/regex/detail/regex_split.hpp @@ -61,10 +61,6 @@ template ::operator() (const match_results& what) { -#ifdef BOOST_MSVC -# pragma warning(push) -# pragma warning(disable: 4800) -#endif *p_last = what[0].second; if(what.size() > 1) { @@ -90,9 +86,6 @@ bool split_pred::operator() // // initial null, do nothing: return true; -#ifdef BOOST_MSVC -# pragma warning(pop) -#endif } } // namespace re_detail diff --git a/include/boost/regex/regex_traits.hpp b/include/boost/regex/regex_traits.hpp index cc6b7d43..98992309 100644 --- a/include/boost/regex/regex_traits.hpp +++ b/include/boost/regex/regex_traits.hpp @@ -126,11 +126,6 @@ struct BOOST_REGEX_DECL c_traits_base : public regex_traits_base { public: enum{ - // - // these values *must* have the same values as their Win32 - // equivalents, in order to share data between the two traits - // classes (we will static-assert that later): - // char_class_none = 0, char_class_alpha = 0x0001, char_class_cntrl = 0x0002, diff --git a/old_include/regex.h b/old_include/regex.h index 3ffb691a..0d824b27 100644 --- a/old_include/regex.h +++ b/old_include/regex.h @@ -82,7 +82,7 @@ bool query_match(iterator first, iterator last, boost::match_results& e, bool recurse = true) debug_iterator y(search_text.end(), search_text.begin(), search_text.end()); grep_test_predicate, allocator_type> oi(x, y); regex_grep(oi, x, y, e, flags[3]); -#if !defined(BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING) +#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) if(!recurse) { std::basic_string s(search_text.begin(), search_text.end()); @@ -309,7 +309,7 @@ void cpp_tests(const reg_expression& e, bool recurse = true) // // now try alternative forms of regex_search if available: -#if !defined(BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING) +#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) if(!recurse) { std::basic_string s(search_text.begin(), search_text.end()); diff --git a/test/regress/wregex_test.cpp b/test/regress/wregex_test.cpp index decd23e1..2c1d531d 100644 --- a/test/regress/wregex_test.cpp +++ b/test/regress/wregex_test.cpp @@ -123,7 +123,7 @@ template std::size_t regex_split(test_string_type*, template std::size_t regex_split(test_string_type*, test_string_type&); -#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING +#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING // // the following prototypes are only available if partial ordering // of template functions is supported: