forked from boostorg/regex
Updated iterator defs.
[SVN r22387]
This commit is contained in:
@ -76,6 +76,14 @@ template <class BidirectionalIterator,
|
|||||||
class traits = regex_traits<charT>,
|
class traits = regex_traits<charT>,
|
||||||
class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
|
class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
|
||||||
class regex_iterator
|
class regex_iterator
|
||||||
|
#ifndef BOOST_NO_STD_ITERATOR
|
||||||
|
: public std::iterator<
|
||||||
|
std::forward_iterator_tag,
|
||||||
|
match_results<BidirectionalIterator>,
|
||||||
|
typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type,
|
||||||
|
const match_results<BidirectionalIterator>*,
|
||||||
|
const match_results<BidirectionalIterator>& >
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
typedef regex_iterator_implementation<BidirectionalIterator, charT, traits, Allocator> impl;
|
typedef regex_iterator_implementation<BidirectionalIterator, charT, traits, Allocator> impl;
|
||||||
|
@ -163,6 +163,14 @@ template <class BidirectionalIterator,
|
|||||||
class traits = regex_traits<charT>,
|
class traits = regex_traits<charT>,
|
||||||
class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
|
class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
|
||||||
class regex_token_iterator
|
class regex_token_iterator
|
||||||
|
#ifndef BOOST_NO_STD_ITERATOR
|
||||||
|
: public std::iterator<
|
||||||
|
std::forward_iterator_tag,
|
||||||
|
sub_match<BidirectionalIterator>,
|
||||||
|
typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type,
|
||||||
|
const sub_match<BidirectionalIterator>*,
|
||||||
|
const sub_match<BidirectionalIterator>& >
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
typedef regex_token_iterator_implementation<BidirectionalIterator, charT, traits, Allocator> impl;
|
typedef regex_token_iterator_implementation<BidirectionalIterator, charT, traits, Allocator> impl;
|
||||||
|
Reference in New Issue
Block a user