Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r63075 - in sandbox/SOC/2010/phoenix3/libs/phoenix/test: . statement
From: joel_at_[hidden]
Date: 2010-06-17 21:13:16


Author: djowel
Date: 2010-06-17 21:13:15 EDT (Thu, 17 Jun 2010)
New Revision: 63075
URL: http://svn.boost.org/trac/boost/changeset/63075

Log:
minor tweaks
Text files modified:
   sandbox/SOC/2010/phoenix3/libs/phoenix/test/Jamfile | 5 -----
   sandbox/SOC/2010/phoenix3/libs/phoenix/test/statement/if_tests.cpp | 24 ++++++++++++------------
   2 files changed, 12 insertions(+), 17 deletions(-)

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/test/Jamfile
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/test/Jamfile (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/test/Jamfile 2010-06-17 21:13:15 EDT (Thu, 17 Jun 2010)
@@ -9,11 +9,6 @@
 # bring in rules for testing
 import testing ;
 
-project
- : requirements
- <include>../../..
- ;
-
 local multi-threading = <library>/boost/thread//boost/thread
                         <threading>multi <define>BOOST_ALL_NO_LIB=1 ;
 

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/test/statement/if_tests.cpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/test/statement/if_tests.cpp (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/test/statement/if_tests.cpp 2010-06-17 21:13:15 EDT (Thu, 17 Jun 2010)
@@ -12,28 +12,28 @@
 #include <boost/phoenix/operator.hpp>
 #include <boost/phoenix/core.hpp>
 
-using namespace boost::phoenix;
-using namespace boost::phoenix::arg_names;
-using namespace std;
-
 int
 main()
 {
+ using boost::phoenix::arg_names::arg1;
+ using boost::phoenix::if_;
+ using boost::phoenix::ref;
+
     int init[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
- vector<int> v(init, init+10);
+ std::vector<int> v(init, init+10);
 
- cout << dec;
+ std::cout << std::dec;
     int x = 0;
 
     for_each(v.begin(), v.end(),
         if_(arg1 > 3 && arg1 <= 8)
         [
- cout << arg1 << ", ",
+ std::cout << arg1 << ", ",
             ref(x) += arg1
         ]
     );
 
- cout << endl;
+ std::cout << std::endl;
     BOOST_TEST(x == 4+5+6+7+8);
 
     x = 0;
@@ -43,25 +43,25 @@
     for_each(v.begin(), v.end(),
         if_(arg1 > 5)
         [
- cout << arg1 << " > 5\n",
+ std::cout << arg1 << " > 5\n",
             ref(x) += arg1
         ]
         .else_
         [
             if_(arg1 == 5)
             [
- cout << arg1 << " == 5\n",
+ std::cout << arg1 << " == 5\n",
                 ref(z) += arg1
             ]
             .else_
             [
- cout << arg1 << " < 5\n",
+ std::cout << arg1 << " < 5\n",
                 ref(y) += arg1
             ]
         ]
     );
 
- cout << endl;
+ std::cout << std::endl;
     BOOST_TEST(x == 6+7+8+9+10);
     BOOST_TEST(y == 1+2+3+4);
     BOOST_TEST(z == 5);


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk