feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Fix up include macros.

Browse Source
This commit is contained in:
jzmaddock
2020-11-30 11:53:44 +00:00
parent 49e8067b80
commit 09cce205ed
23 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/regex/v5/basic_regex.hpp
View File

@ -16,8 +16,8 @@
* DESCRIPTION: Declares template class basic_regex. * DESCRIPTION: Declares template class basic_regex.
*/ */
#ifndef BOOST_REGEX_V4_BASIC_REGEX_HPP #ifndef BOOST_REGEX_V5_BASIC_REGEX_HPP
#define BOOST_REGEX_V4_BASIC_REGEX_HPP #define BOOST_REGEX_V5_BASIC_REGEX_HPP
#include <boost/type_traits/is_same.hpp> #include <boost/type_traits/is_same.hpp>
#include <boost/container_hash/hash.hpp> #include <boost/container_hash/hash.hpp>

4
include/boost/regex/v5/basic_regex_creator.hpp
View File

@ -17,8 +17,8 @@
* the data members of a regex_data object. * the data members of a regex_data object.
*/ */
#ifndef BOOST_REGEX_V4_BASIC_REGEX_CREATOR_HPP #ifndef BOOST_REGEX_V5_BASIC_REGEX_CREATOR_HPP
#define BOOST_REGEX_V4_BASIC_REGEX_CREATOR_HPP #define BOOST_REGEX_V5_BASIC_REGEX_CREATOR_HPP
#include <boost/regex/v5/indexed_bit_flag.hpp> #include <boost/regex/v5/indexed_bit_flag.hpp>

4
include/boost/regex/v5/basic_regex_parser.hpp
View File

@ -16,8 +16,8 @@
* DESCRIPTION: Declares template class basic_regex_parser. * DESCRIPTION: Declares template class basic_regex_parser.
*/ */
#ifndef BOOST_REGEX_V4_BASIC_REGEX_PARSER_HPP #ifndef BOOST_REGEX_V5_BASIC_REGEX_PARSER_HPP
#define BOOST_REGEX_V4_BASIC_REGEX_PARSER_HPP #define BOOST_REGEX_V5_BASIC_REGEX_PARSER_HPP
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(push) #pragma warning(push)

4
include/boost/regex/v5/char_regex_traits.hpp
View File

@ -17,8 +17,8 @@
*/ */
#ifndef BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP #ifndef BOOST_REGEX_V5_CHAR_REGEX_TRAITS_HPP
#define BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP #define BOOST_REGEX_V5_CHAR_REGEX_TRAITS_HPP
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(push) #pragma warning(push)

4
include/boost/regex/v5/indexed_bit_flag.hpp
View File

@ -19,8 +19,8 @@
#include <boost/regex/config.hpp> #include <boost/regex/config.hpp>
#include <set> #include <set>
#ifndef BOOST_REGEX_V4_INDEXED_BIT_FLAG_HPP #ifndef BOOST_REGEX_V5_INDEXED_BIT_FLAG_HPP
#define BOOST_REGEX_V4_INDEXED_BIT_FLAG_HPP #define BOOST_REGEX_V5_INDEXED_BIT_FLAG_HPP
namespace boost{ namespace boost{
namespace BOOST_REGEX_DETAIL_NS{ namespace BOOST_REGEX_DETAIL_NS{

4
include/boost/regex/v5/iterator_traits.hpp
View File

@ -16,8 +16,8 @@
* DESCRIPTION: Declares iterator traits workarounds. * DESCRIPTION: Declares iterator traits workarounds.
*/ */
#ifndef BOOST_REGEX_V4_ITERATOR_TRAITS_HPP #ifndef BOOST_REGEX_V5_ITERATOR_TRAITS_HPP
#define BOOST_REGEX_V4_ITERATOR_TRAITS_HPP #define BOOST_REGEX_V5_ITERATOR_TRAITS_HPP
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(push) #pragma warning(push)

4
include/boost/regex/v5/match_flags.hpp
View File

@ -16,8 +16,8 @@
* DESCRIPTION: Declares match_flags type. * DESCRIPTION: Declares match_flags type.
*/ */
#ifndef BOOST_REGEX_V4_MATCH_FLAGS #ifndef BOOST_REGEX_V5_MATCH_FLAGS
#define BOOST_REGEX_V4_MATCH_FLAGS #define BOOST_REGEX_V5_MATCH_FLAGS
#ifdef __cplusplus #ifdef __cplusplus
# include <boost/cstdint.hpp> # include <boost/cstdint.hpp>

4
include/boost/regex/v5/match_results.hpp
View File

@ -16,8 +16,8 @@
* DESCRIPTION: Declares template class match_results. * DESCRIPTION: Declares template class match_results.
*/ */
#ifndef BOOST_REGEX_V4_MATCH_RESULTS_HPP #ifndef BOOST_REGEX_V5_MATCH_RESULTS_HPP
#define BOOST_REGEX_V4_MATCH_RESULTS_HPP #define BOOST_REGEX_V5_MATCH_RESULTS_HPP
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(push) #pragma warning(push)

4
include/boost/regex/v5/mem_block_cache.hpp
View File

@ -15,8 +15,8 @@
* DESCRIPTION: memory block cache used by the non-recursive matcher. * DESCRIPTION: memory block cache used by the non-recursive matcher.
*/ */
#ifndef BOOST_REGEX_V4_MEM_BLOCK_CACHE_HPP #ifndef BOOST_REGEX_V5_MEM_BLOCK_CACHE_HPP
#define BOOST_REGEX_V4_MEM_BLOCK_CACHE_HPP #define BOOST_REGEX_V5_MEM_BLOCK_CACHE_HPP
#include <new> #include <new>
#ifdef BOOST_HAS_THREADS #ifdef BOOST_HAS_THREADS

4
include/boost/regex/v5/perl_matcher_common.hpp
View File

@ -17,8 +17,8 @@
* common to both the recursive and non-recursive versions. * common to both the recursive and non-recursive versions.
*/ */
#ifndef BOOST_REGEX_V4_PERL_MATCHER_COMMON_HPP #ifndef BOOST_REGEX_V5_PERL_MATCHER_COMMON_HPP
#define BOOST_REGEX_V4_PERL_MATCHER_COMMON_HPP #define BOOST_REGEX_V5_PERL_MATCHER_COMMON_HPP
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(push) #pragma warning(push)

4
include/boost/regex/v5/perl_matcher_non_recursive.hpp
View File

@ -17,8 +17,8 @@
* specific to the non-recursive implementation. * specific to the non-recursive implementation.
*/ */
#ifndef BOOST_REGEX_V4_PERL_MATCHER_NON_RECURSIVE_HPP #ifndef BOOST_REGEX_V5_PERL_MATCHER_NON_RECURSIVE_HPP
#define BOOST_REGEX_V4_PERL_MATCHER_NON_RECURSIVE_HPP #define BOOST_REGEX_V5_PERL_MATCHER_NON_RECURSIVE_HPP
#include <boost/regex/v5/mem_block_cache.hpp> #include <boost/regex/v5/mem_block_cache.hpp>

4
include/boost/regex/v5/regbase.hpp
View File

@ -16,8 +16,8 @@
* DESCRIPTION: Declares class regbase. * DESCRIPTION: Declares class regbase.
*/ */
#ifndef BOOST_REGEX_V4_REGBASE_HPP #ifndef BOOST_REGEX_V5_REGBASE_HPP
#define BOOST_REGEX_V4_REGBASE_HPP #define BOOST_REGEX_V5_REGBASE_HPP
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(push) #pragma warning(push)

28
include/boost/regex/v5/regex.hpp
View File

@ -41,7 +41,7 @@
#ifndef BOOST_REGEX_RAW_BUFFER_HPP #ifndef BOOST_REGEX_RAW_BUFFER_HPP
#include <boost/regex/v5/error_type.hpp> #include <boost/regex/v5/error_type.hpp>
#endif #endif
#ifndef BOOST_REGEX_V4_MATCH_FLAGS #ifndef BOOST_REGEX_V5_MATCH_FLAGS
#include <boost/regex/v5/match_flags.hpp> #include <boost/regex/v5/match_flags.hpp>
#endif #endif
#ifndef BOOST_REGEX_RAW_BUFFER_HPP #ifndef BOOST_REGEX_RAW_BUFFER_HPP
@ -51,34 +51,34 @@
#include <boost/regex/pattern_except.hpp> #include <boost/regex/pattern_except.hpp>
#endif #endif
#ifndef BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP #ifndef BOOST_REGEX_V5_CHAR_REGEX_TRAITS_HPP
#include <boost/regex/v5/char_regex_traits.hpp> #include <boost/regex/v5/char_regex_traits.hpp>
#endif #endif
#ifndef BOOST_REGEX_V4_STATES_HPP #ifndef BOOST_REGEX_V5_STATES_HPP
#include <boost/regex/v5/states.hpp> #include <boost/regex/v5/states.hpp>
#endif #endif
#ifndef BOOST_REGEX_V4_REGBASE_HPP #ifndef BOOST_REGEX_V5_REGBASE_HPP
#include <boost/regex/v5/regbase.hpp> #include <boost/regex/v5/regbase.hpp>
#endif #endif
#ifndef BOOST_REGEX_V4_ITERATOR_TRAITS_HPP #ifndef BOOST_REGEX_V5_ITERATOR_TRAITS_HPP
#include <boost/regex/v5/iterator_traits.hpp> #include <boost/regex/v5/iterator_traits.hpp>
#endif #endif
#ifndef BOOST_REGEX_V4_BASIC_REGEX_HPP #ifndef BOOST_REGEX_V5_BASIC_REGEX_HPP
#include <boost/regex/v5/basic_regex.hpp> #include <boost/regex/v5/basic_regex.hpp>
#endif #endif
#ifndef BOOST_REGEX_V4_BASIC_REGEX_CREATOR_HPP #ifndef BOOST_REGEX_V5_BASIC_REGEX_CREATOR_HPP
#include <boost/regex/v5/basic_regex_creator.hpp> #include <boost/regex/v5/basic_regex_creator.hpp>
#endif #endif
#ifndef BOOST_REGEX_V4_BASIC_REGEX_PARSER_HPP #ifndef BOOST_REGEX_V5_BASIC_REGEX_PARSER_HPP
#include <boost/regex/v5/basic_regex_parser.hpp> #include <boost/regex/v5/basic_regex_parser.hpp>
#endif #endif
#ifndef BOOST_REGEX_V4_SUB_MATCH_HPP #ifndef BOOST_REGEX_V5_SUB_MATCH_HPP
#include <boost/regex/v5/sub_match.hpp> #include <boost/regex/v5/sub_match.hpp>
#endif #endif
#ifndef BOOST_REGEX_FORMAT_HPP #ifndef BOOST_REGEX_FORMAT_HPP
#include <boost/regex/v5/regex_format.hpp> #include <boost/regex/v5/regex_format.hpp>
#endif #endif
#ifndef BOOST_REGEX_V4_MATCH_RESULTS_HPP #ifndef BOOST_REGEX_V5_MATCH_RESULTS_HPP
#include <boost/regex/v5/match_results.hpp> #include <boost/regex/v5/match_results.hpp>
#endif #endif
#ifndef BOOST_REGEX_MATCHER_HPP #ifndef BOOST_REGEX_MATCHER_HPP
@ -104,7 +104,7 @@ typedef match_results<std::wstring::const_iterator> wsmatch;
#ifndef BOOST_REGEX_MATCH_HPP #ifndef BOOST_REGEX_MATCH_HPP
#include <boost/regex/v5/regex_match.hpp> #include <boost/regex/v5/regex_match.hpp>
#endif #endif
#ifndef BOOST_REGEX_V4_REGEX_SEARCH_HPP #ifndef BOOST_REGEX_V5_REGEX_SEARCH_HPP
#include <boost/regex/v5/regex_search.hpp> #include <boost/regex/v5/regex_search.hpp>
#endif #endif
#ifndef BOOST_REGEX_ITERATOR_HPP #ifndef BOOST_REGEX_ITERATOR_HPP
@ -113,13 +113,13 @@ typedef match_results<std::wstring::const_iterator> wsmatch;
#ifndef BOOST_REGEX_TOKEN_ITERATOR_HPP #ifndef BOOST_REGEX_TOKEN_ITERATOR_HPP
#include <boost/regex/v5/regex_token_iterator.hpp> #include <boost/regex/v5/regex_token_iterator.hpp>
#endif #endif
#ifndef BOOST_REGEX_V4_REGEX_GREP_HPP #ifndef BOOST_REGEX_V5_REGEX_GREP_HPP
#include <boost/regex/v5/regex_grep.hpp> #include <boost/regex/v5/regex_grep.hpp>
#endif #endif
#ifndef BOOST_REGEX_V4_REGEX_REPLACE_HPP #ifndef BOOST_REGEX_V5_REGEX_REPLACE_HPP
#include <boost/regex/v5/regex_replace.hpp> #include <boost/regex/v5/regex_replace.hpp>
#endif #endif
#ifndef BOOST_REGEX_V4_REGEX_MERGE_HPP #ifndef BOOST_REGEX_V5_REGEX_MERGE_HPP
#include <boost/regex/v5/regex_merge.hpp> #include <boost/regex/v5/regex_merge.hpp>
#endif #endif
#ifndef BOOST_REGEX_SPLIT_HPP #ifndef BOOST_REGEX_SPLIT_HPP

6
include/boost/regex/v5/regex_grep.hpp
View File

@ -16,8 +16,8 @@
* DESCRIPTION: Provides regex_grep implementation. * DESCRIPTION: Provides regex_grep implementation.
*/ */
#ifndef BOOST_REGEX_V4_REGEX_GREP_HPP #ifndef BOOST_REGEX_V5_REGEX_GREP_HPP
#define BOOST_REGEX_V4_REGEX_GREP_HPP #define BOOST_REGEX_V5_REGEX_GREP_HPP
namespace boost{ namespace boost{
@ -151,5 +151,5 @@ inline unsigned int regex_grep(bool (*foo)(const match_results<std::basic_string
} // namespace boost } // namespace boost
#endif // BOOST_REGEX_V4_REGEX_GREP_HPP #endif // BOOST_REGEX_V5_REGEX_GREP_HPP

6
include/boost/regex/v5/regex_iterator.hpp
View File

@ -16,8 +16,8 @@
* DESCRIPTION: Provides regex_iterator implementation. * DESCRIPTION: Provides regex_iterator implementation.
*/ */
#ifndef BOOST_REGEX_V4_REGEX_ITERATOR_HPP #ifndef BOOST_REGEX_V5_REGEX_ITERATOR_HPP
#define BOOST_REGEX_V4_REGEX_ITERATOR_HPP #define BOOST_REGEX_V5_REGEX_ITERATOR_HPP
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
@ -191,5 +191,5 @@ inline regex_iterator<typename std::basic_string<charT, ST, SA>::const_iterator,
} // namespace boost } // namespace boost
#endif // BOOST_REGEX_V4_REGEX_ITERATOR_HPP #endif // BOOST_REGEX_V5_REGEX_ITERATOR_HPP

6
include/boost/regex/v5/regex_merge.hpp
View File

@ -18,8 +18,8 @@
* by regex.hpp, do not include on its own. * by regex.hpp, do not include on its own.
*/ */
#ifndef BOOST_REGEX_V4_REGEX_MERGE_HPP #ifndef BOOST_REGEX_V5_REGEX_MERGE_HPP
#define BOOST_REGEX_V4_REGEX_MERGE_HPP #define BOOST_REGEX_V5_REGEX_MERGE_HPP
namespace boost{ namespace boost{
@ -88,6 +88,6 @@ inline std::basic_string<charT> regex_merge(const std::basic_string<charT>& s,
} // namespace boost } // namespace boost
#endif // BOOST_REGEX_V4_REGEX_MERGE_HPP #endif // BOOST_REGEX_V5_REGEX_MERGE_HPP

6
include/boost/regex/v5/regex_replace.hpp
View File

@ -18,8 +18,8 @@
* by regex.hpp, do not include on its own. * by regex.hpp, do not include on its own.
*/ */
#ifndef BOOST_REGEX_V4_REGEX_REPLACE_HPP #ifndef BOOST_REGEX_V5_REGEX_REPLACE_HPP
#define BOOST_REGEX_V4_REGEX_REPLACE_HPP #define BOOST_REGEX_V5_REGEX_REPLACE_HPP
namespace boost{ namespace boost{
@ -94,6 +94,6 @@ std::basic_string<charT> regex_replace(const std::basic_string<charT>& s,
} // namespace boost } // namespace boost
#endif // BOOST_REGEX_V4_REGEX_REPLACE_HPP #endif // BOOST_REGEX_V5_REGEX_REPLACE_HPP

6
include/boost/regex/v5/regex_search.hpp
View File

@ -16,8 +16,8 @@
* DESCRIPTION: Provides regex_search implementation. * DESCRIPTION: Provides regex_search implementation.
*/ */
#ifndef BOOST_REGEX_V4_REGEX_SEARCH_HPP #ifndef BOOST_REGEX_V5_REGEX_SEARCH_HPP
#define BOOST_REGEX_V4_REGEX_SEARCH_HPP #define BOOST_REGEX_V5_REGEX_SEARCH_HPP
namespace boost{ namespace boost{
@ -212,6 +212,6 @@ inline bool regex_search(const std::basic_string<wchar_t>& s,
} // namespace boost } // namespace boost
#endif // BOOST_REGEX_V4_REGEX_SEARCH_HPP #endif // BOOST_REGEX_V5_REGEX_SEARCH_HPP

6
include/boost/regex/v5/regex_token_iterator.hpp
View File

@ -16,8 +16,8 @@
* DESCRIPTION: Provides regex_token_iterator implementation. * DESCRIPTION: Provides regex_token_iterator implementation.
*/ */
#ifndef BOOST_REGEX_V4_REGEX_TOKEN_ITERATOR_HPP #ifndef BOOST_REGEX_V5_REGEX_TOKEN_ITERATOR_HPP
#define BOOST_REGEX_V4_REGEX_TOKEN_ITERATOR_HPP #define BOOST_REGEX_V5_REGEX_TOKEN_ITERATOR_HPP
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
@ -318,7 +318,7 @@ inline regex_token_iterator<typename std::basic_string<charT, ST, SA>::const_ite
} // namespace boost } // namespace boost
#endif // BOOST_REGEX_V4_REGEX_TOKEN_ITERATOR_HPP #endif // BOOST_REGEX_V5_REGEX_TOKEN_ITERATOR_HPP

4
include/boost/regex/v5/states.hpp
View File

@ -16,8 +16,8 @@
* DESCRIPTION: Declares internal state machine structures. * DESCRIPTION: Declares internal state machine structures.
*/ */
#ifndef BOOST_REGEX_V4_STATES_HPP #ifndef BOOST_REGEX_V5_STATES_HPP
#define BOOST_REGEX_V4_STATES_HPP #define BOOST_REGEX_V5_STATES_HPP
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(push) #pragma warning(push)

4
include/boost/regex/v5/sub_match.hpp
View File

@ -16,8 +16,8 @@
* DESCRIPTION: Declares template class sub_match. * DESCRIPTION: Declares template class sub_match.
*/ */
#ifndef BOOST_REGEX_V4_SUB_MATCH_HPP #ifndef BOOST_REGEX_V5_SUB_MATCH_HPP
#define BOOST_REGEX_V4_SUB_MATCH_HPP #define BOOST_REGEX_V5_SUB_MATCH_HPP
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(push) #pragma warning(push)

6
include/boost/regex/v5/u32regex_iterator.hpp
View File

@ -16,8 +16,8 @@
* DESCRIPTION: Provides u32regex_iterator implementation. * DESCRIPTION: Provides u32regex_iterator implementation.
*/ */
#ifndef BOOST_REGEX_V4_U32REGEX_ITERATOR_HPP #ifndef BOOST_REGEX_V5_U32REGEX_ITERATOR_HPP
#define BOOST_REGEX_V4_U32REGEX_ITERATOR_HPP #define BOOST_REGEX_V5_U32REGEX_ITERATOR_HPP
namespace boost{ namespace boost{
@ -181,5 +181,5 @@ inline u32regex_iterator<const UChar*> make_u32regex_iterator(const U_NAMESPACE_
} // namespace boost } // namespace boost
#endif // BOOST_REGEX_V4_REGEX_ITERATOR_HPP #endif // BOOST_REGEX_V5_REGEX_ITERATOR_HPP

6
include/boost/regex/v5/u32regex_token_iterator.hpp
View File

@ -16,8 +16,8 @@
* DESCRIPTION: Provides u32regex_token_iterator implementation. * DESCRIPTION: Provides u32regex_token_iterator implementation.
*/ */
#ifndef BOOST_REGEX_V4_U32REGEX_TOKEN_ITERATOR_HPP #ifndef BOOST_REGEX_V5_U32REGEX_TOKEN_ITERATOR_HPP
#define BOOST_REGEX_V4_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)))\ #if (BOOST_WORKAROUND(BOOST_BORLANDC, >= 0x560) && BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x570)))\
|| BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
@ -353,7 +353,7 @@ inline u32regex_token_iterator<const UChar*> make_u32regex_token_iterator(const
} // namespace boost } // namespace boost
#endif // BOOST_REGEX_V4_REGEX_TOKEN_ITERATOR_HPP #endif // BOOST_REGEX_V5_REGEX_TOKEN_ITERATOR_HPP