feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Update FOA containers to require nothrow swappability of Hash, KeyEqual members and ensure that throwing assertions uphold strong guarantee

Browse Source
This commit is contained in:
Christian Mazakas
2022-12-01 10:52:02 -08:00
parent 534170a942
commit b1d43d3ca5
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/boost/unordered/detail/foa.hpp
View File

@ -69,6 +69,12 @@
}while(0) }while(0)
#endif #endif
#define BOOST_UNORDERED_STATIC_ASSERT_HASH_PRED(Hash, Pred) \
static_assert(boost::is_nothrow_swappable<Hash>::value, \
"Template parameter Hash is required to be nothrow Swappable."); \
static_assert(boost::is_nothrow_swappable<Pred>::value, \
"Template parameter Pred is required to be nothrow Swappable");
namespace boost{ namespace boost{
namespace unordered{ namespace unordered{
namespace detail{ namespace detail{
@ -1412,16 +1418,15 @@ public:
void swap(table& x) void swap(table& x)
noexcept( noexcept(
alloc_traits::is_always_equal::value&& alloc_traits::propagate_on_container_swap::value||
boost::is_nothrow_swappable<Hash>::value&& alloc_traits::is_always_equal::value)
boost::is_nothrow_swappable<Pred>::value)
{ {
BOOST_UNORDERED_STATIC_ASSERT_HASH_PRED(Hash, Pred)
static constexpr auto pocs= static constexpr auto pocs=
alloc_traits::propagate_on_container_swap::value; alloc_traits::propagate_on_container_swap::value;
using std::swap; using std::swap;
swap(h(),x.h());
swap(pred(),x.pred());
if_constexpr<pocs>([&,this]{ if_constexpr<pocs>([&,this]{
swap_if<pocs>(al(),x.al()); swap_if<pocs>(al(),x.al());
}, },
@ -1429,6 +1434,9 @@ public:
BOOST_ASSERT(al()==x.al()); BOOST_ASSERT(al()==x.al());
(void)this; /* makes sure captured this is used */ (void)this; /* makes sure captured this is used */
}); });
swap(h(),x.h());
swap(pred(),x.pred());
swap(size_,x.size_); swap(size_,x.size_);
swap(arrays,x.arrays); swap(arrays,x.arrays);
swap(ml,x.ml); swap(ml,x.ml);
@ -2075,6 +2083,7 @@ private:
#undef BOOST_UNORDERED_ASSUME #undef BOOST_UNORDERED_ASSUME
#undef BOOST_UNORDERED_HAS_BUILTIN #undef BOOST_UNORDERED_HAS_BUILTIN
#undef BOOST_UNORDERED_STATIC_ASSERT_HASH_PRED
#ifdef BOOST_UNORDERED_LITTLE_ENDIAN_NEON #ifdef BOOST_UNORDERED_LITTLE_ENDIAN_NEON
#undef BOOST_UNORDERED_LITTLE_ENDIAN_NEON #undef BOOST_UNORDERED_LITTLE_ENDIAN_NEON
#endif #endif