[Boost-commit] svn:boost r68354 - in sandbox/assign_v2: boost/assign/v2/ref boost/assign/v2/ref/array boost/assign/v2/ref/wrapper boost/assign/v2/utility/chain boost/assign/v2/utility/convert libs/assign/v2/speed

Subject: [Boost-commit] svn:boost r68354 - in sandbox/assign_v2: boost/assign/v2/ref boost/assign/v2/ref/array boost/assign/v2/ref/wrapper boost/assign/v2/utility/chain boost/assign/v2/utility/convert libs/assign/v2/speed
From: erwann.rogard_at_[hidden]
Date: 2011-01-21 13:11:04

Author: e_r
Date: 2011-01-21 13:11:02 EST (Fri, 21 Jan 2011)
New Revision: 68354
URL: http://svn.boost.org/trac/boost/changeset/68354

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/ref/array/interface.hpp       |     4                                         
   sandbox/assign_v2/boost/assign/v2/ref/wrapper.hpp               |     1                                         
   sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp          |     2                                         
   sandbox/assign_v2/boost/assign/v2/ref/wrapper/get.hpp           |    86 ----------------------------------------
   sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp       |     2                                         
   sandbox/assign_v2/boost/assign/v2/utility/convert/converter.hpp |     2                                         
   sandbox/assign_v2/boost/assign/v2/utility/convert/dispatch.hpp  |    10 ----                                    
   sandbox/assign_v2/libs/assign/v2/speed/tools.h                  |     2                                         
   8 files changed, 6 insertions(+), 103 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/interface.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/interface.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/interface.hpp	2011-01-21 13:11:02 EST (Fri, 21 Jan 2011)
@@ -10,6 +10,7 @@
 #ifndef BOOST_ASSIGN_V2_REF_ARRAY_INTERFACE_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_ARRAY_INTERFACE_ER_2010_HPP
 #include <algorithm>
+#include <boost/config.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/int.hpp>
 
@@ -56,8 +57,7 @@
 
         #ifndef BOOST_MSVC
             typedef typename boost::range_size<impl_>::type size_type;
-        #endif
-        #ifdef BOOST_MSVC
+		#else
             typedef std::size_t size_type;
         #endif
         typedef typename boost::range_difference<range_>::type difference_type;

Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper.hpp	2011-01-21 13:11:02 EST (Fri, 21 Jan 2011)
@@ -13,5 +13,6 @@
 #include <boost/assign/v2/ref/wrapper/copy.hpp>
 #include <boost/assign/v2/ref/wrapper/cpp0x.hpp>
 #include <boost/assign/v2/ref/wrapper/get.hpp>
+#include <boost/assign/v2/ref/wrapper/adaptor_get.hpp>
 
 #endif

Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp	2011-01-21 13:11:02 EST (Fri, 21 Jan 2011)
@@ -9,8 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_WRAPPER_COPY_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_WRAPPER_COPY_ER_2010_HPP
-#include <algorithm>
-#include <boost/mpl/bool.hpp>
 #include <boost/config.hpp>
 #include <boost/call_traits.hpp>
 #include <boost/type_traits/is_const.hpp>

Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper/get.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper/get.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper/get.hpp	2011-01-21 13:11:02 EST (Fri, 21 Jan 2011)
@@ -9,22 +9,11 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_REF_WRAPPER_GET_ER_2010_HPP
 #define BOOST_ASSIGN_V2_REF_WRAPPER_GET_ER_2010_HPP
-#include <boost/config.hpp>
 #include <boost/ref.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <boost/type_traits/remove_cv.hpp>
-#include <boost/range/reference.hpp>
-#include <boost/range/value_type.hpp>
-
-// [ MSVC
-#include <boost/range/begin.hpp>
-#include <boost/range/end.hpp>
-#include <boost/range/iterator_range.hpp>
-#include <boost/iterator/transform_iterator.hpp>
-//#include <boost/range/adaptor/transformed.hpp> 
-// ]
 
 namespace boost{
 namespace assign{ 
@@ -75,81 +64,6 @@
         
     };
 
-    // Range
-
-namespace result_of{
-
-    template<typename R>
-    struct range_get_impl{
-    
-    	typedef ref::get_functor f_;
-        // [ MSCV
-    	//typedef boost::range_detail::transform_range<f_, R> type;
-		typedef boost::iterator_range< 
-            boost::transform_iterator< f_,
-                BOOST_DEDUCED_TYPENAME boost::range_iterator<R>::type 
-            >
-        > type; 
-    	// ]
-    };
-
-    template<typename R>
-    struct range_get : boost::lazy_enable_if<
-    	boost::is_reference_wrapper<
-            typename boost::range_value<
-                typename boost::remove_cv<R>::type
-            >::type
-        >,
-        range_get_impl<R>
-    >{};
-
-}// result_of
-
-    template<typename R>
-    typename ref::result_of::range_get<R>::type
-    range_get(R& r)
-    {
-        typedef typename ref::result_of::range_get<R>::type result_;
-        // [ MSVC
-//        return result_(get_functor(), r);
-		return result_(
-        	boost::make_transform_iterator( boost::begin(r), get_functor() ),
-        	boost::make_transform_iterator( boost::end(r), get_functor() )
-        );
-		// ]
-    }
-    template<typename R>
-    typename ref::result_of::range_get<R const>::type
-    range_get(R const& r)
-    {
-        typedef typename ref::result_of::range_get<R const>::type result_;
-        // [ MSVC
-//        return result_(get_functor(), r);
-		return result_(
-        	boost::make_transform_iterator( boost::begin(r), get_functor() ),
-        	boost::make_transform_iterator( boost::end(r), get_functor() )
-        );
-        // ]_
-    }
-
-    struct get_adaptor{};
-    
-namespace{
-    get_adaptor const _get = get_adaptor();
-}
-
-    template<typename R>
-    typename ref::result_of::range_get<R>::type
-    operator|(R& r, get_adaptor){
-        return range_get( r );
-    }
-
-    template<typename R>
-    typename ref::result_of::range_get<R const>::type
-    operator|(R const& r, get_adaptor){
-        return range_get( r );
-    }
-
 }// ref
 }// v2
 }// assign

Modified: sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp	2011-01-21 13:11:02 EST (Fri, 21 Jan 2011)
@@ -18,7 +18,7 @@
 #include <boost/type_traits/is_same.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/assign/v2/detail/checking/range.hpp>
-#include <boost/assign/v2/ref/wrapper/get.hpp>
+#include <boost/assign/v2/ref/wrapper/adaptor_get.hpp>
 #include <boost/assign/v2/ref/wrapper/copy.hpp>
 #include <boost/assign/v2/utility/chain/use_lvalue.hpp>
 #include <boost/assign/v2/utility/chain/pipe.hpp>

Modified: sandbox/assign_v2/boost/assign/v2/utility/convert/converter.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/convert/converter.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/convert/converter.hpp	2011-01-21 13:11:02 EST (Fri, 21 Jan 2011)
@@ -35,7 +35,7 @@
         template<typename T>
         operator T () const
         {
-        	return type<T>();
+        	return this->type<T>();
         }
 
                 template<typename T>

Modified: sandbox/assign_v2/boost/assign/v2/utility/convert/dispatch.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/convert/dispatch.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/utility/convert/dispatch.hpp	2011-01-21 13:11:02 EST (Fri, 21 Jan 2011)
@@ -13,12 +13,7 @@
 #include <boost/range/end.hpp>
 #include <boost/detail/workaround.hpp>
 
-//#ifdef BOOST_MSVC
-//#include <boost/range/algorithm/for_each.hpp>
-//#include <boost/assign/v2/put/sub.hpp>
-//#else
 #include <boost/assign/v2/put/pipe/range.hpp>
-//#endif
 
 #include <boost/assign/v2/utility/convert/tag.hpp>
 
@@ -31,12 +26,7 @@
     T dispatch(U const& u, convert_tag::put) 
     {
         T t; 
-    //#ifdef BOOST_MSVC
-    //    ::boost::for_each( u, v2::put( t ) );
-    //    return t;
-    //#else
         return (t | v2::_put_range( u ) );
-    //#endif
 
     }
 

Modified: sandbox/assign_v2/libs/assign/v2/speed/tools.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/speed/tools.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/speed/tools.h	2011-01-21 13:11:02 EST (Fri, 21 Jan 2011)
@@ -48,4 +48,4 @@
 }   
 
 
-#endif
\ No newline at end of file
+#endif