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

Subject: [Boost-commit] svn:boost r60879 - in sandbox/statistics/detail/assign/boost/assign/auto_size: array traits
From: erwann.rogard_at_[hidden]
Date: 2010-03-27 13:13:36

Author: e_r
Date: 2010-03-27 13:13:35 EDT (Sat, 27 Mar 2010)
New Revision: 60879
URL: http://svn.boost.org/trac/boost/changeset/60879

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/traits/inner_value_traits.hpp |    10 ++++++----                              
   2 files changed, 17 insertions(+), 6 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-27 13:13:35 EDT (Sat, 27 Mar 2010)
@@ -34,8 +34,17 @@
                 boost::range_iterator<ref_array_>::type iterator;
         typedef typename boost::range_iterator<
                 const ref_array_>::type const_iterator;
-        typedef typename 
-        	boost::range_size<ref_array_>::type size_type;
+        #ifndef BOOST_MSVC
+		    typedef typename 
+        	    boost::range_size<ref_array_>::type size_type;
+        #endif
+        #ifdef BOOST_MSVC 
+//c:\users\erwann\reposetories\boost\trunk\boost\range\size_type.hpp(66) : error C2872: 'detail' : ambiguous symbol
+//        could be 'boost::detail'  or 'boost::assign::detail'
+            typedef std::size_t size_type; 
+        #endif
+
+
         typedef typename boost::range_difference<
             ref_array_>::type difference_type;
         typedef typename ref_array_::reference reference;

Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/traits/inner_value_traits.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/traits/inner_value_traits.hpp	(original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/traits/inner_value_traits.hpp	2010-03-27 13:13:35 EDT (Sat, 27 Mar 2010)
@@ -29,18 +29,20 @@
     template<typename T> struct tag_of : tag::nested_parameter{};
 
     namespace meta{ 
-        struct empty{ template<typename T> struct apply{}; };
     
-        template<typename Tag> struct inner_value_of{}; 
+        template<typename Tag> struct inner_value_of
+        {
+            template<typename T> struct apply{};
+        }; 
 
         template<> 
         struct inner_value_of<
             inner_value_traits::tag::nested_parameter
-        > : empty{};
+        >{ template<typename T> struct apply{}; };
 
         template<> 
         template<template<typename> class W,typename T>
-        struct inner_value_of<tag::nested_parameter>
+        struct inner_value_of<inner_value_traits::tag::nested_parameter>
             ::apply< W<T> >{ typedef T type; };
 
         // Specialize further as needed