[Boost-commit] svn:boost r49111 - trunk/boost/spirit/home/phoenix/core/detail

Subject: [Boost-commit] svn:boost r49111 - trunk/boost/spirit/home/phoenix/core/detail
From: joel_at_[hidden]
Date: 2008-10-02 11:44:37

Author: djowel
Date: 2008-10-02 11:44:37 EDT (Thu, 02 Oct 2008)
New Revision: 49111
URL: http://svn.boost.org/trac/boost/changeset/49111

Log:
fix for vc7.1 when boost.function is included
Text files modified: 
   trunk/boost/spirit/home/phoenix/core/detail/function_eval.hpp |     8 ++++----                                
   1 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/boost/spirit/home/phoenix/core/detail/function_eval.hpp
==============================================================================
--- trunk/boost/spirit/home/phoenix/core/detail/function_eval.hpp	(original)
+++ trunk/boost/spirit/home/phoenix/core/detail/function_eval.hpp	2008-10-02 11:44:37 EDT (Thu, 02 Oct 2008)
@@ -32,8 +32,8 @@
         template <typename Env, typename F>
         struct result
         {
-            typedef typename F::template result<Env>::type function;
-            typedef typename function::result_type type;
+            typedef typename F::template result<Env>::type fn;
+            typedef typename fn::result_type type;
         };
 
         template <typename RT, typename Env, typename F>
@@ -96,7 +96,7 @@
           , BOOST_PP_ENUM_PARAMS(N, typename A)>
         struct result
         {
-            typedef typename F::template result<Env>::type function;
+            typedef typename F::template result<Env>::type fn;
             BOOST_PP_REPEAT(N, PHOENIX_GET_ARG, _)
 
             typedef BOOST_PP_CAT(mpl::vector, N)
@@ -104,7 +104,7 @@
             args;
 
             typedef typename
-                function::template result<BOOST_PP_ENUM_PARAMS(N, a)>
+                fn::template result<BOOST_PP_ENUM_PARAMS(N, a)>
             function_apply;
 
             typedef typename