[prev in list] [next in list] [prev in thread] [next in thread] 

List:       boost-users
Subject:    Re: [Boost-users] Counting matches with Regex V4
From:       "John Maddock" <john () johnmaddock ! co ! uk>
Date:       2004-02-25 12:25:16
Message-ID: 025a01c3fb9c$12656250$e7810252 () fuji
[Download RAW message or body]

Here's the promised patch, will be in cvs shortly:

John,

$ cvs diff -u
johnmaddock@cvs.boost.sourceforge.net's password:
cvs diff: Diffing .
Index: regex_iterator.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/regex/v4/regex_iterator.hpp,v
retrieving revision 1.9
diff -u -r1.9 regex_iterator.hpp
--- regex_iterator.hpp  5 Dec 2003 13:00:58 -0000       1.9
+++ regex_iterator.hpp  25 Feb 2004 12:18:01 -0000
@@ -76,6 +76,14 @@
           class traits = regex_traits<charT>,
           class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) > 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:
    typedef regex_iterator_implementation<BidirectionalIterator, charT,
traits,
Allocator> impl;
Index: regex_token_iterator.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/regex/v4/regex_token_iterator.hpp,v
retrieving revision 1.20
diff -u -r1.20 regex_token_iterator.hpp
--- regex_token_iterator.hpp    21 Dec 2003 16:32:02 -0000      1.20
+++ regex_token_iterator.hpp    25 Feb 2004 12:18:01 -0000
@@ -163,6 +163,14 @@
           class traits = regex_traits<charT>,
           class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
 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:
    typedef regex_token_iterator_implementation<BidirectionalIterator,
charT, traits, Allocator> impl;

[prev in list] [next in list] [prev in thread] [next in thread]