Subject: [Boost-commit] svn:boost r85914 - trunk/boost/regex
From: steveire_at_[hidden]
Date: 2013-09-25 17:13:11
Author: skelly
Date: 2013-09-25 17:13:11 EDT (Wed, 25 Sep 2013)
New Revision: 85914
URL: http://svn.boost.org/trac/boost/changeset/85914
Log:
Regex: Remove use of obsolete macro for template types and args.
Text files modified:
trunk/boost/regex/mfc.hpp | 56 ++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 28 deletions(-)
Modified: trunk/boost/regex/mfc.hpp
==============================================================================
--- trunk/boost/regex/mfc.hpp Wed Sep 25 17:12:55 2013 (r85913)
+++ trunk/boost/regex/mfc.hpp 2013-09-25 17:13:11 EDT (Wed, 25 Sep 2013) (r85914)
@@ -38,9 +38,9 @@
//
// define regex creation functions:
//
-template <SIMPLE_STRING_PARAM>
+template <class B, bool 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);
return result;
@@ -48,8 +48,8 @@
//
// regex_match overloads:
//
-template <SIMPLE_STRING_PARAM, class A, class T>
-inline bool regex_match(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
+template <class B, bool b, class A, class T>
+inline bool regex_match(const ATL::CSimpleStringT<B, b>& s,
match_results<const B*, A>& what,
const basic_regex<B, T>& e,
boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
@@ -61,8 +61,8 @@
f);
}
-template <SIMPLE_STRING_PARAM, class T>
-inline bool regex_match(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
+template <class B, bool b, class T>
+inline bool regex_match(const ATL::CSimpleStringT<B, b>& s,
const basic_regex<B, T>& e,
boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
{
@@ -74,8 +74,8 @@
//
// regex_search overloads:
//
-template <SIMPLE_STRING_PARAM, class A, class T>
-inline bool regex_search(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
+template <class B, bool b, class A, class T>
+inline bool regex_search(const ATL::CSimpleStringT<B, b>& s,
match_results<const B*, A>& what,
const basic_regex<B, T>& e,
boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
@@ -87,8 +87,8 @@
f);
}
-template <SIMPLE_STRING_PARAM, class T>
-inline bool regex_search(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
+template <class B, bool b, class T>
+inline bool regex_search(const ATL::CSimpleStringT<B, b>& s,
const basic_regex<B, T>& e,
boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
{
@@ -100,45 +100,45 @@
//
// regex_iterator creation:
//
-template <SIMPLE_STRING_PARAM>
+template <class B, bool b>
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);
return result;
}
-template <SIMPLE_STRING_PARAM>
+template <class B, bool b>
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);
return result;
}
-template <SIMPLE_STRING_PARAM>
+template <class B, bool b>
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);
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*>
-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);
return result;
}
template <class OutputIterator, class BidirectionalIterator, class traits,
- SIMPLE_STRING_PARAM>
+ class B, bool b>
OutputIterator regex_replace(OutputIterator out,
BidirectionalIterator first,
BidirectionalIterator last,
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)
{
return ::boost::regex_replace(out, first, last, e, fmt.GetString(), flags);
@@ -146,12 +146,12 @@
namespace re_detail{
-template <SIMPLE_STRING_PARAM>
+template <class B, bool b>
class mfc_string_out_iterator
{
- ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>* out;
+ ATL::CSimpleStringT<B, b>* out;
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++(int) { return *this; }
mfc_string_out_iterator& operator*() { return *this; }
@@ -169,14 +169,14 @@
}
-template <class traits, SIMPLE_STRING_PARAM>
-ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST> regex_replace(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
+template <class traits, class B, bool b>
+ATL::CSimpleStringT<B, b> regex_replace(const ATL::CSimpleStringT<B, b>& s,
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)
{
- ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST> result(s.GetManager());
- re_detail::mfc_string_out_iterator<SIMPLE_STRING_ARG_LIST> i(result);
+ ATL::CSimpleStringT<B, b> result(s.GetManager());
+ re_detail::mfc_string_out_iterator<B, b> i(result);
regex_replace(i, s.GetString(), s.GetString() + s.GetLength(), e, fmt.GetString(), flags);
return result;
}