feedc0de/boost_move
1
0
Fork 0
forked from boostorg/move
Code Pull Requests Activity

Fixed Trac #11229: vector incorrectly copies move-only objects using memcpy

Browse Source
This commit is contained in:
Ion Gaztañaga
2015-04-25 11:36:36 +02:00
parent a6d924e82e
commit 32f4d91cec
3 changed files with 78 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/move/detail/type_traits.hpp
+52 -2
View File
@@ -738,6 +738,46 @@ struct is_copy_constructible
static const bool value = sizeof(test(source<T>())) == sizeof(yes_type);
};
//////////////////////////////////////
// is_copy_assignable
//////////////////////////////////////
#if !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS) && !defined(BOOST_NO_CXX11_DECLTYPE) \
&& !defined(BOOST_INTEL_CXX_VERSION) && \
!(defined(BOOST_MSVC) && _MSC_VER == 1800)
#define BOOST_MOVE_TT_CXX11_IS_COPY_ASSIGNABLE
#endif
template <class T>
struct is_copy_assignable
{
// Intel compiler has problems with SFINAE for copy constructors and deleted functions:
//
// error: function *function_name* cannot be referenced -- it is a deleted function
// static boost::type_traits::yes_type test(T1&, decltype(T1(boost::declval<T1&>()))* = 0);
// ^
//
// MSVC 12.0 (Visual 2013) has problems when the copy constructor has been deleted. See:
// https://connect.microsoft.com/VisualStudio/feedback/details/800328/std-is-copy-constructible-is-broken
#if defined(BOOST_MOVE_TT_CXX11_IS_COPY_ASSIGNABLE)
typedef char yes_type;
struct no_type { char dummy[2]; };
template <class U> static typename add_reference<U>::type source();
template <class U> static decltype(source<U&>() = source<const U&>(), yes_type() ) test(int);
template <class> static no_type test(...);
static const bool value = sizeof(test<T>(0)) == sizeof(yes_type);
#else
static typename add_reference<T>::type produce();
template <class T1>
static no_type test(T1&, typename T1::boost_move_no_copy_constructor_or_assign* = 0);
static yes_type test(...);
static const bool value = sizeof(test(produce())) == sizeof(yes_type);
#endif
};
//////////////////////////////////////
// is_trivially_destructible
//////////////////////////////////////
@@ -757,7 +797,12 @@ struct is_trivially_default_constructible
//////////////////////////////////////
template<class T>
struct is_trivially_copy_constructible
{ static const bool value = BOOST_MOVE_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T); };
{
//In several compilers BOOST_MOVE_IS_TRIVIALLY_COPY_CONSTRUCTIBLE return true even with
//deleted copy constructors so make sure the type is copy constructible.
static const bool value = ::boost::move_detail::is_copy_constructible<T>::value &&
BOOST_MOVE_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T);
};
//////////////////////////////////////
// is_trivially_move_constructible
@@ -771,7 +816,12 @@ struct is_trivially_move_constructible
//////////////////////////////////////
template<class T>
struct is_trivially_copy_assignable
{ static const bool value = BOOST_MOVE_IS_TRIVIALLY_COPY_ASSIGNABLE(T); };
{
//In several compilers BOOST_MOVE_IS_TRIVIALLY_COPY_CONSTRUCTIBLE return true even with
//deleted copy constructors so make sure the type is copy constructible.
static const bool value = ::boost::move_detail::is_copy_assignable<T>::value &&
BOOST_MOVE_IS_TRIVIALLY_COPY_ASSIGNABLE(T);
};
//////////////////////////////////////
// is_trivially_move_assignable