Skip to content

Commit 77a9d5d

Browse files
almost a fix for move_assign.pass.cpp
1 parent c4a3034 commit 77a9d5d

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

libcxx/include/__tree

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,6 +1031,8 @@ public:
10311031
__sfinae_call_emplace_hint_unique(const_iterator __p, __get_node_value_type_t<_Tp>&& __value, false_type) {
10321032
// __emplace_hint_unique(__p, std::move(__value.first), std::move(__value.second));
10331033
// static_assert(false, "Can not emplace during constant evaluation if the key is `const MoveOnly` ");
1034+
// TODO: somehow flag this code if it executes during compile time
1035+
10341036
(void)__p;
10351037
(void)__value;
10361038
}
@@ -1053,11 +1055,11 @@ public:
10531055
#if _LIBCPP_STD_VER >= 26
10541056
if (__libcpp_is_constant_evaluated()) {
10551057
// static_assert(std::same_as_v<decltype(__value.first), double>);
1056-
__emplace_hint_unique(__p, std::move(__value.first), std::move(__value.second));
1058+
// __emplace_hint_unique(__p, std::move(__value.first), std::move(__value.second));
10571059

1058-
// __sfinae_call_emplace_hint_unique(__p, std::move(__value),
1059-
// integral_constant<bool, is_copy_constructible<decltype(__value.first)>::value >()
1060-
// );
1060+
__sfinae_call_emplace_hint_unique(__p, std::move(__value),
1061+
integral_constant<bool, is_copy_constructible<decltype(__value.first)>::value >()
1062+
);
10611063
} else
10621064
#endif
10631065
{

0 commit comments

Comments
 (0)