From f8af2cbce6028cb4a607b0a77828d1c3525c43ff Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Sun, 23 Feb 2003 14:54:46 +0000 Subject: [PATCH] clean up mistake in refactoring [SVN r17601] --- include/boost/type_traits/add_reference.hpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/include/boost/type_traits/add_reference.hpp b/include/boost/type_traits/add_reference.hpp index a5a0a40..0465387 100644 --- a/include/boost/type_traits/add_reference.hpp +++ b/include/boost/type_traits/add_reference.hpp @@ -23,6 +23,14 @@ namespace boost { BOOST_TT_AUX_TYPE_TRAIT_DEF1(add_reference,T,T&) BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_1(typename T,add_reference,T&,T&) +// these full specialisations are always required: +BOOST_TT_AUX_TYPE_TRAIT_SPEC1(add_reference,void,void) +#ifndef BOOST_NO_CV_VOID_SPECIALIZATIONS +BOOST_TT_AUX_TYPE_TRAIT_SPEC1(add_reference,void const,void const) +BOOST_TT_AUX_TYPE_TRAIT_SPEC1(add_reference,void volatile,void volatile) +BOOST_TT_AUX_TYPE_TRAIT_SPEC1(add_reference,void const volatile,void const volatile) +#endif + #elif defined(BOOST_MSVC6_MEMBER_TEMPLATES) namespace detail { @@ -67,18 +75,6 @@ BOOST_TT_AUX_TYPE_TRAIT_IMPL_SPEC1(add_reference,void const volatile,void const BOOST_TT_AUX_TYPE_TRAIT_DEF1(add_reference,T,typename detail::add_reference_impl::type) -#else - -// these full specialisations are always required: -BOOST_TT_AUX_TYPE_TRAIT_SPEC1(add_reference,void,void) -#ifndef BOOST_NO_CV_VOID_SPECIALIZATIONS -BOOST_TT_AUX_TYPE_TRAIT_SPEC1(add_reference,void const,void const) -BOOST_TT_AUX_TYPE_TRAIT_SPEC1(add_reference,void volatile,void volatile) -BOOST_TT_AUX_TYPE_TRAIT_SPEC1(add_reference,void const volatile,void const volatile) -#endif - -BOOST_TT_AUX_TYPE_TRAIT_DEF1(add_reference,T,T&) - #endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION