Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Martín Lucas Golini
2026-03-14 17:55:38 -03:00

View File

@@ -405,7 +405,7 @@ class svector {
auto erase_checked_end(T const* cfrom, T const* to) -> T* {
auto* const erase_begin = const_cast<T*>(cfrom); // NOLINT(cppcoreguidelines-pro-type-const-cast)
auto* const container_end = data<D>() + size<D>();
auto* const erase_end = std::min(const_cast<T*>(to), container_end); // NOLINT(cppcoreguidelines-pro-type-const-cast)
auto* const erase_end = (std::min)(const_cast<T*>(to), container_end); // NOLINT(cppcoreguidelines-pro-type-const-cast)
std::move(erase_end, container_end, erase_begin);
auto const num_erased = std::distance(erase_begin, erase_end);
@@ -466,10 +466,10 @@ class svector {
// 1. uninitialized moves
auto const num_moves = std::distance(source_begin, source_end);
auto const target_end = target_begin + num_moves;
auto const num_uninitialized_move = std::min(num_moves, std::distance(source_end, target_end));
auto const num_uninitialized_move = (std::min)(num_moves, std::distance(source_end, target_end));
std::uninitialized_move(source_end - num_uninitialized_move, source_end, target_end - num_uninitialized_move);
std::move_backward(source_begin, source_end - num_uninitialized_move, target_end - num_uninitialized_move);
std::destroy(source_begin, std::min(source_end, target_begin));
std::destroy(source_begin, (std::min)(source_end, target_begin));
}
template <direction D>