Update of /cvsroot/boost/boost/boost/xpressive/detail/core/matcher
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11421/detail/core/matcher
Modified Files:
action_matcher.hpp end_matcher.hpp
Log Message:
changes required by gcc-4.3 and ConceptGCC
Index: action_matcher.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/xpressive/detail/core/matcher/action_matcher.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- action_matcher.hpp 17 Apr 2007 05:02:34 -0000 1.18
+++ action_matcher.hpp 28 Apr 2007 01:42:16 -0000 1.19
@@ -69,12 +69,12 @@
typedef typename action_arg<Type, Int>::reference result_type;
result_type operator()(Expr &expr, action_context const &ctx) const
{
- action_args_type::const_iterator where =
ctx.args().find(&typeid(proto::arg(expr)));
- if(where == ctx.args().end())
+ action_args_type::const_iterator where_ =
ctx.args().find(&typeid(proto::arg(expr)));
+ if(where_ == ctx.args().end())
{
throw regex_error(regex_constants::error_badarg, "An
argument to an action was unspecified");
}
- return proto::arg(expr).cast(where->second);
+ return proto::arg(expr).cast(where_->second);
}
};
Index: end_matcher.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/xpressive/detail/core/matcher/end_matcher.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- end_matcher.hpp 17 Apr 2007 05:02:35 -0000 1.5
+++ end_matcher.hpp 28 Apr 2007 01:42:16 -0000 1.6
@@ -53,8 +53,8 @@
return true;
}
- else if(state.flags_.match_all_ && !state.eos() ||
- state.flags_.match_not_null_ && state.cur_ == s0.begin_)
+ else if((state.flags_.match_all_ && !state.eos()) ||
+ (state.flags_.match_not_null_ && state.cur_ == s0.begin_))
{
return false;
}
-------------------------------------------------------------------------
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
