Swiftdiff options
Diffstat (limited to '3rdParty/Boost/src/boost/type_traits/remove_volatile.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/type_traits/remove_volatile.hpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/3rdParty/Boost/src/boost/type_traits/remove_volatile.hpp b/3rdParty/Boost/src/boost/type_traits/remove_volatile.hpp index 073a2a3..c202776 100644 --- a/3rdParty/Boost/src/boost/type_traits/remove_volatile.hpp +++ b/3rdParty/Boost/src/boost/type_traits/remove_volatile.hpp @@ -12,23 +12,17 @@ #define BOOST_TT_REMOVE_VOLATILE_HPP_INCLUDED #include <boost/type_traits/is_const.hpp> -#include <boost/type_traits/broken_compiler_spec.hpp> #include <boost/type_traits/detail/cv_traits_impl.hpp> #include <boost/config.hpp> #include <boost/detail/workaround.hpp> #include <cstddef> -#if BOOST_WORKAROUND(BOOST_MSVC,<=1300) -#include <boost/type_traits/msvc/remove_volatile.hpp> -#endif - // should be the last #include #include <boost/type_traits/detail/type_trait_def.hpp> namespace boost { -#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION namespace detail { @@ -48,7 +42,7 @@ template <typename T> struct remove_volatile_impl { typedef typename remove_volatile_helper< - typename cv_traits_imp<T*>::unqualified_type + typename cv_traits_imp<BOOST_TT_AUX_CV_TRAITS_IMPL_PARAM(T)>::unqualified_type , ::boost::is_const<T>::value >::type type; }; @@ -57,7 +51,7 @@ struct remove_volatile_impl // We can't filter out rvalue_references at the same level as // references or we get ambiguities from msvc: // -#ifndef BOOST_NO_RVALUE_REFERENCES +#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES template <typename T> struct remove_volatile_impl<T&&> { @@ -75,11 +69,6 @@ BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_2(typename T,std::size_t N,remove_volatile BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_2(typename T,std::size_t N,remove_volatile,T const volatile[N],T const type[N]) #endif -#elif !BOOST_WORKAROUND(BOOST_MSVC,<=1300) - -BOOST_TT_AUX_TYPE_TRAIT_DEF1(remove_volatile,T,typename boost::detail::remove_volatile_impl<T>::type) - -#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION } // namespace boost |