[Boost-commit] svn:boost r85949 - in trunk/boost/variant: . detail

Subject: [Boost-commit] svn:boost r85949 - in trunk/boost/variant: . detail
From: steveire_at_[hidden]
Date: 2013-09-26 05:47:55

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

Log:
Variant: Remove obsolete eti workaround.

Text files modified: 
   trunk/boost/variant/detail/initializer.hpp |    16 ----------------                        
   trunk/boost/variant/variant.hpp            |    21 ---------------------                   
   2 files changed, 0 insertions(+), 37 deletions(-)

Modified: trunk/boost/variant/detail/initializer.hpp
==============================================================================
--- trunk/boost/variant/detail/initializer.hpp	Thu Sep 26 05:47:38 2013	(r85948)
+++ trunk/boost/variant/detail/initializer.hpp	2013-09-26 05:47:54 EDT (Thu, 26 Sep 2013)	(r85949)
@@ -210,22 +210,6 @@
 
 };
 
-#   if defined(BOOST_MPL_CFG_MSVC_60_ETI_BUG)
-
-#if !defined(BOOST_VARIANT_AUX_ECHO)
-#   define BOOST_VARIANT_AUX_ECHO(z,N,token) token
-#endif
-
-template <>
-struct preprocessor_list_initializer<
-      BOOST_PP_ENUM(BOOST_VARIANT_LIMIT_TYPES, BOOST_VARIANT_AUX_ECHO, int)
-    , BOOST_PP_ENUM(BOOST_VARIANT_LIMIT_TYPES, BOOST_VARIANT_AUX_ECHO, const int)
-    >
-{
-};
-
-#   endif // BOOST_MPL_CFG_MSVC_60_ETI_BUG workaround
-
 #endif // BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE workaround
 
 }} // namespace detail::variant

Modified: trunk/boost/variant/variant.hpp
==============================================================================
--- trunk/boost/variant/variant.hpp	Thu Sep 26 05:47:38 2013	(r85948)
+++ trunk/boost/variant/variant.hpp	2013-09-26 05:47:54 EDT (Thu, 26 Sep 2013)	(r85949)
@@ -23,7 +23,6 @@
 #endif // BOOST_NO_TYPEID
 
 #include "boost/variant/detail/config.hpp"
-#include "boost/mpl/aux_/config/eti.hpp"
 #include "boost/mpl/aux_/value_wknd.hpp"
 
 #include "boost/variant/variant_fwd.hpp"
@@ -219,16 +218,6 @@
 
 };
 
-#if defined(BOOST_MPL_CFG_MSVC_60_ETI_BUG)
-
-template<>
-struct find_fallback_type<int>
-{
-    typedef mpl::pair< no_fallback_type,no_fallback_type > type;
-};
-
-#endif // BOOST_MPL_CFG_MSVC_60_ETI_BUG workaround
-
 #ifndef BOOST_NO_CXX11_NOEXCEPT
 ///////////////////////////////////////////////////////////////////////////////
 // (detail) metafunction is_variant_move_noexcept
@@ -310,16 +299,6 @@
 
 };
 
-#if defined(BOOST_MPL_CFG_MSVC_60_ETI_BUG)
-
-template<>
-struct make_storage<int,int>
-{
-    typedef int type;
-};
-
-#endif // BOOST_MPL_CFG_MSVC_60_ETI_BUG workaround
-
 ///////////////////////////////////////////////////////////////////////////////
 // (detail) class destroyer
 //