[Boost-commit] svn:boost r60727 - in sandbox/statistics/detail/assign/boost/assign/auto_size: array comparison_op detail

Subject: [Boost-commit] svn:boost r60727 - in sandbox/statistics/detail/assign/boost/assign/auto_size: array comparison_op detail
From: erwann.rogard_at_[hidden]
Date: 2010-03-19 20:38:45

Author: e_r
Date: 2010-03-19 20:38:44 EDT (Fri, 19 Mar 2010)
New Revision: 60727
URL: http://svn.boost.org/trac/boost/changeset/60727

Log:
m
Text files modified: 
   sandbox/statistics/detail/assign/boost/assign/auto_size/array/has_static_size.hpp |    13 +++++++------                           
   sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/crtp.hpp    |     8 +++++---                                
   sandbox/statistics/detail/assign/boost/assign/auto_size/detail/expr.hpp           |     4 ++--                                    
   3 files changed, 14 insertions(+), 11 deletions(-)

Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/array/has_static_size.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/array/has_static_size.hpp	(original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/array/has_static_size.hpp	2010-03-19 20:38:44 EDT (Fri, 19 Mar 2010)
@@ -19,8 +19,6 @@
     template<typename T>
     struct has_static_size{
         typedef typename T::size_type size_type;
-        typedef typename type_traits::yes_type yes;
-        typedef typename type_traits::no_type no;
         typedef const size_type* sig1;
         typedef const size_type sig2; // for boost::array<>
 
@@ -30,13 +28,16 @@
         template<typename U,sig2>
         struct sfinae2 { };
 
-        //template<typename U> static yes test(sfinae1<U, &U::static_size> *);
-        template<typename U> static yes test(sfinae2<U, U::static_size> *);
-        template<typename U> static no test(...);
+        //template<typename U> static 
+        //type_traits::yes_type test(sfinae1<U, &U::static_size> *);
+        template<typename U> 
+        static type_traits::yes_type test(sfinae2<U, U::static_size> *);
+        template<typename U> 
+        static type_traits::no_type test(...);
 
         BOOST_STATIC_CONSTANT(
                 bool, 
-            value = sizeof( test<T>(0) ) == sizeof(yes)
+            value = sizeof( test<T>(0) ) == sizeof(type_traits::yes_type)
         );
         
         typedef boost::mpl::bool_<value> type;

Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/crtp.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/crtp.hpp	(original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/comparison_op/crtp.hpp	2010-03-19 20:38:44 EDT (Fri, 19 Mar 2010)
@@ -59,11 +59,13 @@
         typedef typename type_traits::yes_type yes;
         typedef typename type_traits::no_type no;
 
-        template<typename U> static yes test(typename U::comparison_op_traits*);
-        template<typename U> static no test(...);
+        template<typename U> 
+        static type_traits::yes_type test(typename U::comparison_op_traits*);
+        template<typename U> 
+        static type_traits::no_type test(...);
          
         BOOST_STATIC_CONSTANT( bool, 
-            value = sizeof( test<T>(0) ) == sizeof(yes) );
+            value = sizeof( test<T>(0) ) == sizeof(type_traits::yes_type) );
         typedef boost::mpl::bool_<value> type;
     };
 

Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/detail/expr.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/detail/expr.hpp	(original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/detail/expr.hpp	2010-03-19 20:38:44 EDT (Fri, 19 Mar 2010)
@@ -21,8 +21,8 @@
 #include <boost/type_traits.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/range.hpp>
-#include <boost/assign/auto_size/array/has_static_size.hpp>
-#include <boost/assign/auto_size/array/static_size.hpp>
+//#include <boost/assign/auto_size/array/has_static_size.hpp>
+//#include <boost/assign/auto_size/array/static_size.hpp>
 #include <boost/assign/auto_size/reference_wrapper/copy.hpp>
 #include <boost/assign/auto_size/reference_wrapper/rebind.hpp>
 #include <boost/assign/auto_size/detail/policy.hpp>