From 8a2f444761cc16f12a1565a433dc0a6058c15e3d Mon Sep 17 00:00:00 2001
From: Kohei Takahashi <flast@flast.jp>
Date: Tue, 8 May 2018 23:13:12 +0900
Subject: [PATCH] Fixed fallback traits condition

---
 .../fusion/support/detail/is_trivially_copyable.hpp   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/include/boost/fusion/support/detail/is_trivially_copyable.hpp b/include/boost/fusion/support/detail/is_trivially_copyable.hpp
index 24258d7c..5628cc45 100644
--- a/include/boost/fusion/support/detail/is_trivially_copyable.hpp
+++ b/include/boost/fusion/support/detail/is_trivially_copyable.hpp
@@ -35,10 +35,8 @@
 #   include <boost/type_traits/has_trivial_assign.hpp>
 #   include <boost/type_traits/has_trivial_copy.hpp>
 #   include <boost/type_traits/has_trivial_destructor.hpp>
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 #   include <boost/type_traits/has_trivial_move_assign.hpp>
 #   include <boost/type_traits/has_trivial_move_constructor.hpp>
-#endif
 #ifdef BOOST_FUSION_DETAIL_VOLATILE_SCALAR_IS_NON_TRIVIALLY_COPYABLE
 #   include <boost/mpl/not.hpp>
 #   include <boost/type_traits/is_volatile.hpp>
@@ -64,11 +62,10 @@ struct is_trivially_copyable_class
   : mpl::bool_<
         (has_trivial_copy<T>::value   || !is_copy_constructible<T>::value) &&
         (has_trivial_assign<T>::value || !is_copy_assignable<T>::value) &&
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-        (has_trivial_move_constructor<T>::value || !is_constructible<T, T&&>::value) &&
-        (has_trivial_move_assign<T>::value      || !is_assignable<T, T&&>::value) &&
-#endif // rv-ref
-        (is_constructible<T, T>::value || is_assignable<T, T>::value) &&
+        (has_trivial_move_constructor<T>::value || !is_constructible<T, T>::value) &&
+        (has_trivial_move_assign<T>::value      || !is_assignable<T, T>::value) &&
+        (is_copy_constructible<T>::value || is_copy_assignable<T>::value ||
+         is_constructible<T, T>::value   || is_assignable<T, T>::value) &&
         has_trivial_destructor<T>::value
     > { };