diff --git a/include/boost/regex/pattern_except.hpp b/include/boost/regex/pattern_except.hpp index 1ac85307..57ea14c2 100644 --- a/include/boost/regex/pattern_except.hpp +++ b/include/boost/regex/pattern_except.hpp @@ -29,9 +29,16 @@ namespace boost{ +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #ifdef BOOST_MSVC #pragma warning(push) @@ -74,9 +81,16 @@ void raise_error(const traits& t, regex_constants::error_type code) #pragma warning(pop) #endif +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif } // namespace boost diff --git a/include/boost/regex/v4/basic_regex.hpp b/include/boost/regex/v4/basic_regex.hpp index b21a7c66..71a20f4d 100644 --- a/include/boost/regex/v4/basic_regex.hpp +++ b/include/boost/regex/v4/basic_regex.hpp @@ -19,9 +19,16 @@ #ifndef BOOST_REGEX_V4_BASIC_REGEX_HPP #define BOOST_REGEX_V4_BASIC_REGEX_HPP +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif namespace boost{ #ifdef BOOST_MSVC @@ -630,9 +637,16 @@ public: } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/basic_regex_creator.hpp b/include/boost/regex/v4/basic_regex_creator.hpp index 37b26ca8..fec755f8 100644 --- a/include/boost/regex/v4/basic_regex_creator.hpp +++ b/include/boost/regex/v4/basic_regex_creator.hpp @@ -20,9 +20,16 @@ #ifndef BOOST_REGEX_V4_BASIC_REGEX_CREATOR_HPP #define BOOST_REGEX_V4_BASIC_REGEX_CREATOR_HPP +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #ifdef BOOST_MSVC # pragma warning(push) @@ -1298,8 +1305,15 @@ void basic_regex_creator::probe_leading_repeat(re_syntax_base* st # pragma warning(pop) #endif +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/basic_regex_parser.hpp b/include/boost/regex/v4/basic_regex_parser.hpp index 2e854b19..fcf512c2 100644 --- a/include/boost/regex/v4/basic_regex_parser.hpp +++ b/include/boost/regex/v4/basic_regex_parser.hpp @@ -19,9 +19,16 @@ #ifndef BOOST_REGEX_V4_BASIC_REGEX_PARSER_HPP #define BOOST_REGEX_V4_BASIC_REGEX_PARSER_HPP +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif namespace boost{ namespace re_detail{ @@ -2082,8 +2089,15 @@ bool basic_regex_parser::unwind_alts(std::ptrdiff_t last_paren_st } // namespace re_detail } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/c_regex_traits.hpp b/include/boost/regex/v4/c_regex_traits.hpp index b4ec1518..d99b0f34 100644 --- a/include/boost/regex/v4/c_regex_traits.hpp +++ b/include/boost/regex/v4/c_regex_traits.hpp @@ -34,9 +34,16 @@ namespace std{ } #endif +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif namespace boost{ @@ -187,9 +194,16 @@ private: } +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/char_regex_traits.hpp b/include/boost/regex/v4/char_regex_traits.hpp index f00e65eb..e8a501ca 100644 --- a/include/boost/regex/v4/char_regex_traits.hpp +++ b/include/boost/regex/v4/char_regex_traits.hpp @@ -20,9 +20,16 @@ #ifndef BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP #define BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif namespace boost{ @@ -59,9 +66,16 @@ public: } // namespace deprecated } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif // include diff --git a/include/boost/regex/v4/cpp_regex_traits.hpp b/include/boost/regex/v4/cpp_regex_traits.hpp index 7e76a39d..e4eaf7c8 100644 --- a/include/boost/regex/v4/cpp_regex_traits.hpp +++ b/include/boost/regex/v4/cpp_regex_traits.hpp @@ -42,9 +42,16 @@ #include #include +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #ifdef BOOST_MSVC #pragma warning(push) @@ -1032,9 +1039,16 @@ static_mutex& cpp_regex_traits::get_mutex_inst() #pragma warning(pop) #endif +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/cregex.hpp b/include/boost/regex/v4/cregex.hpp index 17818ec5..cafe396c 100644 --- a/include/boost/regex/v4/cregex.hpp +++ b/include/boost/regex/v4/cregex.hpp @@ -32,9 +32,16 @@ #include #endif +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif /* include these defs only for POSIX compatablity */ #ifdef __cplusplus @@ -176,9 +183,16 @@ BOOST_REGEX_DECL void BOOST_REGEX_CCALL regfreeW(regex_tW*); #define regex_t regex_tA #endif +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #ifdef __cplusplus } // extern "C" @@ -193,9 +207,16 @@ BOOST_REGEX_DECL void BOOST_REGEX_CCALL regfreeW(regex_tW*); #include namespace boost{ +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif class RegEx; @@ -280,9 +301,16 @@ public: friend struct re_detail::pred4; }; +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif } // namespace boost diff --git a/include/boost/regex/v4/iterator_traits.hpp b/include/boost/regex/v4/iterator_traits.hpp index 7e247f53..f7afacb1 100644 --- a/include/boost/regex/v4/iterator_traits.hpp +++ b/include/boost/regex/v4/iterator_traits.hpp @@ -19,9 +19,16 @@ #ifndef BOOST_REGEX_V4_ITERATOR_TRAITS_HPP #define BOOST_REGEX_V4_ITERATOR_TRAITS_HPP +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif namespace boost{ namespace re_detail{ @@ -113,9 +120,16 @@ struct regex_iterator_traits : public std::iterator_traits {}; } // namespace re_detail } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/match_results.hpp b/include/boost/regex/v4/match_results.hpp index f56c4941..acf509fa 100644 --- a/include/boost/regex/v4/match_results.hpp +++ b/include/boost/regex/v4/match_results.hpp @@ -19,9 +19,16 @@ #ifndef BOOST_REGEX_V4_MATCH_RESULTS_HPP #define BOOST_REGEX_V4_MATCH_RESULTS_HPP +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif namespace boost{ #ifdef BOOST_MSVC @@ -404,9 +411,16 @@ std::ostream& operator << (std::ostream& os, #endif } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/perl_matcher.hpp b/include/boost/regex/v4/perl_matcher.hpp index aaeca5c7..547cb24a 100644 --- a/include/boost/regex/v4/perl_matcher.hpp +++ b/include/boost/regex/v4/perl_matcher.hpp @@ -14,9 +14,16 @@ #include +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #ifdef BOOST_MSVC # pragma warning(push) @@ -511,9 +518,16 @@ private: } // namespace re_detail +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif } // namespace boost diff --git a/include/boost/regex/v4/perl_matcher_common.hpp b/include/boost/regex/v4/perl_matcher_common.hpp index cb6a90af..72e43d00 100644 --- a/include/boost/regex/v4/perl_matcher_common.hpp +++ b/include/boost/regex/v4/perl_matcher_common.hpp @@ -20,9 +20,16 @@ #ifndef BOOST_REGEX_V4_PERL_MATCHER_COMMON_HPP #define BOOST_REGEX_V4_PERL_MATCHER_COMMON_HPP +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #ifdef __BORLANDC__ # pragma option push -w-8008 -w-8066 @@ -949,9 +956,16 @@ bool perl_matcher::find_restart_lit() #ifdef __BORLANDC__ # pragma option pop #endif +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/perl_matcher_non_recursive.hpp b/include/boost/regex/v4/perl_matcher_non_recursive.hpp index bcd62c3c..3bf34601 100644 --- a/include/boost/regex/v4/perl_matcher_non_recursive.hpp +++ b/include/boost/regex/v4/perl_matcher_non_recursive.hpp @@ -22,10 +22,17 @@ #include +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif #ifdef BOOST_MSVC +#pragma warning(pop) +#endif +#ifdef BOOST_MSVC # pragma warning(push) # pragma warning(disable: 4800) #endif @@ -1366,9 +1373,16 @@ bool perl_matcher::unwind_non_greedy_repeat(boo # pragma warning(pop) #endif +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/perl_matcher_recursive.hpp b/include/boost/regex/v4/perl_matcher_recursive.hpp index 1e98b342..746d02ab 100644 --- a/include/boost/regex/v4/perl_matcher_recursive.hpp +++ b/include/boost/regex/v4/perl_matcher_recursive.hpp @@ -20,9 +20,21 @@ #ifndef BOOST_REGEX_V4_PERL_MATCHER_RECURSIVE_HPP #define BOOST_REGEX_V4_PERL_MATCHER_RECURSIVE_HPP +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif + +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4800) +#endif namespace boost{ namespace re_detail{ @@ -823,10 +835,20 @@ bool perl_matcher::backtrack_till_match(std::si } // namespace re_detail } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/primary_transform.hpp b/include/boost/regex/v4/primary_transform.hpp index e498b63b..989f500c 100644 --- a/include/boost/regex/v4/primary_transform.hpp +++ b/include/boost/regex/v4/primary_transform.hpp @@ -20,9 +20,16 @@ #ifndef BOOST_REGEX_PRIMARY_TRANSFORM #define BOOST_REGEX_PRIMARY_TRANSFORM +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif namespace boost{ namespace re_detail{ @@ -118,9 +125,16 @@ unsigned find_sort_syntax(const traits* pt, charT* delim) } // namespace re_detail } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/protected_call.hpp b/include/boost/regex/v4/protected_call.hpp index 197c4556..ebf15ba3 100644 --- a/include/boost/regex/v4/protected_call.hpp +++ b/include/boost/regex/v4/protected_call.hpp @@ -20,9 +20,16 @@ #ifndef BOOST_REGEX_V4_PROTECTED_CALL_HPP #define BOOST_REGEX_V4_PROTECTED_CALL_HPP +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif namespace boost{ namespace re_detail{ @@ -60,8 +67,15 @@ bool concrete_protected_call::call()const } } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/regbase.hpp b/include/boost/regex/v4/regbase.hpp index 4c6bde83..d27799c3 100644 --- a/include/boost/regex/v4/regbase.hpp +++ b/include/boost/regex/v4/regbase.hpp @@ -19,9 +19,16 @@ #ifndef BOOST_REGEX_V4_REGBASE_HPP #define BOOST_REGEX_V4_REGBASE_HPP +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif namespace boost{ // @@ -154,9 +161,16 @@ namespace regex_constants{ } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/regex_format.hpp b/include/boost/regex/v4/regex_format.hpp index 54aa54c5..ea55ed66 100644 --- a/include/boost/regex/v4/regex_format.hpp +++ b/include/boost/regex/v4/regex_format.hpp @@ -24,9 +24,16 @@ namespace boost{ +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif // // Forward declaration: @@ -625,9 +632,16 @@ std::basic_string regex_format(const match_results& m, return result; } +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif } // namespace boost diff --git a/include/boost/regex/v4/regex_grep.hpp b/include/boost/regex/v4/regex_grep.hpp index b8bb8479..3a3d906e 100644 --- a/include/boost/regex/v4/regex_grep.hpp +++ b/include/boost/regex/v4/regex_grep.hpp @@ -22,9 +22,16 @@ namespace boost{ +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif // // regex_grep: @@ -131,9 +138,16 @@ inline unsigned int regex_grep(bool (*foo)(const match_results::const_iterator, return regex_iterator::const_iterator, charT, traits>(p.begin(), p.end(), e, m); } +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif } // namespace boost diff --git a/include/boost/regex/v4/regex_match.hpp b/include/boost/regex/v4/regex_match.hpp index 7c1f88d6..e947a152 100644 --- a/include/boost/regex/v4/regex_match.hpp +++ b/include/boost/regex/v4/regex_match.hpp @@ -24,9 +24,16 @@ namespace boost{ +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif // // proc regex_match @@ -341,9 +348,16 @@ inline bool regex_match(const std::basic_string& s, #endif +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif } // namespace boost diff --git a/include/boost/regex/v4/regex_merge.hpp b/include/boost/regex/v4/regex_merge.hpp index 85c66dc9..404ca775 100644 --- a/include/boost/regex/v4/regex_merge.hpp +++ b/include/boost/regex/v4/regex_merge.hpp @@ -24,9 +24,16 @@ namespace boost{ +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif template inline OutputIterator regex_merge(OutputIterator out, @@ -68,9 +75,16 @@ inline std::basic_string regex_merge(const std::basic_string& s, return regex_replace(s, e, fmt, flags); } +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif } // namespace boost diff --git a/include/boost/regex/v4/regex_raw_buffer.hpp b/include/boost/regex/v4/regex_raw_buffer.hpp index 6de7664a..52d45a25 100644 --- a/include/boost/regex/v4/regex_raw_buffer.hpp +++ b/include/boost/regex/v4/regex_raw_buffer.hpp @@ -31,9 +31,16 @@ namespace boost{ namespace re_detail{ +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif struct empty_padding{}; @@ -180,9 +187,16 @@ inline raw_storage::raw_storage(size_type n) } +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif } // namespace re_detail } // namespace boost diff --git a/include/boost/regex/v4/regex_replace.hpp b/include/boost/regex/v4/regex_replace.hpp index 0dabba16..c4544c05 100644 --- a/include/boost/regex/v4/regex_replace.hpp +++ b/include/boost/regex/v4/regex_replace.hpp @@ -24,9 +24,16 @@ namespace boost{ +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif template OutputIterator regex_replace(OutputIterator out, @@ -97,9 +104,16 @@ std::basic_string regex_replace(const std::basic_string& s, return result; } +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif } // namespace boost diff --git a/include/boost/regex/v4/regex_search.hpp b/include/boost/regex/v4/regex_search.hpp index ee6028c2..cf5579d2 100644 --- a/include/boost/regex/v4/regex_search.hpp +++ b/include/boost/regex/v4/regex_search.hpp @@ -22,9 +22,16 @@ namespace boost{ +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif template bool regex_search(BidiIterator first, BidiIterator last, @@ -192,9 +199,16 @@ inline bool regex_search(const std::basic_string& s, #endif // partial overload +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif } // namespace boost diff --git a/include/boost/regex/v4/regex_split.hpp b/include/boost/regex/v4/regex_split.hpp index 6683e421..a7ae350f 100644 --- a/include/boost/regex/v4/regex_split.hpp +++ b/include/boost/regex/v4/regex_split.hpp @@ -23,9 +23,16 @@ namespace boost{ +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #ifdef BOOST_MSVC # pragma warning(push) @@ -147,9 +154,16 @@ inline std::size_t regex_split(OutputIterator out, # pragma warning(pop) #endif +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif } // namespace boost diff --git a/include/boost/regex/v4/regex_token_iterator.hpp b/include/boost/regex/v4/regex_token_iterator.hpp index a03fedd2..3d99d148 100644 --- a/include/boost/regex/v4/regex_token_iterator.hpp +++ b/include/boost/regex/v4/regex_token_iterator.hpp @@ -36,9 +36,16 @@ namespace boost{ +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #if BOOST_WORKAROUND(BOOST_MSVC, > 1300) # pragma warning(push) # pragma warning(disable:4700) @@ -315,9 +322,16 @@ inline regex_token_iterator::const_ite #if BOOST_WORKAROUND(BOOST_MSVC, == 1310) # pragma warning(pop) #endif +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif } // namespace boost diff --git a/include/boost/regex/v4/regex_traits.hpp b/include/boost/regex/v4/regex_traits.hpp index 9f2b3700..f5f0402c 100644 --- a/include/boost/regex/v4/regex_traits.hpp +++ b/include/boost/regex/v4/regex_traits.hpp @@ -56,9 +56,16 @@ #include "boost/mpl/has_xxx.hpp" #include +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif namespace boost{ @@ -167,9 +174,16 @@ private: } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif // include diff --git a/include/boost/regex/v4/regex_traits_defaults.hpp b/include/boost/regex/v4/regex_traits_defaults.hpp index aadb971b..38c12738 100644 --- a/include/boost/regex/v4/regex_traits_defaults.hpp +++ b/include/boost/regex/v4/regex_traits_defaults.hpp @@ -19,9 +19,16 @@ #ifndef BOOST_REGEX_TRAITS_DEFAULTS_HPP_INCLUDED #define BOOST_REGEX_TRAITS_DEFAULTS_HPP_INCLUDED +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #ifndef BOOST_REGEX_SYNTAX_TYPE_HPP #include @@ -310,8 +317,15 @@ int global_toi(const charT*& p1, const charT* p2, int radix, const traits& t) } // re_detail } // boost +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/states.hpp b/include/boost/regex/v4/states.hpp index 551ed669..74885d2a 100644 --- a/include/boost/regex/v4/states.hpp +++ b/include/boost/regex/v4/states.hpp @@ -19,9 +19,16 @@ #ifndef BOOST_REGEX_V4_STATES_HPP #define BOOST_REGEX_V4_STATES_HPP +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif namespace boost{ namespace re_detail{ @@ -267,9 +274,16 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next, } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/sub_match.hpp b/include/boost/regex/v4/sub_match.hpp index b21f4fab..1c79e39a 100644 --- a/include/boost/regex/v4/sub_match.hpp +++ b/include/boost/regex/v4/sub_match.hpp @@ -19,9 +19,16 @@ #ifndef BOOST_REGEX_V4_SUB_MATCH_HPP #define BOOST_REGEX_V4_SUB_MATCH_HPP +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif namespace boost{ @@ -487,9 +494,16 @@ sub_match::operator unsigned int()const } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif diff --git a/include/boost/regex/v4/w32_regex_traits.hpp b/include/boost/regex/v4/w32_regex_traits.hpp index a0f9b0f6..2f64843d 100644 --- a/include/boost/regex/v4/w32_regex_traits.hpp +++ b/include/boost/regex/v4/w32_regex_traits.hpp @@ -35,9 +35,16 @@ #include #endif +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_PREFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #ifdef BOOST_MSVC #pragma warning(push) @@ -710,8 +717,15 @@ static_mutex& w32_regex_traits::get_mutex_inst() #pragma warning(pop) #endif +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4103) +#endif #ifdef BOOST_HAS_ABI_HEADERS # include BOOST_ABI_SUFFIX #endif +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif #endif