From 3a198b5f2b9097346a857d5590db043dd5695d77 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Fri, 9 Jun 2017 04:31:59 +0300 Subject: [PATCH] Use is_trivially_copyable instead of has_trivial_copy_* --- include/boost/variant2/variant.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/variant2/variant.hpp b/include/boost/variant2/variant.hpp index e1c715b..7c50317 100644 --- a/include/boost/variant2/variant.hpp +++ b/include/boost/variant2/variant.hpp @@ -361,7 +361,7 @@ template union variant_storage_impl { #if defined( BOOST_LIBSTDCXX_VERSION ) && BOOST_LIBSTDCXX_VERSION < 50000 - this->emplace_impl( mp_all, std::is_move_assignable, std::has_trivial_copy_assign..., std::is_move_assignable...>(), mp_size_t(), std::forward(a)... ); + this->emplace_impl( mp_all, std::is_trivially_copyable, std::is_move_assignable..., std::is_trivially_copyable...>(), mp_size_t(), std::forward(a)... ); #else @@ -505,7 +505,7 @@ template struct variant_base_impl #if defined( BOOST_LIBSTDCXX_VERSION ) && BOOST_LIBSTDCXX_VERSION < 50000 - this->emplace_impl( std::is_nothrow_constructible(), mp_all, std::is_move_constructible, std::has_trivial_copy_assign..., std::is_move_assignable...>(), std::forward(a)... ); + this->emplace_impl( std::is_nothrow_constructible(), mp_all, std::is_move_assignable..., std::is_trivially_copyable...>(), std::forward(a)... ); #else