Update of /cvsroot/boost/boost/boost/xpressive
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13047/boost/xpressive
Modified Files:
regex_token_iterator.hpp
Log Message:
regex_token_iterator's value_type is sub_match<>::string_type, not
basic_string<>, add regex_token_iterator test
Index: regex_token_iterator.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/regex_token_iterator.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- regex_token_iterator.hpp 18 Apr 2006 07:52:49 -0000 1.6
+++ regex_token_iterator.hpp 29 May 2007 03:06:10 -0000 1.7
@@ -31,7 +31,7 @@
struct regex_token_iterator_impl
: counted_base<regex_token_iterator_impl<BidiIter> >
{
- typedef typename iterator_value<BidiIter>::type char_type;
+ typedef typename sub_match<BidiIter>::string_type value_type;
regex_token_iterator_impl
(
@@ -75,7 +75,7 @@
else if(cur != this->iter_.state_.end_ && -1 == this->subs_[ 0 ])
{
this->n_ = -1;
- this->result_.assign(cur, this->iter_.state_.end_);
+ this->result_ = value_type(cur, this->iter_.state_.end_);
return true;
}
}
@@ -90,7 +90,7 @@
}
regex_iterator_impl<BidiIter> iter_;
- std::basic_string<char_type> result_;
+ value_type result_;
int n_;
std::vector<int> subs_;
};
@@ -141,7 +141,7 @@
{
typedef basic_regex<BidiIter> regex_type;
typedef typename iterator_value<BidiIter>::type char_type;
- typedef std::basic_string<char_type> value_type;
+ typedef typename sub_match<BidiIter>::string_type value_type;
typedef typename iterator_difference<BidiIter>::type difference_type;
typedef value_type const *pointer;
typedef value_type const &reference;
-------------------------------------------------------------------------
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
