diff --git a/unit_test/dynarray_construct_assignop_swap_gtest.cpp b/unit_test/dynarray_construct_assignop_swap_gtest.cpp index 281ae158..b84ff886 100644 --- a/unit_test/dynarray_construct_assignop_swap_gtest.cpp +++ b/unit_test/dynarray_construct_assignop_swap_gtest.cpp @@ -497,7 +497,7 @@ void testAssignMoveElements() EXPECT_EQ(capBefore, a.capacity()); ASSERT_EQ(na, ssize(b)); - for (unsigned i{}; i < as_unsigned(na); ++i) + for (int i = 0; i < na; ++i) EXPECT_TRUE(b[i].hasValue() and *b[i] == i + 0.5); } EXPECT_EQ(T::nConstructions, T::nDestruct); diff --git a/unit_test/dynarray_mutate_gtest.cpp b/unit_test/dynarray_mutate_gtest.cpp index ab456fb6..f75eb1bb 100644 --- a/unit_test/dynarray_mutate_gtest.cpp +++ b/unit_test/dynarray_mutate_gtest.cpp @@ -394,7 +394,7 @@ TEST_F(dynarrayTest, appendNonForwardRange) EXPECT_EQ(it, end); EXPECT_EQ(3u, dest.size()); for (int i = 0; i < 3; ++i) - EXPECT_EQ( i + 1, dest[oel::as_unsigned(i)] ); + EXPECT_EQ(i + 1, dest[i]); } #endif @@ -466,8 +466,8 @@ TEST_F(dynarrayTest, insertR) } if (dest.size() > initSize) { - for (size_t i{}; i < oel::as_unsigned(countThrow); ++i) - EXPECT_TRUE( *toInsert[i] == *dest[i + oel::as_unsigned(insertOffset)] ); + for (ptrdiff_t i{}; i < countThrow; ++i) + EXPECT_TRUE( *toInsert[oel::as_unsigned(i)] == *dest[i + insertOffset] ); } if (insertOffset == 0) { @@ -520,7 +520,7 @@ TEST_F(dynarrayTest, emplace) { dest.emplace(dest.begin() + insertOffset); EXPECT_EQ(initSize + 1, ssize(dest)); - EXPECT_FALSE( dest.at(oel::as_unsigned(insertOffset)).hasValue() ); + EXPECT_FALSE( dest.at(insertOffset).hasValue() ); } if (insertOffset == 0) {