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

reverted 74c2ae627a and explicitly silenced VS warning

Browse Source
This commit is contained in:
joaquintides
2022-10-07 16:38:19 +02:00
parent 049a1ec8f6
commit 6be32f3ba4
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -959,14 +959,18 @@ public:
return *this; return *this;
} }
#if defined(BOOST_MSVC)
#pragma warning(push)
#pragma warning(disable:4127) /* conditional expression is constant */
#endif
table& operator=(table&& x) table& operator=(table&& x)
noexcept( noexcept(
alloc_traits::is_always_equal::value&& alloc_traits::is_always_equal::value&&
std::is_nothrow_move_assignable<Hash>::value&& std::is_nothrow_move_assignable<Hash>::value&&
std::is_nothrow_move_assignable<Pred>::value) std::is_nothrow_move_assignable<Pred>::value)
{ {
/* not constexpr to avoid constant conditional expression warnings in VS */ static constexpr auto pocma=
const auto pocma=
alloc_traits::propagate_on_container_move_assignment::value; alloc_traits::propagate_on_container_move_assignment::value;
/* Avoid using nested lambdas with a `this` capture as it seems to trigger /* Avoid using nested lambdas with a `this` capture as it seems to trigger
@@ -1019,6 +1023,10 @@ public:
return *this; return *this;
} }
#if defined(BOOST_MSVC)
#pragma warning(pop) /* C4127 */
#endif
allocator_type get_allocator()const noexcept{return al();} allocator_type get_allocator()const noexcept{return al();}
iterator begin()noexcept iterator begin()noexcept