[Boost-commit] svn:boost r63030 - sandbox/SOC/2010/phoenix3/boost/phoenix/core

Subject: [Boost-commit] svn:boost r63030 - sandbox/SOC/2010/phoenix3/boost/phoenix/core
From: joel_at_[hidden]
Date: 2010-06-16 21:35:12

Author: djowel
Date: 2010-06-16 21:35:10 EDT (Wed, 16 Jun 2010)
New Revision: 63030
URL: http://svn.boost.org/trac/boost/changeset/63030

Log:
minor tweaks
Text files modified: 
   sandbox/SOC/2010/phoenix3/boost/phoenix/core/actor.hpp |    20 +++++++++++++-------                    
   sandbox/SOC/2010/phoenix3/boost/phoenix/core/arity.hpp |     2 +-                                      
   2 files changed, 14 insertions(+), 8 deletions(-)

Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/actor.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/actor.hpp	(original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/actor.hpp	2010-06-16 21:35:10 EDT (Wed, 16 Jun 2010)
@@ -1,6 +1,7 @@
 /*=============================================================================
     Copyright (c) 2005-2010 Joel de Guzman
     Copyright (c) 2010 Eric Niebler
+    Copyright (c) 2010 Thomas Heller
 
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -11,7 +12,6 @@
 #ifndef PHOENIX_CORE_ACTOR_HPP
 #define PHOENIX_CORE_ACTOR_HPP
 
-#include <boost/fusion/container/vector/vector10.hpp>
 #include <boost/mpl/identity.hpp>
 #include <boost/mpl/eval_if.hpp>
 #include <boost/phoenix/core/arity.hpp>
@@ -35,8 +35,8 @@
 #include <boost/proto/extends.hpp>
 #include <boost/proto/debug.hpp>
 #include <boost/utility/result_of.hpp>
-
 #include <boost/mpl/void.hpp>
+
 namespace boost { namespace phoenix
 {
     template <typename Expr>
@@ -126,14 +126,20 @@
 #undef PHOENIX_ITERATE_OPERATOR
 
     };
-}
+}}
 
+namespace boost
+{
     // specialize boost::result_of to return the proper result type
-    template<typename Expr>
-    struct result_of<phoenix::actor<Expr>() >
-      : phoenix::result_of::actor<Expr>
+    template <typename Expr>
+    struct result_of<phoenix::actor<Expr>()>
+        : phoenix::result_of::actor<Expr>
+    {};
+    
+    template <typename Expr>
+    struct result_of<phoenix::actor<Expr> const()>
+        : result_of<phoenix::actor<Expr>()>
     {};
-
 }
 
 #endif

Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/arity.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/arity.hpp	(original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/arity.hpp	2010-06-16 21:35:10 EDT (Wed, 16 Jun 2010)
@@ -1,6 +1,6 @@
 /*==============================================================================
-    Copyright (c) 2005-2010 Joel de Guzman
     Copyright (c) 2010 Thomas Heller
+    Copyright (c) 2010 Eric Niebler
 
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)