From 2fc6fea44bed90fce87e366066c06c22b7fff6ff Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Wed, 8 Jul 2015 18:31:30 +0100 Subject: [PATCH] Add more missing checks for BOOST_NO_CXX11_RVALUE_REFERENCES, --- include/boost/type_traits/has_nothrow_destructor.hpp | 3 ++- include/boost/type_traits/has_trivial_copy.hpp | 2 ++ include/boost/type_traits/is_default_constructible.hpp | 2 ++ include/boost/type_traits/is_nothrow_move_assignable.hpp | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/boost/type_traits/has_nothrow_destructor.hpp b/include/boost/type_traits/has_nothrow_destructor.hpp index cd4821c..273eb9f 100644 --- a/include/boost/type_traits/has_nothrow_destructor.hpp +++ b/include/boost/type_traits/has_nothrow_destructor.hpp @@ -30,8 +30,9 @@ namespace boost{ template struct has_nothrow_destructor : public detail::has_nothrow_destructor_imp::value>{}; template struct has_nothrow_destructor : public has_nothrow_destructor{}; template struct has_nothrow_destructor : public integral_constant{}; +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) template struct has_nothrow_destructor : public integral_constant{}; - +#endif } #else diff --git a/include/boost/type_traits/has_trivial_copy.hpp b/include/boost/type_traits/has_trivial_copy.hpp index fc81dbe..26819b9 100644 --- a/include/boost/type_traits/has_trivial_copy.hpp +++ b/include/boost/type_traits/has_trivial_copy.hpp @@ -44,7 +44,9 @@ template <> struct has_trivial_copy : public false_type{}; #endif template struct has_trivial_copy : public false_type{}; +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) template struct has_trivial_copy : public false_type{}; +#endif template struct has_trivial_copy_constructor : public has_trivial_copy{}; diff --git a/include/boost/type_traits/is_default_constructible.hpp b/include/boost/type_traits/is_default_constructible.hpp index 51b681d..7fd63f8 100644 --- a/include/boost/type_traits/is_default_constructible.hpp +++ b/include/boost/type_traits/is_default_constructible.hpp @@ -35,7 +35,9 @@ namespace boost{ template struct is_default_constructible : public is_default_constructible{}; template struct is_default_constructible : public is_default_constructible{}; template struct is_default_constructible : public integral_constant{}; +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) template struct is_default_constructible : public integral_constant{}; +#endif template <> struct is_default_constructible : public integral_constant{}; template <> struct is_default_constructible : public integral_constant{}; template <> struct is_default_constructible : public integral_constant{}; diff --git a/include/boost/type_traits/is_nothrow_move_assignable.hpp b/include/boost/type_traits/is_nothrow_move_assignable.hpp index f45d20c..9755430 100644 --- a/include/boost/type_traits/is_nothrow_move_assignable.hpp +++ b/include/boost/type_traits/is_nothrow_move_assignable.hpp @@ -29,7 +29,9 @@ template struct is_nothrow_move_assignable : public false_typ template struct is_nothrow_move_assignable : public false_type{}; template struct is_nothrow_move_assignable : public false_type{}; template struct is_nothrow_move_assignable : public false_type{}; +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) template struct is_nothrow_move_assignable : public false_type{}; +#endif #elif !defined(BOOST_NO_CXX11_NOEXCEPT) && !defined(BOOST_NO_SFINAE_EXPR)