[Boost-commit] svn:boost r85939 - trunk/boost/multi_array

Subject: [Boost-commit] svn:boost r85939 - trunk/boost/multi_array
From: steveire_at_[hidden]
Date: 2013-09-26 05:43:12

Author: skelly
Date: 2013-09-26 05:43:12 EDT (Thu, 26 Sep 2013)
New Revision: 85939
URL: http://svn.boost.org/trac/boost/changeset/85939

Log:
MultiArray: Remove obsolete MSVC version checks.

Text files modified: 
   trunk/boost/multi_array/base.hpp            |    40 ----------------------------------------
   trunk/boost/multi_array/iterator.hpp        |     7 -------                                 
   trunk/boost/multi_array/multi_array_ref.hpp |    12 ------------                            
   trunk/boost/multi_array/subarray.hpp        |    12 ------------                            
   trunk/boost/multi_array/view.hpp            |    12 ------------                            
   5 files changed, 0 insertions(+), 83 deletions(-)

Modified: trunk/boost/multi_array/base.hpp
==============================================================================
--- trunk/boost/multi_array/base.hpp	Thu Sep 26 05:42:51 2013	(r85938)
+++ trunk/boost/multi_array/base.hpp	2013-09-26 05:43:12 EDT (Thu, 26 Sep 2013)	(r85939)
@@ -29,7 +29,6 @@
 #include "boost/mpl/eval_if.hpp"
 #include "boost/mpl/if.hpp"
 #include "boost/mpl/size_t.hpp"
-#include "boost/mpl/aux_/msvc_eti_base.hpp"
 #include "boost/iterator/reverse_iterator.hpp"
 #include "boost/static_assert.hpp"
 #include "boost/type.hpp"
@@ -210,44 +209,11 @@
   >::type type;
 };
 
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
-struct eti_value_accessor
-{
-  typedef int index;
-  typedef int size_type;
-  typedef int element;
-  typedef int index_range;
-  typedef int value_type;
-  typedef int reference;
-  typedef int const_reference;
-};
-    
-template <>
-struct value_accessor_generator<int,int>
-{
-  typedef eti_value_accessor type;
-};
-
-template <class T, class NumDims>
-struct associated_types
-  : mpl::aux::msvc_eti_base<
-        typename value_accessor_generator<T,NumDims>::type
-    >::type
-{};
-
-template <>
-struct associated_types<int,int> : eti_value_accessor {};
-
-#else
-
 template <class T, class NumDims>
 struct associated_types
   : value_accessor_generator<T,NumDims>::type
 {};
 
-#endif
-
 //
 // choose value accessor ends
 /////////////////////////////////////////////////////////////////////////
@@ -272,13 +238,7 @@
 template <typename T, std::size_t NumDims>
 class multi_array_impl_base
   :
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-      public mpl::aux::msvc_eti_base<
-          typename value_accessor_generator<T,mpl::size_t<NumDims> >::type
-       >::type
-#else
       public value_accessor_generator<T,mpl::size_t<NumDims> >::type
-#endif 
 {
   typedef associated_types<T,mpl::size_t<NumDims> > types;
 public:

Modified: trunk/boost/multi_array/iterator.hpp
==============================================================================
--- trunk/boost/multi_array/iterator.hpp	Thu Sep 26 05:42:51 2013	(r85938)
+++ trunk/boost/multi_array/iterator.hpp	2013-09-26 05:43:12 EDT (Thu, 26 Sep 2013)	(r85939)
@@ -20,7 +20,6 @@
 
 #include "boost/multi_array/base.hpp"
 #include "boost/iterator/iterator_facade.hpp"
-#include "boost/mpl/aux_/msvc_eti_base.hpp"
 #include <algorithm>
 #include <cstddef>
 #include <iterator>
@@ -59,13 +58,7 @@
       , Reference
     >
     , private
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-      mpl::aux::msvc_eti_base<typename 
-#endif 
           value_accessor_generator<T,NumDims>::type
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-      >::type
-#endif 
 {
   friend class iterator_core_access;
   typedef detail::multi_array::associated_types<T,NumDims> access_t;

Modified: trunk/boost/multi_array/multi_array_ref.hpp
==============================================================================
--- trunk/boost/multi_array/multi_array_ref.hpp	Thu Sep 26 05:42:51 2013	(r85938)
+++ trunk/boost/multi_array/multi_array_ref.hpp	2013-09-26 05:43:12 EDT (Thu, 26 Sep 2013)	(r85939)
@@ -225,11 +225,7 @@
   }
 
   // see generate_array_view in base.hpp
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
   template <int NDims>
-#else
-  template <int NumDims, int NDims> // else ICE
-#endif // BOOST_MSVC
   typename const_array_view<NDims>::type 
   operator[](const detail::multi_array::
              index_gen<NumDims,NDims>& indices)
@@ -529,11 +525,7 @@
 
 
   // See note attached to generate_array_view in base.hpp
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
   template <int NDims>
-#else
-  template <int NumDims, int NDims> // else ICE
-#endif // BOOST_MSVC
   typename array_view<NDims>::type 
   operator[](const detail::multi_array::
              index_gen<NumDims,NDims>& indices) {
@@ -591,11 +583,7 @@
   }
 
   // See note attached to generate_array_view in base.hpp
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
   template <int NDims>
-#else
-  template <int NumDims, int NDims> // else ICE
-#endif // BOOST_MSVC
   typename const_array_view<NDims>::type 
   operator[](const detail::multi_array::
              index_gen<NumDims,NDims>& indices)

Modified: trunk/boost/multi_array/subarray.hpp
==============================================================================
--- trunk/boost/multi_array/subarray.hpp	Thu Sep 26 05:42:51 2013	(r85938)
+++ trunk/boost/multi_array/subarray.hpp	2013-09-26 05:43:12 EDT (Thu, 26 Sep 2013)	(r85939)
@@ -87,11 +87,7 @@
   }
 
   // see generate_array_view in base.hpp
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
   template <int NDims>
-#else
-  template <int NumDims, int NDims> // else ICE
-#endif // BOOST_MSVC
   typename const_array_view<NDims>::type 
   operator[](const boost::detail::multi_array::
              index_gen<NumDims,NDims>& indices)
@@ -267,11 +263,7 @@
   }
 
   // see generate_array_view in base.hpp
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
   template <int NDims>
-#else
-  template <int NumDims, int NDims> // else ICE
-#endif // BOOST_MSVC
   typename array_view<NDims>::type 
   operator[](const boost::detail::multi_array::
              index_gen<NumDims,NDims>& indices) {
@@ -332,11 +324,7 @@
   }
 
   // see generate_array_view in base.hpp
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
   template <int NDims>
-#else
-  template <int NumDims, int NDims> // else ICE
-#endif // BOOST_MSVC
   typename const_array_view<NDims>::type 
   operator[](const boost::detail::multi_array::
              index_gen<NumDims,NDims>& indices)

Modified: trunk/boost/multi_array/view.hpp
==============================================================================
--- trunk/boost/multi_array/view.hpp	Thu Sep 26 05:42:51 2013	(r85938)
+++ trunk/boost/multi_array/view.hpp	2013-09-26 05:43:12 EDT (Thu, 26 Sep 2013)	(r85939)
@@ -135,11 +135,7 @@
   }
 
   // see generate_array_view in base.hpp
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
   template <int NDims>
-#else
-  template <int NumDims, int NDims> // else ICE
-#endif // BOOST_MSVC
   typename const_array_view<NDims>::type 
   operator[](const boost::detail::multi_array::
              index_gen<NumDims,NDims>& indices)
@@ -346,11 +342,7 @@
 
 
   // see generate_array_view in base.hpp
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
   template <int NDims>
-#else
-  template <int NumDims, int NDims> // else ICE
-#endif // BOOST_MSVC
   typename array_view<NDims>::type 
   operator[](const boost::detail::multi_array::
              index_gen<NumDims,NDims>& indices) {
@@ -402,11 +394,7 @@
   }
 
   // see generate_array_view in base.hpp
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
   template <int NDims>
-#else
-  template <int NumDims, int NDims> // else ICE
-#endif // BOOST_MSVC
   typename const_array_view<NDims>::type 
   operator[](const boost::detail::multi_array::
              index_gen<NumDims,NDims>& indices)