[Bf-blender-cvs] [28dc3b0b84e] master: Cleanup: Move bmesh_iterators.c to C++

[Hans Goudey]

Commit: 28dc3b0b84ec9e3f48185dfd1452859d1b8b5087
Author: Hans Goudey
Date:   Sun Nov 13 22:43:59 2022 -0600
Branches: master
https://developer.blender.org/rB28dc3b0b84ec9e3f48185dfd1452859d1b8b5087

Cleanup: Move bmesh_iterators.c to C++

===================================================================

M	source/blender/bmesh/CMakeLists.txt
R095	source/blender/bmesh/intern/bmesh_iterators.c	source/blender/bmesh/intern/bmesh_iterators.cc

===================================================================

diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index 77223ecd1c7..0747035cef4 100644
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -73,7 +73,7 @@ set(SRC
   intern/bmesh_inline.h
   intern/bmesh_interp.c
   intern/bmesh_interp.h
-  intern/bmesh_iterators.c
+  intern/bmesh_iterators.cc
   intern/bmesh_iterators.h
   intern/bmesh_iterators_inline.h
   intern/bmesh_log.c
diff --git a/source/blender/bmesh/intern/bmesh_iterators.c b/source/blender/bmesh/intern/bmesh_iterators.cc
similarity index 95%
rename from source/blender/bmesh/intern/bmesh_iterators.c
rename to source/blender/bmesh/intern/bmesh_iterators.cc
index 9e98103fd5a..50aba872312 100644
--- a/source/blender/bmesh/intern/bmesh_iterators.c
+++ b/source/blender/bmesh/intern/bmesh_iterators.cc
@@ -154,13 +154,13 @@ void *BM_iter_as_arrayN(BMesh *bm,
   if (BM_iter_init(&iter, bm, itype, data) && iter.count > 0) {
     BMElem *ele;
     BMElem **array = iter.count > stack_array_size ?
-                         MEM_mallocN(sizeof(ele) * iter.count, __func__) :
-                         stack_array;
+                         static_cast<BMElem **>(MEM_mallocN(sizeof(ele) * iter.count, __func__)) :
+                         reinterpret_cast<BMElem **>(stack_array);
     int i = 0;
 
     *r_len = iter.count; /* set before iterating */
 
-    while ((ele = BM_iter_step(&iter))) {
+    while ((ele = static_cast<BMElem *>(BM_iter_step(&iter)))) {
       array[i++] = ele;
     }
     return array;
@@ -184,19 +184,21 @@ void *BMO_iter_as_arrayN(BMOpSlot slot_args[BMO_OP_MAX_SLOTS],
 
   BLI_assert(stack_array_size == 0 || (stack_array_size && stack_array));
 
-  if ((ele = BMO_iter_new(&iter, slot_args, slot_name, restrictmask)) && slot_len > 0) {
-    BMElem **array = slot_len > stack_array_size ? MEM_mallocN(sizeof(ele) * slot_len, __func__) :
-                                                   stack_array;
+  if ((ele = static_cast<BMElem *>(BMO_iter_new(&iter, slot_args, slot_name, restrictmask))) &&
+      slot_len > 0) {
+    BMElem **array = slot_len > stack_array_size ?
+                         static_cast<BMElem **>(MEM_mallocN(sizeof(ele) * slot_len, __func__)) :
+                         reinterpret_cast<BMElem **>(stack_array);
     int i = 0;
 
     do {
       array[i++] = ele;
-    } while ((ele = BMO_iter_step(&iter)));
+    } while ((ele = static_cast<BMElem *>(BMO_iter_step(&iter))));
     BLI_assert(i <= slot_len);
 
     if (i != slot_len) {
       if ((void **)array != stack_array) {
-        array = MEM_reallocN(array, sizeof(ele) * i);
+        array = static_cast<BMElem **>(MEM_reallocN(array, sizeof(ele) * i));
       }
     }
     *r_len = i;