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

refactored move assignment to silence warnings

Browse Source
This commit is contained in:
joaquintides
2022-10-05 10:05:10 +02:00
parent 4d0f698937
commit 48816135df
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1035,16 +1035,6 @@ public:
return *this; return *this;
} }
#if defined(BOOST_MSVC)
#pragma warning(push)
#pragma warning(disable:4297) /* throw inside noexcept function */
#endif
#if defined(BOOST_GCC)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wterminate"
#endif
table& operator=(table&& x) table& operator=(table&& x)
noexcept( noexcept(
alloc_traits::is_always_equal::value&& alloc_traits::is_always_equal::value&&
@ -1066,7 +1056,12 @@ public:
swap(arrays,x.arrays); swap(arrays,x.arrays);
swap(ml,x.ml); swap(ml,x.ml);
} }
else{ else if_constexpr<!alloc_traits::is_always_equal::value>([&,this]{
/* The check above is redundant: we're setting up a compile-time
* barrier so that the compiler is convinced we're not throwing
* under noexcept(true) conditions.
*/
reserve(x.size()); reserve(x.size());
BOOST_TRY{ BOOST_TRY{
/* This works because subsequent x.clear() does not depend on the /* This works because subsequent x.clear() does not depend on the
@ -1083,19 +1078,11 @@ public:
} }
BOOST_CATCH_END BOOST_CATCH_END
x.clear(); x.clear();
} });
} }
return *this; return *this;
} }
#if defined(BOOST_GCC)
#pragma GCC diagnostic pop
#endif
#if defined(BOOST_MSVC)
#pragma warning(pop) /* C4297 */
#endif
allocator_type get_allocator()const noexcept{return al();} allocator_type get_allocator()const noexcept{return al();}
iterator begin()noexcept iterator begin()noexcept