From 15f3cf7f8f956a6372b6a99788b622946ba3d1e5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 26 Sep 2022 09:53:49 +1000 Subject: Cleanup: replace C-style casts with functional casts for numeric types Some changes missed from f68cfd6bb078482c4a779a6e26a56e2734edb5b8. --- source/blender/blenlib/tests/BLI_polyfill_2d_test.cc | 4 ++-- source/blender/blenlib/tests/BLI_stack_cxx_test.cc | 2 +- source/blender/blenlib/tests/BLI_vector_test.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/blenlib') diff --git a/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc b/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc index 95fd664217f..f3b66bedf88 100644 --- a/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc +++ b/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc @@ -108,13 +108,13 @@ static void test_polyfill_topology(const float /*poly*/[][2], const uint v2 = (i + 1) % poly_num; void **p = BLI_edgehash_lookup_p(edgehash, v1, v2); EXPECT_NE((void *)p, nullptr); - EXPECT_EQ((intptr_t)*p, 1); + EXPECT_EQ(intptr_t(*p), 1); } for (ehi = BLI_edgehashIterator_new(edgehash), i = 0; BLI_edgehashIterator_isDone(ehi) == false; BLI_edgehashIterator_step(ehi), i++) { void **p = BLI_edgehashIterator_getValue_p(ehi); - EXPECT_TRUE(ELEM((intptr_t)*p, 1, 2)); + EXPECT_TRUE(ELEM(intptr_t(*p), 1, 2)); } BLI_edgehashIterator_free(ehi); diff --git a/source/blender/blenlib/tests/BLI_stack_cxx_test.cc b/source/blender/blenlib/tests/BLI_stack_cxx_test.cc index 768d7199f68..13d417d4374 100644 --- a/source/blender/blenlib/tests/BLI_stack_cxx_test.cc +++ b/source/blender/blenlib/tests/BLI_stack_cxx_test.cc @@ -191,7 +191,7 @@ TEST(stack, OveralignedValues) Stack, 2> stack; for (int i = 0; i < 100; i++) { stack.push({}); - EXPECT_EQ((uintptr_t)&stack.peek() % 512, 0); + EXPECT_EQ(uintptr_t(&stack.peek()) % 512, 0); } } diff --git a/source/blender/blenlib/tests/BLI_vector_test.cc b/source/blender/blenlib/tests/BLI_vector_test.cc index 53e8cd1047b..2dd220f562b 100644 --- a/source/blender/blenlib/tests/BLI_vector_test.cc +++ b/source/blender/blenlib/tests/BLI_vector_test.cc @@ -644,7 +644,7 @@ TEST(vector, OveralignedValues) Vector, 2> vec; for (int i = 0; i < 100; i++) { vec.append({}); - EXPECT_EQ((uintptr_t)&vec.last() % 512, 0); + EXPECT_EQ(uintptr_t(&vec.last()) % 512, 0); } } -- cgit v1.2.3