diff options
author | Chanho Park <chanho61.park@samsung.com> | 2014-12-11 18:55:56 +0900 |
---|---|---|
committer | Chanho Park <chanho61.park@samsung.com> | 2014-12-11 18:55:56 +0900 |
commit | 08c1e93fa36a49f49325a07fe91ff92c964c2b6c (patch) | |
tree | 7a7053ceb8874b28ec4b868d4c49b500008a102e /boost/type_traits/remove_cv.hpp | |
parent | bb4dd8289b351fae6b55e303f189127a394a1edd (diff) | |
download | boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.tar.gz boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.tar.bz2 boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.zip |
Imported Upstream version 1.57.0upstream/1.57.0
Diffstat (limited to 'boost/type_traits/remove_cv.hpp')
-rw-r--r-- | boost/type_traits/remove_cv.hpp | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/boost/type_traits/remove_cv.hpp b/boost/type_traits/remove_cv.hpp index ee6d8f9691..9ba34a1eff 100644 --- a/boost/type_traits/remove_cv.hpp +++ b/boost/type_traits/remove_cv.hpp @@ -11,33 +11,27 @@ #ifndef BOOST_TT_REMOVE_CV_HPP_INCLUDED #define BOOST_TT_REMOVE_CV_HPP_INCLUDED -#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_cv.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{ template <class T> struct rvalue_ref_filter_rem_cv { - typedef typename boost::detail::cv_traits_imp<T*>::unqualified_type type; + typedef typename boost::detail::cv_traits_imp<BOOST_TT_AUX_CV_TRAITS_IMPL_PARAM(T)>::unqualified_type type; }; -#ifndef BOOST_NO_RVALUE_REFERENCES +#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES // // We can't filter out rvalue_references at the same level as // references or we get ambiguities from msvc: @@ -61,21 +55,6 @@ BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_2(typename T,std::size_t N,remove_cv,T vol BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_2(typename T,std::size_t N,remove_cv,T const volatile[N],T type[N]) #endif -#elif !BOOST_WORKAROUND(BOOST_MSVC,<=1300) - -namespace detail { -template <typename T> -struct remove_cv_impl -{ - typedef typename remove_volatile_impl< - typename remove_const_impl<T>::type - >::type type; -}; -} - -BOOST_TT_AUX_TYPE_TRAIT_DEF1(remove_cv,T,typename boost::detail::remove_cv_impl<T>::type) - -#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION } // namespace boost |