Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-09-26 02:53:49 +0300
committerCampbell Barton <campbell@blender.org>2022-09-26 02:53:49 +0300
commit15f3cf7f8f956a6372b6a99788b622946ba3d1e5 (patch)
tree0ad4fe0aeb21ea4773088b0c92cc7bcb48d5e2a5 /source/blender/blenlib
parente746999aa937f6de638a339d52e1f2e494014919 (diff)
Cleanup: replace C-style casts with functional casts for numeric types
Some changes missed from f68cfd6bb078482c4a779a6e26a56e2734edb5b8.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/tests/BLI_polyfill_2d_test.cc4
-rw-r--r--source/blender/blenlib/tests/BLI_stack_cxx_test.cc2
-rw-r--r--source/blender/blenlib/tests/BLI_vector_test.cc2
3 files changed, 4 insertions, 4 deletions
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<AlignedBuffer<1, 512>, 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<AlignedBuffer<1, 512>, 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);
}
}