[Boost-commit] svn:boost r60866 - in sandbox/statistics/detail/assign: boost/assign/auto_size/array boost/assign/auto_size/range libs/assign/example

Subject: [Boost-commit] svn:boost r60866 - in sandbox/statistics/detail/assign: boost/assign/auto_size/array boost/assign/auto_size/range libs/assign/example
From: erwann.rogard_at_[hidden]
Date: 2010-03-26 13:13:25

Author: e_r
Date: 2010-03-26 13:13:24 EDT (Fri, 26 Mar 2010)
New Revision: 60866
URL: http://svn.boost.org/trac/boost/changeset/60866

Log:
m
Text files modified: 
   sandbox/statistics/detail/assign/boost/assign/auto_size/array/interface.hpp |    13 ++++++-------                           
   sandbox/statistics/detail/assign/boost/assign/auto_size/range/converter.hpp |     7 +++++++                                 
   sandbox/statistics/detail/assign/libs/assign/example/range.cpp              |     2 +-                                      
   3 files changed, 14 insertions(+), 8 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 13:13:24 EDT (Fri, 26 Mar 2010)
@@ -118,16 +118,15 @@
 
         public:
 
-        template< class Container >
-        operator Container() const
-        {
-            return 
-            	this->convert_to_container<Container>();
-        }
-
         BOOST_ASSIGN_AS_CONVERTER
 
 /*
+        template< class Container >                                            
+        operator Container() const                                             
+        {                                                                      
+            return                                                             
+            	this->convert_to_container<Container>();                       
+        }                                                                      
         template< class Container >
         Container convert_to_container() const
         {

Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/range/converter.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/range/converter.hpp	(original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/range/converter.hpp	2010-03-26 13:13:24 EDT (Fri, 26 Mar 2010)
@@ -26,6 +26,13 @@
     public:                                                                    \
                                                                                \
         template< class Container >                                            \
+        operator Container() const                                             \
+        {                                                                      \
+            return                                                             \
+            	this->convert_to_container<Container>();                       \
+        }                                                                      \
+                                                                               \
+        template< class Container >                                            \
         Container convert_to_container() const                                 \
         {                                                                      \
             static Container* c = 0;                                           \

Modified: sandbox/statistics/detail/assign/libs/assign/example/range.cpp
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/example/range.cpp	(original)
+++ sandbox/statistics/detail/assign/libs/assign/example/range.cpp	2010-03-26 13:13:24 EDT (Fri, 26 Mar 2010)
@@ -50,12 +50,12 @@
         v,
         std::ostream_iterator<val_>(os," "));
 
-/*
     os << " chain_l(tmp1)(tmp2)(tmp3) = (";
     boost::copy(
         chain_l(tmp1)(ar5)(tmp3),
         std::ostream_iterator<val_>(os," ")
     ); 
+/*
     os <<  ") becomes (";
     boost::copy(
         chain_l(ar1)(ar2)(ar3),