[Boost-commit] svn:boost r68692 - in sandbox/SOC/2010/phoenix3/boost/phoenix: object scope

Subject: [Boost-commit] svn:boost r68692 - in sandbox/SOC/2010/phoenix3/boost/phoenix: object scope
From: thom.heller_at_[hidden]
Date: 2011-02-07 12:49:56

Author: theller
Date: 2011-02-07 12:49:52 EST (Mon, 07 Feb 2011)
New Revision: 68692
URL: http://svn.boost.org/trac/boost/changeset/68692

Log:
fixed testcases
Text files modified: 
   sandbox/SOC/2010/phoenix3/boost/phoenix/object/new.hpp    |     1 +                                       
   sandbox/SOC/2010/phoenix3/boost/phoenix/scope/dynamic.hpp |     6 +++---                                  
   2 files changed, 4 insertions(+), 3 deletions(-)

Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/object/new.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/object/new.hpp	(original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/object/new.hpp	2011-02-07 12:49:52 EST (Mon, 07 Feb 2011)
@@ -11,6 +11,7 @@
 #include <boost/phoenix/core/limits.hpp>
 #include <boost/phoenix/core/expression.hpp>
 #include <boost/phoenix/core/meta_grammar.hpp>
+#include <boost/phoenix/core/call.hpp>
 #include <boost/phoenix/object/detail/target.hpp>
 #include <boost/phoenix/support/iterate.hpp>
 #include <boost/preprocessor/repetition/repeat_from_to.hpp>

Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/scope/dynamic.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/scope/dynamic.hpp	(original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/scope/dynamic.hpp	2011-02-07 12:49:52 EST (Mon, 07 Feb 2011)
@@ -123,7 +123,7 @@
         {
             typedef
                 typename boost::remove_pointer<
-                    typename proto::detail::uncvref<Scope>::type
+                    typename proto::detail::uncvref<typename proto::result_of::value<Scope>::type>::type
                 >::type
                 scope_type;
             typedef 
@@ -133,7 +133,7 @@
             typedef
                 typename fusion::result_of::at_c<
                     tuple_type
-                  , proto::detail::uncvref<N>::type::value
+                  , proto::detail::uncvref<typename proto::result_of::value<N>::type>::type::value
                 >::type
                 type;
 
@@ -143,7 +143,7 @@
         typename result<dynamic_member_eval(Context, N, Scope)>::type
         operator()(Context const&, N, Scope s) const
         {
-            return fusion::at_c<N::value>(s->frame->data());
+            return fusion::at_c<proto::detail::uncvref<typename proto::result_of::value<N>::type>::type::value>(proto::value(s)->frame->data());
         }
     };