[Boost-commit] svn:boost r41063 - trunk/boost/xpressive/detail/core/matcher

From: eric_at_[hidden]
Date: 2007-11-13 11:38:12

Author: eric_niebler
Date: 2007-11-13 11:38:11 EST (Tue, 13 Nov 2007)
New Revision: 41063
URL: http://svn.boost.org/trac/boost/changeset/41063

Log:
portability fix for Intel 8.1
Text files modified: 
   trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp    |     4 ++--                                    
   trunk/boost/xpressive/detail/core/matcher/predicate_matcher.hpp |     7 ++++---                                 
   2 files changed, 6 insertions(+), 5 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-11-13 11:38:11 EST (Tue, 13 Nov 2007)
@@ -146,7 +146,7 @@
         }
 
         // eval_terminal
-        template<typename Expr, typename Arg = typename proto::result_of::arg<Expr>::type>
+        template<typename Expr, typename Arg>
         struct eval_terminal
           : proto::default_eval<Expr, action_context const>
         {};
@@ -199,7 +199,7 @@
 
         template<typename Expr>
         struct eval<Expr, proto::tag::terminal>
-          : eval_terminal<Expr>
+          : eval_terminal<Expr, typename proto::result_of::arg<Expr>::type>
         {};
 
         // Evaluate attributes like a1|42

Modified: trunk/boost/xpressive/detail/core/matcher/predicate_matcher.hpp
==============================================================================
--- trunk/boost/xpressive/detail/core/matcher/predicate_matcher.hpp	(original)
+++ trunk/boost/xpressive/detail/core/matcher/predicate_matcher.hpp	2007-11-13 11:38:11 EST (Tue, 13 Nov 2007)
@@ -9,7 +9,8 @@
 #define BOOST_XPRESSIVE_DETAIL_CORE_MATCHER_PREDICATE_MATCHER_HPP_EAN_03_22_2007
 
 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if define
+d(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif
 
@@ -35,7 +36,7 @@
         {}
 
         // eval_terminal
-        template<typename Expr, typename Arg = typename proto::result_of::arg<Expr>::type>
+        template<typename Expr, typename Arg>
         struct eval_terminal
           : proto::default_eval<Expr, predicate_context const>
         {};
@@ -78,7 +79,7 @@
 
         template<typename Expr>
         struct eval<Expr, proto::tag::terminal>
-          : eval_terminal<Expr>
+          : eval_terminal<Expr, typename proto::result_of::arg<Expr>::type>
         {};
 
         #if BOOST_VERSION >= 103500