boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-23 00:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Regex: Remove use of obsolete macro for template types and args.

Browse Source 
[SVN r85914]
This commit is contained in:
Stephen Kelly
2013-09-25 21:13:11 +00:00
parent 9fccd1ca89
commit 7158ab5734
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
include/boost/regex/mfc.hpp
View File

@ -38,9 +38,9 @@ typedef regex_token_iterator<TCHAR const*> tregex_token_iterator;
// //
// define regex creation functions: // define regex creation functions:
// //
template <SIMPLE_STRING_PARAM> template <class B, bool b>
inline basic_regex<B> inline basic_regex<B>
make_regex(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, ::boost::regex_constants::syntax_option_type f = boost::regex_constants::normal) make_regex(const ATL::CSimpleStringT<B, b>& s, ::boost::regex_constants::syntax_option_type f = boost::regex_constants::normal)
{ {
basic_regex<B> result(s.GetString(), s.GetString() + s.GetLength(), f); basic_regex<B> result(s.GetString(), s.GetString() + s.GetLength(), f);
return result; return result;
@ -48,8 +48,8 @@ make_regex(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, ::boost::regex_
// //
// regex_match overloads: // regex_match overloads:
// //
template <SIMPLE_STRING_PARAM, class A, class T> template <class B, bool b, class A, class T>
inline bool regex_match(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, inline bool regex_match(const ATL::CSimpleStringT<B, b>& s,
match_results<const B*, A>& what, match_results<const B*, A>& what,
const basic_regex<B, T>& e, const basic_regex<B, T>& e,
boost::regex_constants::match_flag_type f = boost::regex_constants::match_default) boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
@ -61,8 +61,8 @@ inline bool regex_match(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
f); f);
} }
template <SIMPLE_STRING_PARAM, class T> template <class B, bool b, class T>
inline bool regex_match(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, inline bool regex_match(const ATL::CSimpleStringT<B, b>& s,
const basic_regex<B, T>& e, const basic_regex<B, T>& e,
boost::regex_constants::match_flag_type f = boost::regex_constants::match_default) boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
{ {
@ -74,8 +74,8 @@ inline bool regex_match(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
// //
// regex_search overloads: // regex_search overloads:
// //
template <SIMPLE_STRING_PARAM, class A, class T> template <class B, bool b, class A, class T>
inline bool regex_search(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, inline bool regex_search(const ATL::CSimpleStringT<B, b>& s,
match_results<const B*, A>& what, match_results<const B*, A>& what,
const basic_regex<B, T>& e, const basic_regex<B, T>& e,
boost::regex_constants::match_flag_type f = boost::regex_constants::match_default) boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
@ -87,8 +87,8 @@ inline bool regex_search(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
f); f);
} }
template <SIMPLE_STRING_PARAM, class T> template <class B, bool b, class T>
inline bool regex_search(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, inline bool regex_search(const ATL::CSimpleStringT<B, b>& s,
const basic_regex<B, T>& e, const basic_regex<B, T>& e,
boost::regex_constants::match_flag_type f = boost::regex_constants::match_default) boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
{ {
@ -100,45 +100,45 @@ inline bool regex_search(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
// //
// regex_iterator creation: // regex_iterator creation:
// //
template <SIMPLE_STRING_PARAM> template <class B, bool b>
inline regex_iterator<B const*> inline regex_iterator<B const*>
make_regex_iterator(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, const basic_regex<B>& e, ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default) make_regex_iterator(const ATL::CSimpleStringT<B, b>& s, const basic_regex<B>& e, ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
{ {
regex_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, f); regex_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, f);
return result; return result;
} }
template <SIMPLE_STRING_PARAM> template <class B, bool b>
inline regex_token_iterator<B const*> inline regex_token_iterator<B const*>
make_regex_token_iterator(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, const basic_regex<B>& e, int sub = 0, ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default) make_regex_token_iterator(const ATL::CSimpleStringT<B, b>& s, const basic_regex<B>& e, int sub = 0, ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
{ {
regex_token_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, sub, f); regex_token_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, sub, f);
return result; return result;
} }
template <SIMPLE_STRING_PARAM> template <class B, bool b>
inline regex_token_iterator<B const*> inline regex_token_iterator<B const*>
make_regex_token_iterator(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, const basic_regex<B>& e, const std::vector<int>& subs, ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default) make_regex_token_iterator(const ATL::CSimpleStringT<B, b>& s, const basic_regex<B>& e, const std::vector<int>& subs, ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
{ {
regex_token_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, subs, f); regex_token_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, subs, f);
return result; return result;
} }
template <SIMPLE_STRING_PARAM, std::size_t N> template <class B, bool b, std::size_t N>
inline regex_token_iterator<B const*> inline regex_token_iterator<B const*>
make_regex_token_iterator(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, const basic_regex<B>& e, const int (& subs)[N], ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default) make_regex_token_iterator(const ATL::CSimpleStringT<B, b>& s, const basic_regex<B>& e, const int (& subs)[N], ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
{ {
regex_token_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, subs, f); regex_token_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, subs, f);
return result; return result;
} }
template <class OutputIterator, class BidirectionalIterator, class traits, template <class OutputIterator, class BidirectionalIterator, class traits,
SIMPLE_STRING_PARAM> class B, bool b>
OutputIterator regex_replace(OutputIterator out, OutputIterator regex_replace(OutputIterator out,
BidirectionalIterator first, BidirectionalIterator first,
BidirectionalIterator last, BidirectionalIterator last,
const basic_regex<B, traits>& e, const basic_regex<B, traits>& e,
const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& fmt, const ATL::CSimpleStringT<B, b>& fmt,
match_flag_type flags = match_default) match_flag_type flags = match_default)
{ {
return ::boost::regex_replace(out, first, last, e, fmt.GetString(), flags); return ::boost::regex_replace(out, first, last, e, fmt.GetString(), flags);
@ -146,12 +146,12 @@ OutputIterator regex_replace(OutputIterator out,
namespace re_detail{ namespace re_detail{
template <SIMPLE_STRING_PARAM> template <class B, bool b>
class mfc_string_out_iterator class mfc_string_out_iterator
{ {
ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>* out; ATL::CSimpleStringT<B, b>* out;
public: public:
mfc_string_out_iterator(ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s) : out(&s) {} mfc_string_out_iterator(ATL::CSimpleStringT<B, b>& s) : out(&s) {}
mfc_string_out_iterator& operator++() { return *this; } mfc_string_out_iterator& operator++() { return *this; }
mfc_string_out_iterator& operator++(int) { return *this; } mfc_string_out_iterator& operator++(int) { return *this; }
mfc_string_out_iterator& operator*() { return *this; } mfc_string_out_iterator& operator*() { return *this; }
@ -169,14 +169,14 @@ public:
} }
template <class traits, SIMPLE_STRING_PARAM> template <class traits, class B, bool b>
ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST> regex_replace(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, ATL::CSimpleStringT<B, b> regex_replace(const ATL::CSimpleStringT<B, b>& s,
const basic_regex<B, traits>& e, const basic_regex<B, traits>& e,
const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& fmt, const ATL::CSimpleStringT<B, b>& fmt,
match_flag_type flags = match_default) match_flag_type flags = match_default)
{ {
ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST> result(s.GetManager()); ATL::CSimpleStringT<B, b> result(s.GetManager());
re_detail::mfc_string_out_iterator<SIMPLE_STRING_ARG_LIST> i(result); re_detail::mfc_string_out_iterator<B, b> i(result);
regex_replace(i, s.GetString(), s.GetString() + s.GetLength(), e, fmt.GetString(), flags); regex_replace(i, s.GetString(), s.GetString() + s.GetLength(), e, fmt.GetString(), flags);
return result; return result;
} }