[Boost-commit] svn:boost r70083 - in trunk: boost/phoenix/object boost/phoenix/stl/container libs libs/phoenix/test/container libs/phoenix/test/object libs/phoenix/test/scope

Subject: [Boost-commit] svn:boost r70083 - in trunk: boost/phoenix/object boost/phoenix/stl/container libs libs/phoenix/test/container libs/phoenix/test/object libs/phoenix/test/scope
From: thom.heller_at_[hidden]
Date: 2011-03-17 17:31:02

Author: theller
Date: 2011-03-17 17:31:00 EDT (Thu, 17 Mar 2011)
New Revision: 70083
URL: http://svn.boost.org/trac/boost/changeset/70083

Log:
[phoenix]

- Fixed some regressions
- added phoenix to maintainers.txt

Text files modified: 
   trunk/boost/phoenix/object/const_cast.hpp             |    12 ------------                            
   trunk/boost/phoenix/object/dynamic_cast.hpp           |    11 -----------                             
   trunk/boost/phoenix/object/reinterpret_cast.hpp       |    12 ------------                            
   trunk/boost/phoenix/object/static_cast.hpp            |    12 ------------                            
   trunk/boost/phoenix/stl/container/container.hpp       |     6 +++---                                  
   trunk/libs/maintainers.txt                            |     1 +                                       
   trunk/libs/phoenix/test/container/container_tests.hpp |    10 ++++------                              
   trunk/libs/phoenix/test/object/new_delete_tests.cpp   |     2 +-                                      
   trunk/libs/phoenix/test/scope/bug3289.cpp             |     5 +++--                                   
   9 files changed, 12 insertions(+), 59 deletions(-)

Modified: trunk/boost/phoenix/object/const_cast.hpp
==============================================================================
--- trunk/boost/phoenix/object/const_cast.hpp	(original)
+++ trunk/boost/phoenix/object/const_cast.hpp	2011-03-17 17:31:00 EDT (Thu, 17 Mar 2011)
@@ -60,18 +60,6 @@
                 const_cast_<detail::target<T>, U>::
                     make(detail::target<T>(), u);
     }
-    
-    template <typename T, typename U>
-    inline
-    typename expression::const_cast_<detail::target<T>, U>::type const
-    const_cast_(U & u)
-    {
-        return
-            expression::
-                const_cast_<detail::target<T>, U>::
-                    make(detail::target<T>(), u);
-    }
-
 }}
 
 #endif

Modified: trunk/boost/phoenix/object/dynamic_cast.hpp
==============================================================================
--- trunk/boost/phoenix/object/dynamic_cast.hpp	(original)
+++ trunk/boost/phoenix/object/dynamic_cast.hpp	2011-03-17 17:31:00 EDT (Thu, 17 Mar 2011)
@@ -60,17 +60,6 @@
                 dynamic_cast_<detail::target<T>, U>::
                     make(detail::target<T>(), u);
     }
-    
-    template <typename T, typename U>
-    inline
-    typename expression::dynamic_cast_<detail::target<T>, U>::type const
-    dynamic_cast_(U & u)
-    {
-        return
-            expression::
-                dynamic_cast_<detail::target<T>, U>::
-                    make(detail::target<T>(), u);
-    }
 }}
 
 #endif

Modified: trunk/boost/phoenix/object/reinterpret_cast.hpp
==============================================================================
--- trunk/boost/phoenix/object/reinterpret_cast.hpp	(original)
+++ trunk/boost/phoenix/object/reinterpret_cast.hpp	2011-03-17 17:31:00 EDT (Thu, 17 Mar 2011)
@@ -61,18 +61,6 @@
                 reinterpret_cast_<detail::target<T>, U>::
                     make(detail::target<T>(), u);
     }
-    
-    template <typename T, typename U>
-    inline
-    typename expression::reinterpret_cast_<detail::target<T>, U>::type const
-    reinterpret_cast_(U & u)
-    {
-        return
-            expression::
-                reinterpret_cast_<detail::target<T>, U>::
-                    make(detail::target<T>(), u);
-    }
-
 }}
 
 #endif

Modified: trunk/boost/phoenix/object/static_cast.hpp
==============================================================================
--- trunk/boost/phoenix/object/static_cast.hpp	(original)
+++ trunk/boost/phoenix/object/static_cast.hpp	2011-03-17 17:31:00 EDT (Thu, 17 Mar 2011)
@@ -59,18 +59,6 @@
                 static_cast_<detail::target<T>, U>::
                     make(detail::target<T>(), u);
     }
-    
-    template <typename T, typename U>
-    inline
-    typename expression::static_cast_<detail::target<T>, U>::type const
-    static_cast_(U & u)
-    {
-        return
-            expression::
-                static_cast_<detail::target<T>, U>::
-                    make(detail::target<T>(), u);
-    }
-
 }}
 
 #endif

Modified: trunk/boost/phoenix/stl/container/container.hpp
==============================================================================
--- trunk/boost/phoenix/stl/container/container.hpp	(original)
+++ trunk/boost/phoenix/stl/container/container.hpp	2011-03-17 17:31:00 EDT (Thu, 17 Mar 2011)
@@ -802,9 +802,9 @@
     //  The lazy functions themselves.
     //
     ///////////////////////////////////////////////////////////////////////////////
-    BOOST_PHOENIX_ADAPT_FUNCTION(assign, stl::assign, 2)
-    BOOST_PHOENIX_ADAPT_FUNCTION(assign, stl::assign, 3)
-    BOOST_PHOENIX_ADAPT_FUNCTION(assign, stl::assign, 4)
+    BOOST_PHOENIX_ADAPT_FUNCTION(assign, boost::phoenix::stl::assign, 2)
+    BOOST_PHOENIX_ADAPT_FUNCTION(assign, boost::phoenix::stl::assign, 3)
+    BOOST_PHOENIX_ADAPT_FUNCTION(assign, boost::phoenix::stl::assign, 4)
     BOOST_PHOENIX_ADAPT_FUNCTION(at, stl::at, 2)
     BOOST_PHOENIX_ADAPT_FUNCTION(back, stl::back, 1)
     BOOST_PHOENIX_ADAPT_FUNCTION(begin, stl::begin, 1)

Modified: trunk/libs/maintainers.txt
==============================================================================
--- trunk/libs/maintainers.txt	(original)
+++ trunk/libs/maintainers.txt	2011-03-17 17:31:00 EDT (Thu, 17 Mar 2011)
@@ -62,6 +62,7 @@
 optional              Fernando Cacciola <fernando_cacciola -at- ciudad.com.ar>
 operators             Daniel Frey <d.frey -at- gmx.de>
 parameter             David Abrahams <dave -at- boost-consulting.com>, Daniel Wallin <daniel -at- boostpro.com>
+phoenix               Joel de Guzman <joel -at- boost-consulting.com>, Thomas Heller <thom.heller -at- gmail.com>
 polygon               Lucanus Simonson <lucanus.j.simonson -at- intel.com>
 pool                  Stephen Cleary <scleary -at- jerviswebb.com>
 preprocessor          Paul Mensonides <pmenso57 -at- comcast.net>

Modified: trunk/libs/phoenix/test/container/container_tests.hpp
==============================================================================
--- trunk/libs/phoenix/test/container/container_tests.hpp	(original)
+++ trunk/libs/phoenix/test/container/container_tests.hpp	2011-03-17 17:31:00 EDT (Thu, 17 Mar 2011)
@@ -43,14 +43,13 @@
 void test_assign(Container c)
 {
     using phx::arg_names::arg1;
-    using phx::assign;
 
     typename Container::size_type count = 2;
     typename Container::const_iterator first = c.begin();
     typename Container::const_iterator second = first;
     typename Container::value_type value = *first;
 
-    assign(arg1, count, value)(c);
+    phx::assign(arg1, count, value)(c);
 
     // iterators may be invalidated!
     first = c.begin();
@@ -64,7 +63,7 @@
 #if defined(BOOST_PHOENIX_COMPILE_FAIL_TEST)
     // Should not --- does not, Yay! --- compile.
     Container const const_c = c;
-    assign(const_c, count, value);
+    phx::assign(const_c, count, value);
 #endif
 }
 
@@ -74,7 +73,6 @@
     using phx::arg_names::arg1;
     using phx::arg_names::arg2;
     using phx::arg_names::arg3;
-    using phx::assign;
 
     Container c2 = c;
     typename Container::const_iterator first = c2.begin();
@@ -82,7 +80,7 @@
     typename Container::size_type size = c2.size();
 
     c.clear();
-    assign(arg1, arg2, arg3)(c, first, last);
+    phx::assign(arg1, arg2, arg3)(c, first, last);
     if (test(c.size() != size)) {
         cerr << "Failed " << typeid(Container).name()
        << " test_assign2 1\n"
@@ -93,7 +91,7 @@
 #if defined(BOOST_PHOENIX_COMPILE_FAIL_TEST)
     // Should not --- does not, Yay! --- compile.
     Container const const_c = c;
-    assign(const_c, first, second);
+    phx::assign(const_c, first, second);
 #endif
 }
 

Modified: trunk/libs/phoenix/test/object/new_delete_tests.cpp
==============================================================================
--- trunk/libs/phoenix/test/object/new_delete_tests.cpp	(original)
+++ trunk/libs/phoenix/test/object/new_delete_tests.cpp	2011-03-17 17:31:00 EDT (Thu, 17 Mar 2011)
@@ -50,7 +50,7 @@
         using boost::shared_ptr;
         vector<shared_ptr<X> > v(10);
         for_each(v.begin(), v.end(),
-            arg1 = construct<shared_ptr<X> >(new_<X>())
+            arg1 = boost::phoenix::construct<shared_ptr<X> >(new_<X>())
         );
     }
 

Modified: trunk/libs/phoenix/test/scope/bug3289.cpp
==============================================================================
--- trunk/libs/phoenix/test/scope/bug3289.cpp	(original)
+++ trunk/libs/phoenix/test/scope/bug3289.cpp	2011-03-17 17:31:00 EDT (Thu, 17 Mar 2011)
@@ -14,6 +14,7 @@
 #include <boost/phoenix/scope.hpp>
 #include <boost/phoenix/stl.hpp>
 
+namespace phx = boost::phoenix;
 using namespace boost::phoenix;
 using namespace boost::phoenix::arg_names;
 using namespace boost::phoenix::local_names;
@@ -24,11 +25,11 @@
     std::vector<int> w(11,2);
     std::vector<int>::const_iterator it=w.begin();
 
-    boost::phoenix::generate(ref(u), lambda(_a=*ref(it)++)[_a*2])();
+    boost::phoenix::generate(phx::ref(u), lambda(_a=*phx::ref(it)++)[_a*2])();
 
     BOOST_TEST(std::accumulate(u.begin(), u.end(), 0) == 44);
 
-    BOOST_TEST(lambda(_a=*ref(it)++)[_a*2]()() == 4);
+    BOOST_TEST(lambda(_a=*phx::ref(it)++)[_a*2]()() == 4);
     
     return boost::report_errors();
 }