diff options
Diffstat (limited to 'boost/move/traits.hpp')
| -rw-r--r-- | boost/move/traits.hpp | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/boost/move/traits.hpp b/boost/move/traits.hpp index c4b3afe5bc..b48b8f61d2 100644 --- a/boost/move/traits.hpp +++ b/boost/move/traits.hpp @@ -11,19 +11,24 @@ //! \file -#ifndef BOOST_MOVE_MOVE_TRAITS_HPP -#define BOOST_MOVE_MOVE_TRAITS_HPP +#ifndef BOOST_MOVE_TRAITS_HPP +#define BOOST_MOVE_TRAITS_HPP + +#ifndef BOOST_CONFIG_HPP +# include <boost/config.hpp> +#endif +# +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif #include <boost/move/detail/config_begin.hpp> -#include <boost/type_traits/has_trivial_destructor.hpp> -#include <boost/type_traits/is_nothrow_move_constructible.hpp> -#include <boost/type_traits/is_nothrow_move_assignable.hpp> -#include <boost/type_traits/is_copy_constructible.hpp> -#include <boost/move/detail/meta_utils.hpp> #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES #include <boost/move/core.hpp> #endif +#include <boost/move/detail/meta_utils.hpp> +#include <boost/move/detail/type_traits.hpp> namespace boost { @@ -38,7 +43,7 @@ namespace boost { //! when inserted in containers. template <class T> struct has_trivial_destructor_after_move - : ::boost::has_trivial_destructor<T> + : ::boost::move_detail::is_trivially_destructible<T> {}; //! By default this traits returns @@ -48,8 +53,8 @@ struct has_trivial_destructor_after_move template <class T> struct has_nothrow_move { - static const bool value = boost::is_nothrow_move_constructible<T>::value && - boost::is_nothrow_move_assignable<T>::value; + static const bool value = boost::move_detail::is_nothrow_move_constructible<T>::value && + boost::move_detail::is_nothrow_move_assignable<T>::value; }; namespace move_detail { @@ -59,9 +64,9 @@ struct is_nothrow_move_constructible_or_uncopyable { //The standard requires is_nothrow_move_constructible for move_if_noexcept //but a user (usually in C++03) might specialize has_nothrow_move which includes it - static const bool value = boost::is_nothrow_move_constructible<T>::value || + static const bool value = is_nothrow_move_constructible<T>::value || has_nothrow_move<T>::value || - !boost::is_copy_constructible<T>::value; + !is_copy_constructible<T>::value; }; } //move_detail { @@ -69,4 +74,4 @@ struct is_nothrow_move_constructible_or_uncopyable #include <boost/move/detail/config_end.hpp> -#endif //#ifndef BOOST_MOVE_MOVE_TRAITS_HPP +#endif //#ifndef BOOST_MOVE_TRAITS_HPP |