From 00e00951b3de14514aa25f93b5e95e661467dafb Mon Sep 17 00:00:00 2001 From: isidorostsa Date: Thu, 28 Nov 2024 14:38:36 +0200 Subject: [PATCH] clang-format conflicts --- .../include/hpx/datastructures/detail/small_vector.hpp | 2 +- libs/core/datastructures/tests/unit/inplace_vector.cpp | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/core/datastructures/include/hpx/datastructures/detail/small_vector.hpp b/libs/core/datastructures/include/hpx/datastructures/detail/small_vector.hpp index db4faa5f0ef..2a4f4310dde 100644 --- a/libs/core/datastructures/include/hpx/datastructures/detail/small_vector.hpp +++ b/libs/core/datastructures/include/hpx/datastructures/detail/small_vector.hpp @@ -625,7 +625,7 @@ namespace hpx::detail { { auto target = small_vector(); - // we know target is indirect because we're increasing capacity + // we know target is indirect because we are increasing capacity target.reserve(s + count); // move everything [begin, pos[ diff --git a/libs/core/datastructures/tests/unit/inplace_vector.cpp b/libs/core/datastructures/tests/unit/inplace_vector.cpp index d03e568935b..579d725af07 100644 --- a/libs/core/datastructures/tests/unit/inplace_vector.cpp +++ b/libs/core/datastructures/tests/unit/inplace_vector.cpp @@ -344,7 +344,7 @@ namespace test { HPX_TEST_EQ(dist2, cont_b.size()); for (std::size_t i = 0; itcont_a != itcont_a_end; - ++itcont_a, ++itcont_b, ++i) + ++itcont_a, ++itcont_b, ++i) { HPX_TEST_EQ(*itcont_a, *itcont_b); } @@ -728,11 +728,11 @@ namespace test { HPX_ASSERT(false); } } - { + { inplace_vector v = {1, 2, 3, 4, 5}; try { - (void)v.at(6); + (void) v.at(6); } catch (std::out_of_range&) { @@ -742,8 +742,6 @@ namespace test { HPX_ASSERT(false); } } - - } } // namespace test