From 340edb5672f4f99083d7386c99bf7df856cf74d1 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Tue, 14 Dec 2004 22:34:44 +0000 Subject: [PATCH] vc6 workarounds for real [SVN r26508] --- include/boost/mpl/key_type.hpp | 14 ++++---------- include/boost/mpl/value_type.hpp | 15 ++++----------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/include/boost/mpl/key_type.hpp b/include/boost/mpl/key_type.hpp index f129fc8..b986a2a 100644 --- a/include/boost/mpl/key_type.hpp +++ b/include/boost/mpl/key_type.hpp @@ -17,6 +17,7 @@ #include #include +#include #include #include @@ -27,22 +28,15 @@ template< , typename BOOST_MPL_AUX_NA_PARAM(T) > struct key_type - : key_type_impl< typename sequence_tag::type > - ::template apply + : apply_wrap2< + key_type_impl< typename sequence_tag::type > + , AssociativeSequence, T> { BOOST_MPL_AUX_LAMBDA_SUPPORT(2,key_type,(AssociativeSequence,T)) }; BOOST_MPL_AUX_NA_SPEC(2, key_type) -#if BOOST_MPL_CFG_MSVC_60_ETI_BUG -template<> -struct key_type -{ - typedef int type; -}; -#endif - }} #endif // BOOST_MPL_KEY_TYPE_HPP_INCLUDED diff --git a/include/boost/mpl/value_type.hpp b/include/boost/mpl/value_type.hpp index ffcf59d..5509688 100755 --- a/include/boost/mpl/value_type.hpp +++ b/include/boost/mpl/value_type.hpp @@ -17,6 +17,7 @@ #include #include +#include #include #include @@ -27,22 +28,14 @@ template< , typename BOOST_MPL_AUX_NA_PARAM(T) > struct value_type - : value_type_impl< typename sequence_tag::type > - ::template apply + : apply_wrap2< + value_type_impl< typename sequence_tag::type > + , AssociativeSequence, T > { BOOST_MPL_AUX_LAMBDA_SUPPORT(2,value_type,(AssociativeSequence,T)) }; BOOST_MPL_AUX_NA_SPEC(2, value_type) - -#if BOOST_MPL_CFG_MSVC_60_ETI_BUG -template<> -struct value_type -{ - typedef int type; -}; -#endif - }}