diff --git a/include/boost/regex/v5/basic_regex.hpp b/include/boost/regex/v5/basic_regex.hpp index c486c8d5..0e6f232e 100644 --- a/include/boost/regex/v5/basic_regex.hpp +++ b/include/boost/regex/v5/basic_regex.hpp @@ -16,8 +16,8 @@ * DESCRIPTION: Declares template class basic_regex. */ -#ifndef BOOST_REGEX_V4_BASIC_REGEX_HPP -#define BOOST_REGEX_V4_BASIC_REGEX_HPP +#ifndef BOOST_REGEX_V5_BASIC_REGEX_HPP +#define BOOST_REGEX_V5_BASIC_REGEX_HPP #include #include diff --git a/include/boost/regex/v5/basic_regex_creator.hpp b/include/boost/regex/v5/basic_regex_creator.hpp index 3834d807..c83c1cf9 100644 --- a/include/boost/regex/v5/basic_regex_creator.hpp +++ b/include/boost/regex/v5/basic_regex_creator.hpp @@ -17,8 +17,8 @@ * the data members of a regex_data object. */ -#ifndef BOOST_REGEX_V4_BASIC_REGEX_CREATOR_HPP -#define BOOST_REGEX_V4_BASIC_REGEX_CREATOR_HPP +#ifndef BOOST_REGEX_V5_BASIC_REGEX_CREATOR_HPP +#define BOOST_REGEX_V5_BASIC_REGEX_CREATOR_HPP #include diff --git a/include/boost/regex/v5/basic_regex_parser.hpp b/include/boost/regex/v5/basic_regex_parser.hpp index 77da995d..85ca3203 100644 --- a/include/boost/regex/v5/basic_regex_parser.hpp +++ b/include/boost/regex/v5/basic_regex_parser.hpp @@ -16,8 +16,8 @@ * DESCRIPTION: Declares template class basic_regex_parser. */ -#ifndef BOOST_REGEX_V4_BASIC_REGEX_PARSER_HPP -#define BOOST_REGEX_V4_BASIC_REGEX_PARSER_HPP +#ifndef BOOST_REGEX_V5_BASIC_REGEX_PARSER_HPP +#define BOOST_REGEX_V5_BASIC_REGEX_PARSER_HPP #ifdef BOOST_MSVC #pragma warning(push) diff --git a/include/boost/regex/v5/char_regex_traits.hpp b/include/boost/regex/v5/char_regex_traits.hpp index e8a501ca..95a35c24 100644 --- a/include/boost/regex/v5/char_regex_traits.hpp +++ b/include/boost/regex/v5/char_regex_traits.hpp @@ -17,8 +17,8 @@ */ -#ifndef BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP -#define BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP +#ifndef BOOST_REGEX_V5_CHAR_REGEX_TRAITS_HPP +#define BOOST_REGEX_V5_CHAR_REGEX_TRAITS_HPP #ifdef BOOST_MSVC #pragma warning(push) diff --git a/include/boost/regex/v5/indexed_bit_flag.hpp b/include/boost/regex/v5/indexed_bit_flag.hpp index c9d32c59..2b17864e 100644 --- a/include/boost/regex/v5/indexed_bit_flag.hpp +++ b/include/boost/regex/v5/indexed_bit_flag.hpp @@ -19,8 +19,8 @@ #include #include -#ifndef BOOST_REGEX_V4_INDEXED_BIT_FLAG_HPP -#define BOOST_REGEX_V4_INDEXED_BIT_FLAG_HPP +#ifndef BOOST_REGEX_V5_INDEXED_BIT_FLAG_HPP +#define BOOST_REGEX_V5_INDEXED_BIT_FLAG_HPP namespace boost{ namespace BOOST_REGEX_DETAIL_NS{ diff --git a/include/boost/regex/v5/iterator_traits.hpp b/include/boost/regex/v5/iterator_traits.hpp index ae45ecb8..1ece5c17 100644 --- a/include/boost/regex/v5/iterator_traits.hpp +++ b/include/boost/regex/v5/iterator_traits.hpp @@ -16,8 +16,8 @@ * DESCRIPTION: Declares iterator traits workarounds. */ -#ifndef BOOST_REGEX_V4_ITERATOR_TRAITS_HPP -#define BOOST_REGEX_V4_ITERATOR_TRAITS_HPP +#ifndef BOOST_REGEX_V5_ITERATOR_TRAITS_HPP +#define BOOST_REGEX_V5_ITERATOR_TRAITS_HPP #ifdef BOOST_MSVC #pragma warning(push) diff --git a/include/boost/regex/v5/match_flags.hpp b/include/boost/regex/v5/match_flags.hpp index 5dc72655..a2cd307f 100644 --- a/include/boost/regex/v5/match_flags.hpp +++ b/include/boost/regex/v5/match_flags.hpp @@ -16,8 +16,8 @@ * DESCRIPTION: Declares match_flags type. */ -#ifndef BOOST_REGEX_V4_MATCH_FLAGS -#define BOOST_REGEX_V4_MATCH_FLAGS +#ifndef BOOST_REGEX_V5_MATCH_FLAGS +#define BOOST_REGEX_V5_MATCH_FLAGS #ifdef __cplusplus # include diff --git a/include/boost/regex/v5/match_results.hpp b/include/boost/regex/v5/match_results.hpp index 7e509801..a8984ce2 100644 --- a/include/boost/regex/v5/match_results.hpp +++ b/include/boost/regex/v5/match_results.hpp @@ -16,8 +16,8 @@ * DESCRIPTION: Declares template class match_results. */ -#ifndef BOOST_REGEX_V4_MATCH_RESULTS_HPP -#define BOOST_REGEX_V4_MATCH_RESULTS_HPP +#ifndef BOOST_REGEX_V5_MATCH_RESULTS_HPP +#define BOOST_REGEX_V5_MATCH_RESULTS_HPP #ifdef BOOST_MSVC #pragma warning(push) diff --git a/include/boost/regex/v5/mem_block_cache.hpp b/include/boost/regex/v5/mem_block_cache.hpp index 1996a512..09e6ba4f 100644 --- a/include/boost/regex/v5/mem_block_cache.hpp +++ b/include/boost/regex/v5/mem_block_cache.hpp @@ -15,8 +15,8 @@ * DESCRIPTION: memory block cache used by the non-recursive matcher. */ -#ifndef BOOST_REGEX_V4_MEM_BLOCK_CACHE_HPP -#define BOOST_REGEX_V4_MEM_BLOCK_CACHE_HPP +#ifndef BOOST_REGEX_V5_MEM_BLOCK_CACHE_HPP +#define BOOST_REGEX_V5_MEM_BLOCK_CACHE_HPP #include #ifdef BOOST_HAS_THREADS diff --git a/include/boost/regex/v5/perl_matcher_common.hpp b/include/boost/regex/v5/perl_matcher_common.hpp index d6c2d028..637bc622 100644 --- a/include/boost/regex/v5/perl_matcher_common.hpp +++ b/include/boost/regex/v5/perl_matcher_common.hpp @@ -17,8 +17,8 @@ * common to both the recursive and non-recursive versions. */ -#ifndef BOOST_REGEX_V4_PERL_MATCHER_COMMON_HPP -#define BOOST_REGEX_V4_PERL_MATCHER_COMMON_HPP +#ifndef BOOST_REGEX_V5_PERL_MATCHER_COMMON_HPP +#define BOOST_REGEX_V5_PERL_MATCHER_COMMON_HPP #ifdef BOOST_MSVC #pragma warning(push) diff --git a/include/boost/regex/v5/perl_matcher_non_recursive.hpp b/include/boost/regex/v5/perl_matcher_non_recursive.hpp index 8f264e46..49b565f6 100644 --- a/include/boost/regex/v5/perl_matcher_non_recursive.hpp +++ b/include/boost/regex/v5/perl_matcher_non_recursive.hpp @@ -17,8 +17,8 @@ * specific to the non-recursive implementation. */ -#ifndef BOOST_REGEX_V4_PERL_MATCHER_NON_RECURSIVE_HPP -#define BOOST_REGEX_V4_PERL_MATCHER_NON_RECURSIVE_HPP +#ifndef BOOST_REGEX_V5_PERL_MATCHER_NON_RECURSIVE_HPP +#define BOOST_REGEX_V5_PERL_MATCHER_NON_RECURSIVE_HPP #include diff --git a/include/boost/regex/v5/regbase.hpp b/include/boost/regex/v5/regbase.hpp index 2b737d5a..8647535a 100644 --- a/include/boost/regex/v5/regbase.hpp +++ b/include/boost/regex/v5/regbase.hpp @@ -16,8 +16,8 @@ * DESCRIPTION: Declares class regbase. */ -#ifndef BOOST_REGEX_V4_REGBASE_HPP -#define BOOST_REGEX_V4_REGBASE_HPP +#ifndef BOOST_REGEX_V5_REGBASE_HPP +#define BOOST_REGEX_V5_REGBASE_HPP #ifdef BOOST_MSVC #pragma warning(push) diff --git a/include/boost/regex/v5/regex.hpp b/include/boost/regex/v5/regex.hpp index 7a1ee4bf..202065f8 100644 --- a/include/boost/regex/v5/regex.hpp +++ b/include/boost/regex/v5/regex.hpp @@ -41,7 +41,7 @@ #ifndef BOOST_REGEX_RAW_BUFFER_HPP #include #endif -#ifndef BOOST_REGEX_V4_MATCH_FLAGS +#ifndef BOOST_REGEX_V5_MATCH_FLAGS #include #endif #ifndef BOOST_REGEX_RAW_BUFFER_HPP @@ -51,34 +51,34 @@ #include #endif -#ifndef BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP +#ifndef BOOST_REGEX_V5_CHAR_REGEX_TRAITS_HPP #include #endif -#ifndef BOOST_REGEX_V4_STATES_HPP +#ifndef BOOST_REGEX_V5_STATES_HPP #include #endif -#ifndef BOOST_REGEX_V4_REGBASE_HPP +#ifndef BOOST_REGEX_V5_REGBASE_HPP #include #endif -#ifndef BOOST_REGEX_V4_ITERATOR_TRAITS_HPP +#ifndef BOOST_REGEX_V5_ITERATOR_TRAITS_HPP #include #endif -#ifndef BOOST_REGEX_V4_BASIC_REGEX_HPP +#ifndef BOOST_REGEX_V5_BASIC_REGEX_HPP #include #endif -#ifndef BOOST_REGEX_V4_BASIC_REGEX_CREATOR_HPP +#ifndef BOOST_REGEX_V5_BASIC_REGEX_CREATOR_HPP #include #endif -#ifndef BOOST_REGEX_V4_BASIC_REGEX_PARSER_HPP +#ifndef BOOST_REGEX_V5_BASIC_REGEX_PARSER_HPP #include #endif -#ifndef BOOST_REGEX_V4_SUB_MATCH_HPP +#ifndef BOOST_REGEX_V5_SUB_MATCH_HPP #include #endif #ifndef BOOST_REGEX_FORMAT_HPP #include #endif -#ifndef BOOST_REGEX_V4_MATCH_RESULTS_HPP +#ifndef BOOST_REGEX_V5_MATCH_RESULTS_HPP #include #endif #ifndef BOOST_REGEX_MATCHER_HPP @@ -104,7 +104,7 @@ typedef match_results wsmatch; #ifndef BOOST_REGEX_MATCH_HPP #include #endif -#ifndef BOOST_REGEX_V4_REGEX_SEARCH_HPP +#ifndef BOOST_REGEX_V5_REGEX_SEARCH_HPP #include #endif #ifndef BOOST_REGEX_ITERATOR_HPP @@ -113,13 +113,13 @@ typedef match_results wsmatch; #ifndef BOOST_REGEX_TOKEN_ITERATOR_HPP #include #endif -#ifndef BOOST_REGEX_V4_REGEX_GREP_HPP +#ifndef BOOST_REGEX_V5_REGEX_GREP_HPP #include #endif -#ifndef BOOST_REGEX_V4_REGEX_REPLACE_HPP +#ifndef BOOST_REGEX_V5_REGEX_REPLACE_HPP #include #endif -#ifndef BOOST_REGEX_V4_REGEX_MERGE_HPP +#ifndef BOOST_REGEX_V5_REGEX_MERGE_HPP #include #endif #ifndef BOOST_REGEX_SPLIT_HPP diff --git a/include/boost/regex/v5/regex_grep.hpp b/include/boost/regex/v5/regex_grep.hpp index c5cb054e..f6997494 100644 --- a/include/boost/regex/v5/regex_grep.hpp +++ b/include/boost/regex/v5/regex_grep.hpp @@ -16,8 +16,8 @@ * DESCRIPTION: Provides regex_grep implementation. */ -#ifndef BOOST_REGEX_V4_REGEX_GREP_HPP -#define BOOST_REGEX_V4_REGEX_GREP_HPP +#ifndef BOOST_REGEX_V5_REGEX_GREP_HPP +#define BOOST_REGEX_V5_REGEX_GREP_HPP namespace boost{ @@ -151,5 +151,5 @@ inline unsigned int regex_grep(bool (*foo)(const match_results @@ -191,5 +191,5 @@ inline regex_iterator::const_iterator, } // namespace boost -#endif // BOOST_REGEX_V4_REGEX_ITERATOR_HPP +#endif // BOOST_REGEX_V5_REGEX_ITERATOR_HPP diff --git a/include/boost/regex/v5/regex_merge.hpp b/include/boost/regex/v5/regex_merge.hpp index 404ca775..1d21f19f 100644 --- a/include/boost/regex/v5/regex_merge.hpp +++ b/include/boost/regex/v5/regex_merge.hpp @@ -18,8 +18,8 @@ * by regex.hpp, do not include on its own. */ -#ifndef BOOST_REGEX_V4_REGEX_MERGE_HPP -#define BOOST_REGEX_V4_REGEX_MERGE_HPP +#ifndef BOOST_REGEX_V5_REGEX_MERGE_HPP +#define BOOST_REGEX_V5_REGEX_MERGE_HPP namespace boost{ @@ -88,6 +88,6 @@ inline std::basic_string regex_merge(const std::basic_string& s, } // namespace boost -#endif // BOOST_REGEX_V4_REGEX_MERGE_HPP +#endif // BOOST_REGEX_V5_REGEX_MERGE_HPP diff --git a/include/boost/regex/v5/regex_replace.hpp b/include/boost/regex/v5/regex_replace.hpp index 415c58b6..4cd7ddf7 100644 --- a/include/boost/regex/v5/regex_replace.hpp +++ b/include/boost/regex/v5/regex_replace.hpp @@ -18,8 +18,8 @@ * by regex.hpp, do not include on its own. */ -#ifndef BOOST_REGEX_V4_REGEX_REPLACE_HPP -#define BOOST_REGEX_V4_REGEX_REPLACE_HPP +#ifndef BOOST_REGEX_V5_REGEX_REPLACE_HPP +#define BOOST_REGEX_V5_REGEX_REPLACE_HPP namespace boost{ @@ -94,6 +94,6 @@ std::basic_string regex_replace(const std::basic_string& s, } // namespace boost -#endif // BOOST_REGEX_V4_REGEX_REPLACE_HPP +#endif // BOOST_REGEX_V5_REGEX_REPLACE_HPP diff --git a/include/boost/regex/v5/regex_search.hpp b/include/boost/regex/v5/regex_search.hpp index 0725d3ec..b508fd46 100644 --- a/include/boost/regex/v5/regex_search.hpp +++ b/include/boost/regex/v5/regex_search.hpp @@ -16,8 +16,8 @@ * DESCRIPTION: Provides regex_search implementation. */ -#ifndef BOOST_REGEX_V4_REGEX_SEARCH_HPP -#define BOOST_REGEX_V4_REGEX_SEARCH_HPP +#ifndef BOOST_REGEX_V5_REGEX_SEARCH_HPP +#define BOOST_REGEX_V5_REGEX_SEARCH_HPP namespace boost{ @@ -212,6 +212,6 @@ inline bool regex_search(const std::basic_string& s, } // namespace boost -#endif // BOOST_REGEX_V4_REGEX_SEARCH_HPP +#endif // BOOST_REGEX_V5_REGEX_SEARCH_HPP diff --git a/include/boost/regex/v5/regex_token_iterator.hpp b/include/boost/regex/v5/regex_token_iterator.hpp index ab15a257..61eea711 100644 --- a/include/boost/regex/v5/regex_token_iterator.hpp +++ b/include/boost/regex/v5/regex_token_iterator.hpp @@ -16,8 +16,8 @@ * DESCRIPTION: Provides regex_token_iterator implementation. */ -#ifndef BOOST_REGEX_V4_REGEX_TOKEN_ITERATOR_HPP -#define BOOST_REGEX_V4_REGEX_TOKEN_ITERATOR_HPP +#ifndef BOOST_REGEX_V5_REGEX_TOKEN_ITERATOR_HPP +#define BOOST_REGEX_V5_REGEX_TOKEN_ITERATOR_HPP #include #include @@ -318,7 +318,7 @@ inline regex_token_iterator::const_ite } // namespace boost -#endif // BOOST_REGEX_V4_REGEX_TOKEN_ITERATOR_HPP +#endif // BOOST_REGEX_V5_REGEX_TOKEN_ITERATOR_HPP diff --git a/include/boost/regex/v5/states.hpp b/include/boost/regex/v5/states.hpp index 86eb02b1..a0e3b4bc 100644 --- a/include/boost/regex/v5/states.hpp +++ b/include/boost/regex/v5/states.hpp @@ -16,8 +16,8 @@ * DESCRIPTION: Declares internal state machine structures. */ -#ifndef BOOST_REGEX_V4_STATES_HPP -#define BOOST_REGEX_V4_STATES_HPP +#ifndef BOOST_REGEX_V5_STATES_HPP +#define BOOST_REGEX_V5_STATES_HPP #ifdef BOOST_MSVC #pragma warning(push) diff --git a/include/boost/regex/v5/sub_match.hpp b/include/boost/regex/v5/sub_match.hpp index 30a580d5..9f0577aa 100644 --- a/include/boost/regex/v5/sub_match.hpp +++ b/include/boost/regex/v5/sub_match.hpp @@ -16,8 +16,8 @@ * DESCRIPTION: Declares template class sub_match. */ -#ifndef BOOST_REGEX_V4_SUB_MATCH_HPP -#define BOOST_REGEX_V4_SUB_MATCH_HPP +#ifndef BOOST_REGEX_V5_SUB_MATCH_HPP +#define BOOST_REGEX_V5_SUB_MATCH_HPP #ifdef BOOST_MSVC #pragma warning(push) diff --git a/include/boost/regex/v5/u32regex_iterator.hpp b/include/boost/regex/v5/u32regex_iterator.hpp index f8763a8d..66fc83f9 100644 --- a/include/boost/regex/v5/u32regex_iterator.hpp +++ b/include/boost/regex/v5/u32regex_iterator.hpp @@ -16,8 +16,8 @@ * DESCRIPTION: Provides u32regex_iterator implementation. */ -#ifndef BOOST_REGEX_V4_U32REGEX_ITERATOR_HPP -#define BOOST_REGEX_V4_U32REGEX_ITERATOR_HPP +#ifndef BOOST_REGEX_V5_U32REGEX_ITERATOR_HPP +#define BOOST_REGEX_V5_U32REGEX_ITERATOR_HPP namespace boost{ @@ -181,5 +181,5 @@ inline u32regex_iterator make_u32regex_iterator(const U_NAMESPACE_ } // namespace boost -#endif // BOOST_REGEX_V4_REGEX_ITERATOR_HPP +#endif // BOOST_REGEX_V5_REGEX_ITERATOR_HPP diff --git a/include/boost/regex/v5/u32regex_token_iterator.hpp b/include/boost/regex/v5/u32regex_token_iterator.hpp index 2e04810d..9562f525 100644 --- a/include/boost/regex/v5/u32regex_token_iterator.hpp +++ b/include/boost/regex/v5/u32regex_token_iterator.hpp @@ -16,8 +16,8 @@ * DESCRIPTION: Provides u32regex_token_iterator implementation. */ -#ifndef BOOST_REGEX_V4_U32REGEX_TOKEN_ITERATOR_HPP -#define BOOST_REGEX_V4_U32REGEX_TOKEN_ITERATOR_HPP +#ifndef BOOST_REGEX_V5_U32REGEX_TOKEN_ITERATOR_HPP +#define BOOST_REGEX_V5_U32REGEX_TOKEN_ITERATOR_HPP #if (BOOST_WORKAROUND(BOOST_BORLANDC, >= 0x560) && BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x570)))\ || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) @@ -353,7 +353,7 @@ inline u32regex_token_iterator make_u32regex_token_iterator(const } // namespace boost -#endif // BOOST_REGEX_V4_REGEX_TOKEN_ITERATOR_HPP +#endif // BOOST_REGEX_V5_REGEX_TOKEN_ITERATOR_HPP