From 59f108a7d1df1aa28bc6919d78135fa79280cb5c Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 26 Sep 2013 09:43:12 +0000 Subject: [PATCH] MultiArray: Remove obsolete MSVC version checks. [SVN r85939] --- include/boost/multi_array/base.hpp | 40 ------------------- include/boost/multi_array/iterator.hpp | 7 ---- include/boost/multi_array/multi_array_ref.hpp | 12 ------ include/boost/multi_array/subarray.hpp | 12 ------ include/boost/multi_array/view.hpp | 12 ------ 5 files changed, 83 deletions(-) diff --git a/include/boost/multi_array/base.hpp b/include/boost/multi_array/base.hpp index e65f437..34e325b 100644 --- a/include/boost/multi_array/base.hpp +++ b/include/boost/multi_array/base.hpp @@ -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 @@ struct value_accessor_generator { >::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 -{ - typedef eti_value_accessor type; -}; - -template -struct associated_types - : mpl::aux::msvc_eti_base< - typename value_accessor_generator::type - >::type -{}; - -template <> -struct associated_types : eti_value_accessor {}; - -#else - template struct associated_types : value_accessor_generator::type {}; -#endif - // // choose value accessor ends ///////////////////////////////////////////////////////////////////////// @@ -272,13 +238,7 @@ struct mutable_iterator_tag template class multi_array_impl_base : -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) - public mpl::aux::msvc_eti_base< - typename value_accessor_generator >::type - >::type -#else public value_accessor_generator >::type -#endif { typedef associated_types > types; public: diff --git a/include/boost/multi_array/iterator.hpp b/include/boost/multi_array/iterator.hpp index c77d34e..e47e0b3 100644 --- a/include/boost/multi_array/iterator.hpp +++ b/include/boost/multi_array/iterator.hpp @@ -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 #include #include @@ -59,13 +58,7 @@ class array_iterator , Reference > , private -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) - mpl::aux::msvc_eti_base::type -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) - >::type -#endif { friend class iterator_core_access; typedef detail::multi_array::associated_types access_t; diff --git a/include/boost/multi_array/multi_array_ref.hpp b/include/boost/multi_array/multi_array_ref.hpp index 92e8fb4..7c0fb03 100644 --- a/include/boost/multi_array/multi_array_ref.hpp +++ b/include/boost/multi_array/multi_array_ref.hpp @@ -225,11 +225,7 @@ public: } // see generate_array_view in base.hpp -#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 template -#else - template // else ICE -#endif // BOOST_MSVC typename const_array_view::type operator[](const detail::multi_array:: index_gen& indices) @@ -529,11 +525,7 @@ public: // See note attached to generate_array_view in base.hpp -#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 template -#else - template // else ICE -#endif // BOOST_MSVC typename array_view::type operator[](const detail::multi_array:: index_gen& indices) { @@ -591,11 +583,7 @@ public: } // See note attached to generate_array_view in base.hpp -#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 template -#else - template // else ICE -#endif // BOOST_MSVC typename const_array_view::type operator[](const detail::multi_array:: index_gen& indices) diff --git a/include/boost/multi_array/subarray.hpp b/include/boost/multi_array/subarray.hpp index a498916..5c36599 100644 --- a/include/boost/multi_array/subarray.hpp +++ b/include/boost/multi_array/subarray.hpp @@ -87,11 +87,7 @@ public: } // see generate_array_view in base.hpp -#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 template -#else - template // else ICE -#endif // BOOST_MSVC typename const_array_view::type operator[](const boost::detail::multi_array:: index_gen& indices) @@ -267,11 +263,7 @@ public: } // see generate_array_view in base.hpp -#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 template -#else - template // else ICE -#endif // BOOST_MSVC typename array_view::type operator[](const boost::detail::multi_array:: index_gen& indices) { @@ -332,11 +324,7 @@ public: } // see generate_array_view in base.hpp -#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 template -#else - template // else ICE -#endif // BOOST_MSVC typename const_array_view::type operator[](const boost::detail::multi_array:: index_gen& indices) diff --git a/include/boost/multi_array/view.hpp b/include/boost/multi_array/view.hpp index d11e260..59ac089 100644 --- a/include/boost/multi_array/view.hpp +++ b/include/boost/multi_array/view.hpp @@ -135,11 +135,7 @@ public: } // see generate_array_view in base.hpp -#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 template -#else - template // else ICE -#endif // BOOST_MSVC typename const_array_view::type operator[](const boost::detail::multi_array:: index_gen& indices) @@ -346,11 +342,7 @@ public: // see generate_array_view in base.hpp -#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 template -#else - template // else ICE -#endif // BOOST_MSVC typename array_view::type operator[](const boost::detail::multi_array:: index_gen& indices) { @@ -402,11 +394,7 @@ public: } // see generate_array_view in base.hpp -#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 template -#else - template // else ICE -#endif // BOOST_MSVC typename const_array_view::type operator[](const boost::detail::multi_array:: index_gen& indices)