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

Fix code to use checked iterators.

Browse Source 
[SVN r74855]
This commit is contained in:
John Maddock
2011-10-09 17:37:05 +00:00
parent d08bfeff25
commit cc03c77deb
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/boost/regex/icu.hpp
View File

@ -251,7 +251,7 @@ inline u32regex do_make_u32regex(InputIterator i,
const boost::mpl::int_<1>*) const boost::mpl::int_<1>*)
{ {
typedef boost::u8_to_u32_iterator<InputIterator, UChar32> conv_type; typedef boost::u8_to_u32_iterator<InputIterator, UChar32> conv_type;
return u32regex(conv_type(i), conv_type(j), opt); return u32regex(conv_type(i, i, j), conv_type(j, i, j), opt);
} }
template <class InputIterator> template <class InputIterator>
@ -261,7 +261,7 @@ inline u32regex do_make_u32regex(InputIterator i,
const boost::mpl::int_<2>*) const boost::mpl::int_<2>*)
{ {
typedef boost::u16_to_u32_iterator<InputIterator, UChar32> conv_type; typedef boost::u16_to_u32_iterator<InputIterator, UChar32> conv_type;
return u32regex(conv_type(i), conv_type(j), opt); return u32regex(conv_type(i, i, j), conv_type(j, i, j), opt);
} }
template <class InputIterator> template <class InputIterator>
@ -282,7 +282,7 @@ inline u32regex do_make_u32regex(InputIterator i,
typedef boost::u8_to_u32_iterator<InputIterator, UChar32> conv_type; typedef boost::u8_to_u32_iterator<InputIterator, UChar32> conv_type;
typedef std::vector<UChar32> vector_type; typedef std::vector<UChar32> vector_type;
vector_type v; vector_type v;
conv_type a(i), b(j); conv_type a(i, i, j), b(j, i, j);
while(a != b) while(a != b)
{ {
v.push_back(*a); v.push_back(*a);
@ -302,7 +302,7 @@ inline u32regex do_make_u32regex(InputIterator i,
typedef boost::u16_to_u32_iterator<InputIterator, UChar32> conv_type; typedef boost::u16_to_u32_iterator<InputIterator, UChar32> conv_type;
typedef std::vector<UChar32> vector_type; typedef std::vector<UChar32> vector_type;
vector_type v; vector_type v;
conv_type a(i), b(j); conv_type a(i, i, j), b(j, i, j);
while(a != b) while(a != b)
{ {
v.push_back(*a); v.push_back(*a);
@ -425,7 +425,7 @@ bool do_regex_match(BidiIterator first, BidiIterator last,
typedef match_results<conv_type> match_type; typedef match_results<conv_type> match_type;
typedef typename match_type::allocator_type alloc_type; typedef typename match_type::allocator_type alloc_type;
match_type what; match_type what;
bool result = ::boost::regex_match(conv_type(first), conv_type(last), what, e, flags); bool result = ::boost::regex_match(conv_type(first, first, last), conv_type(last, first, last), what, e, flags);
// copy results across to m: // copy results across to m:
if(result) copy_results(m, what); if(result) copy_results(m, what);
return result; return result;
@ -441,7 +441,7 @@ bool do_regex_match(BidiIterator first, BidiIterator last,
typedef match_results<conv_type> match_type; typedef match_results<conv_type> match_type;
typedef typename match_type::allocator_type alloc_type; typedef typename match_type::allocator_type alloc_type;
match_type what; match_type what;
bool result = ::boost::regex_match(conv_type(first), conv_type(last), what, e, flags); bool result = ::boost::regex_match(conv_type(first, first, last), conv_type(last, first, last), what, e, flags);
// copy results across to m: // copy results across to m:
if(result) copy_results(m, what); if(result) copy_results(m, what);
return result; return result;
@ -600,7 +600,7 @@ bool do_regex_search(BidiIterator first, BidiIterator last,
typedef match_results<conv_type> match_type; typedef match_results<conv_type> match_type;
typedef typename match_type::allocator_type alloc_type; typedef typename match_type::allocator_type alloc_type;
match_type what; match_type what;
bool result = ::boost::regex_search(conv_type(first), conv_type(last), what, e, flags, conv_type(base)); bool result = ::boost::regex_search(conv_type(first, first, last), conv_type(last, first, last), what, e, flags, conv_type(base));
// copy results across to m: // copy results across to m:
if(result) copy_results(m, what); if(result) copy_results(m, what);
return result; return result;
@ -617,7 +617,7 @@ bool do_regex_search(BidiIterator first, BidiIterator last,
typedef match_results<conv_type> match_type; typedef match_results<conv_type> match_type;
typedef typename match_type::allocator_type alloc_type; typedef typename match_type::allocator_type alloc_type;
match_type what; match_type what;
bool result = ::boost::regex_search(conv_type(first), conv_type(last), what, e, flags, conv_type(base)); bool result = ::boost::regex_search(conv_type(first, first, last), conv_type(last, first, last), what, e, flags, conv_type(base));
// copy results across to m: // copy results across to m:
if(result) copy_results(m, what); if(result) copy_results(m, what);
return result; return result;