From d8bc38f154325f81f05c1fc17bc3605706946525 Mon Sep 17 00:00:00 2001 From: Christian Mazakas Date: Wed, 12 Apr 2023 14:41:36 -0700 Subject: [PATCH] Clean up tag dispatch for group_type copy assignment --- include/boost/unordered/detail/foa/concurrent_table.hpp | 4 +--- include/boost/unordered/detail/foa/core.hpp | 7 +------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/include/boost/unordered/detail/foa/concurrent_table.hpp b/include/boost/unordered/detail/foa/concurrent_table.hpp index db09b9ca..04168d82 100644 --- a/include/boost/unordered/detail/foa/concurrent_table.hpp +++ b/include/boost/unordered/detail/foa/concurrent_table.hpp @@ -174,9 +174,7 @@ struct atomic_integral void operator&=(Integral m){n.fetch_and(m,std::memory_order_relaxed);} atomic_integral& operator=(atomic_integral const& rhs) { - if(this!=&rhs){ - n.store(rhs.n.load(std::memory_order_relaxed),std::memory_order_relaxed); - } + n.store(rhs.n.load(std::memory_order_relaxed),std::memory_order_relaxed); return *this; } diff --git a/include/boost/unordered/detail/foa/core.hpp b/include/boost/unordered/detail/foa/core.hpp index 0c26699b..eff1ccb6 100644 --- a/include/boost/unordered/detail/foa/core.hpp +++ b/include/boost/unordered/detail/foa/core.hpp @@ -1833,12 +1833,7 @@ private: void copy_groups_array_from(const table_core& x) { copy_groups_array_from(x, std::integral_constant::value -#else - std::is_trivially_copyable::value -#endif + std::is_trivially_copy_assignable::value >{} ); }