Merge branch 'develop'

doc/move.qbk

@@ -762,6 +762,13 @@ Many thanks to all boosters that have tested, reviewed and improved the library.
 
 [section:release_notes Release Notes]
 
+[section:release_notes_boost_1_58_01 Boost 1.58.1 Release]
+
+   *  Fixed bug:
+      * [@https://svn.boost.org/trac/boost/ticket/11229 Trac #11229: ['"vector incorrectly copies move-only objects using memcpy"]],
+
+[endsect]
+
 [section:release_notes_boost_1_58_00 Boost 1.58 Release]
 
 *  Added [macroref BOOST_MOVE_BASE BOOST_MOVE_BASE] utility.

include/boost/move/detail/type_traits.hpp

@@ -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

test/unique_ptr_types.cpp

@@ -12,6 +12,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #include <boost/move/utility_core.hpp>
 #include <boost/move/unique_ptr.hpp>
+#include <boost/move/detail/type_traits.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/core/lightweight_test.hpp>
 
@@ -150,6 +151,11 @@ void test()
 ////////////////////////////////
 //             main
 ////////////////////////////////
+
+#if __cplusplus >= 201103L
+#include <memory>
+#endif
+
 int main()
 {
    //General
@@ -157,6 +163,19 @@ int main()
    unique_ptr_deleter_type::test();
    unique_ptr_element_type::test();
 
+   typedef bml::unique_ptr<int> unique_ptr_t;
+   BOOST_STATIC_ASSERT(!(boost::move_detail::is_copy_constructible<unique_ptr_t>::value));
+   BOOST_STATIC_ASSERT(!(boost::move_detail::is_copy_assignable<unique_ptr_t>::value));
+   BOOST_STATIC_ASSERT(!(boost::move_detail::is_trivially_copy_constructible<unique_ptr_t>::value));
+   BOOST_STATIC_ASSERT(!(boost::move_detail::is_trivially_copy_assignable<unique_ptr_t>::value));
+   #if __cplusplus >= 201103L
+   typedef std::unique_ptr<int> std_unique_ptr_t;
+   BOOST_STATIC_ASSERT(!(boost::move_detail::is_copy_constructible<std_unique_ptr_t>::value));
+   BOOST_STATIC_ASSERT(!(boost::move_detail::is_copy_assignable<std_unique_ptr_t>::value));
+   BOOST_STATIC_ASSERT(!(boost::move_detail::is_trivially_copy_constructible<std_unique_ptr_t>::value));
+   BOOST_STATIC_ASSERT(!(boost::move_detail::is_trivially_copy_assignable<std_unique_ptr_t>::value));
+   #endif
+
    //Test results
    return boost::report_errors();