From 13dfa17e637d3e267905940f4ac209379eccf808 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Tue, 30 Sep 2003 11:40:47 +0000 Subject: [PATCH] Changed to make use of iterators and not strings where possible. [SVN r20229] --- include/boost/regex/v4/regex_token_iterator.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/regex/v4/regex_token_iterator.hpp b/include/boost/regex/v4/regex_token_iterator.hpp index b1d3a52f..c44797ee 100644 --- a/include/boost/regex/v4/regex_token_iterator.hpp +++ b/include/boost/regex/v4/regex_token_iterator.hpp @@ -132,7 +132,7 @@ public: if(N+1 < (int)subs.size()) { ++N; - result =((subs[N] == -1) ? value_type(what.prefix().str()) : value_type(what[subs[N]].str())); + result =((subs[N] == -1) ? value_type(what.prefix().first, what.prefix().second) : value_type(what[subs[N]].first, what[subs[N]].second)); return true; } if(what.prefix().first != what[0].second) @@ -141,7 +141,7 @@ public: if(regex_search(last_end, end, what, *pre, ((what[0].first == what[0].second) ? flags | regex_constants::match_not_initial_null : flags))) { N =0; - result =((subs[N] == -1) ? value_type(what.prefix().str()) : value_type(what[subs[N]].str())); + result =((subs[N] == -1) ? value_type(what.prefix().first, what.prefix().second) : value_type(what[subs[N]].first, what[subs[N]].second)); return true; } else if((last_end != end) && (subs[0] == -1))