diff options
Diffstat (limited to 'boost/type_traits/remove_volatile.hpp')
-rw-r--r-- | boost/type_traits/remove_volatile.hpp | 57 |
1 files changed, 7 insertions, 50 deletions
diff --git a/boost/type_traits/remove_volatile.hpp b/boost/type_traits/remove_volatile.hpp index c20277696d..475e39d22c 100644 --- a/boost/type_traits/remove_volatile.hpp +++ b/boost/type_traits/remove_volatile.hpp @@ -11,67 +11,24 @@ #ifndef BOOST_TT_REMOVE_VOLATILE_HPP_INCLUDED #define BOOST_TT_REMOVE_VOLATILE_HPP_INCLUDED -#include <boost/type_traits/is_const.hpp> -#include <boost/type_traits/detail/cv_traits_impl.hpp> #include <boost/config.hpp> #include <boost/detail/workaround.hpp> - #include <cstddef> -// should be the last #include -#include <boost/type_traits/detail/type_trait_def.hpp> - namespace boost { + // convert a type T to a non-cv-qualified type - remove_volatile<T> + template <class T> struct remove_volatile{ typedef T type; }; + template <class T> struct remove_volatile<T volatile>{ typedef T type; }; -namespace detail { - -template <typename T, bool is_const> -struct remove_volatile_helper -{ - typedef T type; -}; - -template <typename T> -struct remove_volatile_helper<T,true> -{ - typedef T const type; -}; - -template <typename T> -struct remove_volatile_impl -{ - typedef typename remove_volatile_helper< - typename cv_traits_imp<BOOST_TT_AUX_CV_TRAITS_IMPL_PARAM(T)>::unqualified_type - , ::boost::is_const<T>::value - >::type type; -}; - -// -// We can't filter out rvalue_references at the same level as -// references or we get ambiguities from msvc: -// -#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES -template <typename T> -struct remove_volatile_impl<T&&> -{ - typedef T&& type; -}; -#endif -} // namespace detail - -// * convert a type T to a non-volatile type - remove_volatile<T> - -BOOST_TT_AUX_TYPE_TRAIT_DEF1(remove_volatile,T,typename boost::detail::remove_volatile_impl<T>::type) -BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_1(typename T,remove_volatile,T&,T&) #if !defined(BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS) -BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_2(typename T,std::size_t N,remove_volatile,T volatile[N],T type[N]) -BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_2(typename T,std::size_t N,remove_volatile,T const volatile[N],T const type[N]) + template <class T, std::size_t N> struct remove_volatile<T volatile[N]>{ typedef T type[N]; }; +#if !BOOST_WORKAROUND(__BORLANDC__, < 0x600) && !defined(__IBMCPP__) && !BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x840)) + template <class T> struct remove_volatile<T volatile[]>{ typedef T type[]; }; +#endif #endif } // namespace boost -#include <boost/type_traits/detail/type_trait_undef.hpp> - #endif // BOOST_TT_REMOVE_VOLATILE_HPP_INCLUDED |