X-Git-Url: https://git.donarmstrong.com/?p=rsem.git;a=blobdiff_plain;f=boost%2Ftype_traits%2Fis_volatile.hpp;fp=boost%2Ftype_traits%2Fis_volatile.hpp;h=c921c9ef3e92116760af1f3f034684b1f36e09b0;hp=e5312632003b3d96b12bf72775b1c158a5fc7ccb;hb=2d71eb92104693ca9baa5a2e1c23eeca776d8fd3;hpb=da57529b92adbb7ae74a89861cb39fb35ac7c62d diff --git a/boost/type_traits/is_volatile.hpp b/boost/type_traits/is_volatile.hpp index e531263..c921c9e 100644 --- a/boost/type_traits/is_volatile.hpp +++ b/boost/type_traits/is_volatile.hpp @@ -46,12 +46,12 @@ template struct is_volatile_rval_filter { #if BOOST_WORKAROUND(BOOST_MSVC, < 1400) - BOOST_STATIC_CONSTANT(bool, value = ::boost::detail::cv_traits_imp::type*>::is_volatile); + BOOST_STATIC_CONSTANT(bool, value = ::boost::detail::cv_traits_imp::type*>::is_volatile); #else - BOOST_STATIC_CONSTANT(bool, value = ::boost::detail::cv_traits_imp::is_volatile); + BOOST_STATIC_CONSTANT(bool, value = ::boost::detail::cv_traits_imp::is_volatile); #endif }; -#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: @@ -59,7 +59,7 @@ struct is_volatile_rval_filter template struct is_volatile_rval_filter { - BOOST_STATIC_CONSTANT(bool, value = false); + BOOST_STATIC_CONSTANT(bool, value = false); }; #endif } @@ -94,7 +94,7 @@ no_type is_volatile_tester(void const*); template struct is_volatile_helper - : ::boost::type_traits::false_result + : public ::boost::type_traits::false_result { }; @@ -124,7 +124,7 @@ struct is_volatile_helper template struct is_volatile_impl - : is_volatile_helper< + : public is_volatile_helper< is_reference::value , is_array::value >::template result_