From: eric_at_[hidden]
Date: 2007-10-08 12:49:00
Author: eric_niebler
Date: 2007-10-08 12:49:00 EDT (Mon, 08 Oct 2007)
New Revision: 39790
URL: http://svn.boost.org/trac/boost/changeset/39790
Log:
work around msvc-7.1 bug
Text files modified:
trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp | 6 ++++--
trunk/boost/xpressive/detail/static/transforms/as_action.hpp | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
Modified: trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp
==============================================================================
--- trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp (original)
+++ trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp 2007-10-08 12:49:00 EDT (Mon, 08 Oct 2007)
@@ -175,8 +175,10 @@
Expr
>::type
>::type
- >::type::type
- result_type;
+ >::type
+ temp_type;
+
+ typedef typename temp_type::type result_type;
result_type operator ()(Expr const &expr, action_context const &ctx) const
{
Modified: trunk/boost/xpressive/detail/static/transforms/as_action.hpp
==============================================================================
--- trunk/boost/xpressive/detail/static/transforms/as_action.hpp (original)
+++ trunk/boost/xpressive/detail/static/transforms/as_action.hpp 2007-10-08 12:49:00 EDT (Mon, 08 Oct 2007)
@@ -187,7 +187,7 @@
call(Expr const &expr, State const &state, Visitor &visitor)
{
return typename apply<Expr, State, Visitor>::type(
- Expr::proto_arg0::proto_arg0::nbr_type::value
+ Expr::proto_arg0::proto_base_expr::proto_arg0::nbr_type::value
, proto::arg(proto::right(expr))
, visitor.traits()
);