From d31ce6895e4a9bff2681f1ffa30ac1881f9f143d Mon Sep 17 00:00:00 2001 From: Ole Erik Peistorpet Date: Sun, 2 Jun 2024 15:09:08 +0200 Subject: [PATCH] Fixed a few more Wsign-conversion warnings --- dynarray.h | 2 +- unit_test/dynarray_mutate_gtest.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dynarray.h b/dynarray.h index f8716795..d1ee9439 100644 --- a/dynarray.h +++ b/dynarray.h @@ -27,7 +27,7 @@ is_trivially_relocatable specify_trivial_relocate(dynarray); //! Overloads generic unordered_erase(RandomAccessContainer &, Integral) (in range_algo.h) template< typename T, typename A > inline -void unordered_erase(dynarray & d, size_t index) { d.unordered_erase(d.begin() + index); } +void unordered_erase(dynarray & d, ptrdiff_t index) { d.unordered_erase(d.begin() + index); } #if OEL_MEM_BOUND_DEBUG_LVL inline namespace debug diff --git a/unit_test/dynarray_mutate_gtest.cpp b/unit_test/dynarray_mutate_gtest.cpp index 6d1bef03..4826b644 100644 --- a/unit_test/dynarray_mutate_gtest.cpp +++ b/unit_test/dynarray_mutate_gtest.cpp @@ -440,10 +440,10 @@ TEST_F(dynarrayTest, insertRTrivial) TEST_F(dynarrayTest, insertR) { - size_t const initSize = 2; + constexpr size_t initSize{2}; std::array const toInsert{TrivialRelocat{-1}, TrivialRelocat{-2}}; for (auto nReserve : {initSize, initSize + toInsert.size()}) - for (size_t insertOffset = 0; insertOffset <= initSize; ++insertOffset) + for (ptrdiff_t insertOffset = 0; insertOffset <= oel::as_signed(initSize); ++insertOffset) for (unsigned countThrow = 0; countThrow <= toInsert.size(); ++countThrow) { { dynarray dest(oel::reserve, nReserve); @@ -465,8 +465,8 @@ TEST_F(dynarrayTest, insertR) } if (dest.size() > initSize) { - for (unsigned i = 0; i < countThrow; ++i) - EXPECT_TRUE( *toInsert[i] == *dest[i + insertOffset] ); + for (size_t i{}; i < countThrow; ++i) + EXPECT_TRUE( *toInsert[i] == *dest[i + oel::as_unsigned(insertOffset)] ); } if (insertOffset == 0) {