7 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/icons.cc b/source/blender/blenkernel/intern/icons.cc
index 82023c23ca5..dc1d23de7e0 100644
--- a/source/blender/blenkernel/intern/icons.cc
+++ b/source/blender/blenkernel/intern/icons.cc
@@ -971,8 +971,8 @@ struct Icon_Geom *BKE_icon_geom_from_memory(uchar *data, size_t data_len)
   p += 4;
 
   struct Icon_Geom *geom = (struct Icon_Geom *)MEM_mallocN(sizeof(*geom), __func__);
-  geom->coords_range[0] = (int)*p++;
-  geom->coords_range[1] = (int)*p++;
+  geom->coords_range[0] = int(*p++);
+  geom->coords_range[1] = int(*p++);
   /* x, y ignored for now */
   p += 2;
 
diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc
index 7959ab845e8..6d10d31e976 100644
--- a/source/blender/blenkernel/intern/scene.cc
+++ b/source/blender/blenkernel/intern/scene.cc
@@ -159,8 +159,8 @@ static void scene_init_data(ID *id)
   scene->unit.length_unit = uchar(BKE_unit_base_of_type_get(USER_UNIT_METRIC, B_UNIT_LENGTH));
   scene->unit.mass_unit = uchar(BKE_unit_base_of_type_get(USER_UNIT_METRIC, B_UNIT_MASS));
   scene->unit.time_unit = uchar(BKE_unit_base_of_type_get(USER_UNIT_METRIC, B_UNIT_TIME));
-  scene->unit.temperature_unit = (uchar)BKE_unit_base_of_type_get(USER_UNIT_METRIC,
-                                                                  B_UNIT_TEMPERATURE);
+  scene->unit.temperature_unit = uchar(
+      BKE_unit_base_of_type_get(USER_UNIT_METRIC, B_UNIT_TEMPERATURE));
 
   /* Anti-Aliasing threshold. */
   scene->grease_pencil_settings.smaa_threshold = 1.0f;
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);
   }
 }
 
diff --git a/source/blender/bmesh/tests/bmesh_core_test.cc b/source/blender/bmesh/tests/bmesh_core_test.cc
index 000e4cf92a2..a0f6ea2706b 100644
--- a/source/blender/bmesh/tests/bmesh_core_test.cc
+++ b/source/blender/bmesh/tests/bmesh_core_test.cc
@@ -24,7 +24,7 @@ TEST(bmesh_core, BMVertCreate)
   EXPECT_EQ(bv1->co[1], 2.0f);
   EXPECT_EQ(bv1->co[2], 0.0f);
   EXPECT_TRUE(is_zero_v3(bv1->no));
-  EXPECT_EQ(bv1->head.htype, (char)BM_VERT);
+  EXPECT_EQ(bv1->head.htype, char(BM_VERT));
   EXPECT_EQ(bv1->head.hflag, 0);
   EXPECT_EQ(bv1->head.api_flag, 0);
   bv2 = BM_vert_create(bm, nullptr, nullptr, BM_CREATE_NOP);
diff --git a/source/blender/draw/engines/overlay/overlay_armature.cc b/source/blender/draw/engines/overlay/overlay_armature.cc
index 903bcbb911e..dfbf4560271 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.cc
+++ b/source/blender/draw/engines/overlay/overlay_armature.cc
@@ -2241,7 +2241,7 @@ static void draw_armature_edit(ArmatureDrawContext *ctx)
        eBone = eBone->next, index += 0x10000) {
     if (eBone->layer & arm->layer) {
       if ((eBone->flag & BONE_HIDDEN_A) == 0) {
-        const int select_id = is_select ? index : (uint)-1;
+        const int select_id = is_select ? index : uint(-1);
         const short constflag = 0;
 
         /* catch exception for bone with hidden parent */
@@ -2378,7 +2378,7 @@ static void draw_armature_pose(ArmatureDrawContext *ctx)
                                (arm->flag & ARM_POSEMODE) && (bone->flag & BONE_SELECTED) &&
                                ((ob->base_flag & BASE_FROM_DUPLI) == 0) &&
                                (pchan->ikflag & (BONE_IK_XLIMIT | BONE_IK_ZLIMIT));
-        const int select_id = is_pose_select ? index : (uint)-1;
+        const int select_id = is_pose_select ? index : uint(-1);
         const short constflag = pchan->constflag;
 
         pchan_draw_data_init(pchan);