[Boost-commit] svn:boost r67209 - in sandbox/SOC/2010/phoenix3: boost/phoenix/core libs/phoenix/test/scope

Subject: [Boost-commit] svn:boost r67209 - in sandbox/SOC/2010/phoenix3: boost/phoenix/core libs/phoenix/test/scope
From: thom.heller_at_[hidden]
Date: 2010-12-13 09:31:27

Author: theller
Date: 2010-12-13 09:31:24 EST (Mon, 13 Dec 2010)
New Revision: 67209
URL: http://svn.boost.org/trac/boost/changeset/67209

Log:
let completely working now
Text files modified: 
   sandbox/SOC/2010/phoenix3/boost/phoenix/core/is_nullary.hpp     |     4 ++--                                    
   sandbox/SOC/2010/phoenix3/libs/phoenix/test/scope/let_tests.cpp |     8 +++-----                                
   2 files changed, 5 insertions(+), 7 deletions(-)

Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/is_nullary.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/is_nullary.hpp	(original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/is_nullary.hpp	2010-12-13 09:31:24 EST (Mon, 13 Dec 2010)
@@ -43,8 +43,8 @@
 
                 template <typename Dummy>
                 struct is_nullary_::when<rule::custom_terminal, Dummy>
-            : //proto::lazy<is_nullary<custom_terminal<proto::_value> >(proto::_, _env)>
-            proto::make<mpl::true_()>
+            : proto::lazy<is_nullary<custom_terminal<proto::_value> >(proto::_, _env)>
+            //proto::make<mpl::true_()>
                 {};
 
                 template <typename Dummy>

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/test/scope/let_tests.cpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/test/scope/let_tests.cpp	(original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/test/scope/let_tests.cpp	2010-12-13 09:31:24 EST (Mon, 13 Dec 2010)
@@ -69,7 +69,7 @@
     using boost::phoenix::local_names::_y;
     using boost::phoenix::local_names::_z;
     using boost::phoenix::placeholders::arg1;
-
+    
     {
         int x = 1;
         BOOST_TEST(
@@ -136,7 +136,7 @@
 
     {
         int x = 999;
-    /*
+
         BOOST_TEST(
             let(_x = val(_1)) // _x holds x by value 
             [
@@ -146,13 +146,11 @@
         );
         
         BOOST_TEST(x == 999);
-    */
 
         BOOST_TEST(
             let(_x = val(_1)) // _x holds x by value 
             [
-                //val(_x += 888)
-                val(888 + 999)
+                val(_x += 888)
             ]
             (x) == x + 888
         );