Update of /cvsroot/boost/boost/boost/xpressive
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11911
Modified Files:
match_results.hpp
Log Message:
clean-up, fix gcc-4.1 compile error
Index: match_results.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/match_results.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- match_results.hpp 18 Mar 2007 18:24:46 -0000 1.11
+++ match_results.hpp 18 Mar 2007 21:46:52 -0000 1.12
@@ -90,11 +90,6 @@
return this->out_;
}
- void set_transform(transform_op trans, transform_scope scope)
- {
- (scope == Next ? this->next_ : this->rest_) = trans;
- }
-
case_converting_iterator &operator ++()
{
++this->out_;
@@ -113,6 +108,12 @@
return *this;
}
+ friend bool set_transform(case_converting_iterator &iter, transform_op
trans, transform_scope scope)
+ {
+ (scope == Next ? iter.next_ : iter.rest_) = trans;
+ return true;
+ }
+
case_converting_iterator &operator =(Char const &ch)
{
switch(this->next_)
@@ -158,13 +159,6 @@
return false;
}
-template<typename Iterator, typename Char>
-inline bool set_transform(case_converting_iterator<Iterator, Char> &iter,
transform_op trans, transform_scope scope)
-{
- iter.set_transform(trans, scope);
- return true;
-}
-
///////////////////////////////////////////////////////////////////////////////
// noop_output_iterator
//
@@ -193,7 +187,6 @@
}
};
-
} // namespace detail
///////////////////////////////////////////////////////////////////////////////
@@ -886,35 +879,35 @@
break;
case BOOST_XPR_CHAR_(char_type, 'l'):
- if(!detail::set_transform(out, detail::Lower, detail::Next))
+ if(!set_transform(out, detail::Lower, detail::Next))
{
*out++ = BOOST_XPR_CHAR_(char_type, 'l');
}
break;
case BOOST_XPR_CHAR_(char_type, 'L'):
- if(!detail::set_transform(out, detail::Lower, detail::Rest))
+ if(!set_transform(out, detail::Lower, detail::Rest))
{
*out++ = BOOST_XPR_CHAR_(char_type, 'L');
}
break;
case BOOST_XPR_CHAR_(char_type, 'u'):
- if(!detail::set_transform(out, detail::Upper, detail::Next))
+ if(!set_transform(out, detail::Upper, detail::Next))
{
*out++ = BOOST_XPR_CHAR_(char_type, 'u');
}
break;
case BOOST_XPR_CHAR_(char_type, 'U'):
- if(!detail::set_transform(out, detail::Upper, detail::Rest))
+ if(!set_transform(out, detail::Upper, detail::Rest))
{
*out++ = BOOST_XPR_CHAR_(char_type, 'U');
}
break;
case BOOST_XPR_CHAR_(char_type, 'E'):
- if(!detail::set_transform(out, detail::None, detail::Rest))
+ if(!set_transform(out, detail::None, detail::Rest))
{
*out++ = BOOST_XPR_CHAR_(char_type, 'E');
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
