Update of /cvsroot/boost/boost/boost/xpressive
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16795
Modified Files:
regex_token_iterator.hpp
Log Message:
TR1 compatibility fix: regex_token_iterator::operator*() returns a sub_match
Index: regex_token_iterator.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/regex_token_iterator.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- regex_token_iterator.hpp 2 Jun 2007 01:49:18 -0000 1.9
+++ regex_token_iterator.hpp 2 Jun 2007 07:17:02 -0000 1.10
@@ -32,7 +32,7 @@
struct regex_token_iterator_impl
: counted_base<regex_token_iterator_impl<BidiIter> >
{
- typedef typename sub_match<BidiIter>::string_type value_type;
+ typedef sub_match<BidiIter> value_type;
regex_token_iterator_impl
(
@@ -62,13 +62,13 @@
if(0 != (++this->n_ %= (int)this->subs_.size()) ||
this->iter_.next())
{
this->result_ = (-1 == this->subs_[ this->n_ ])
- ? this->iter_.what_.prefix().str()
- : this->iter_.what_[ this->subs_[ this->n_ ] ].str();
+ ? this->iter_.what_.prefix()
+ : this->iter_.what_[ this->subs_[ this->n_ ] ];
return true;
}
else if(-1 == this->subs_[ this->n_-- ] && cur !=
this->iter_.state_.end_)
{
- this->result_ = value_type(cur, this->iter_.state_.end_);
+ this->result_ = value_type(cur, this->iter_.state_.end_, true);
return true;
}
}
@@ -133,8 +133,8 @@
{
typedef basic_regex<BidiIter> regex_type;
typedef typename iterator_value<BidiIter>::type char_type;
- typedef typename sub_match<BidiIter>::string_type value_type;
- typedef typename iterator_difference<BidiIter>::type difference_type;
+ typedef sub_match<BidiIter> value_type;
+ typedef std::ptrdiff_t difference_type;
typedef value_type const *pointer;
typedef value_type const &reference;
typedef std::forward_iterator_tag iterator_category;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
