Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r60865 - sandbox/statistics/detail/assign/boost/assign/auto_size/array
From: erwann.rogard_at_[hidden]
Date: 2010-03-26 11:32:05


Author: e_r
Date: 2010-03-26 11:32:04 EDT (Fri, 26 Mar 2010)
New Revision: 60865
URL: http://svn.boost.org/trac/boost/changeset/60865

Log:
m
Text files modified:
   sandbox/statistics/detail/assign/boost/assign/auto_size/array/interface.hpp | 18 +++++++++++-------
   1 files changed, 11 insertions(+), 7 deletions(-)

Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/array/interface.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/array/interface.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/array/interface.hpp 2010-03-26 11:32:04 EDT (Fri, 26 Mar 2010)
@@ -14,10 +14,11 @@
 #include <boost/array.hpp>
 #include <boost/range.hpp>
 #include <boost/typeof/typeof.hpp>
-#include <boost/assign/list_of.hpp> // converter<>
+//#include <boost/assign/list_of.hpp> // converter<>
 #include <boost/assign/auto_size/comparison_op/range.hpp>
 #include <boost/assign/auto_size/reference_wrapper/has_copy_semantics.hpp> //needed?
 #include <boost/assign/auto_size/array/ref.hpp>
+#include <boost/assign/auto_size/range/converter.hpp>
 
 namespace boost{
 namespace assign{
@@ -55,10 +56,10 @@
     template<typename T,std::size_t N,template<typename> class R,typename D>
     class array_interface
       :
- assign_detail::converter<
- array_interface<T,N,R,D>,
- typename array_interface_traits<T,N,R>::const_iterator
- >,
+// assign_detail::converter<
+// array_interface<T,N,R,D>,
+// typename array_interface_traits<T,N,R>::const_iterator
+// >,
         public range_comparison_op::base_of<
             array_interface<T,N,R,D>
>::type
@@ -121,9 +122,12 @@
         operator Container() const
         {
             return
- this-> BOOST_NESTED_TEMPLATE convert_to_container<Container>();
+ this->convert_to_container<Container>();
         }
 
+ BOOST_ASSIGN_AS_CONVERTER
+
+/*
         template< class Container >
         Container convert_to_container() const
         {
@@ -162,7 +166,7 @@
         {
             return converter_::to_array(a);
         }
-
+*/
         private:
         typedef boost::mpl::bool_<false> false_;
         typedef boost::mpl::bool_<true> true_;


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