diff -r 16e2a3391e88 -r d4baf4dd55c3 tests/test_iterator.c
--- a/tests/test_iterator.c	Thu May 23 18:21:36 2024 +0200
+++ b/tests/test_iterator.c	Thu May 23 19:29:14 2024 +0200
@@ -40,7 +40,7 @@
         CX_TEST_ASSERT(iter.index == 0);
         CX_TEST_ASSERT(iter.elem_size == sizeof(unsigned));
         CX_TEST_ASSERT(iter.elem_count == size);
-        CX_TEST_ASSERT(iter.src_handle == array);
+        CX_TEST_ASSERT(iter.src_handle.c == array);
         CX_TEST_ASSERT(iter.elem_handle == &array[0]);
         CX_TEST_ASSERT(cxIteratorValid(iter));
     }
@@ -52,7 +52,7 @@
         CX_TEST_ASSERT(iter.index == 0);
         CX_TEST_ASSERT(iter.elem_size == sizeof(unsigned));
         CX_TEST_ASSERT(iter.elem_count == 0);
-        CX_TEST_ASSERT(iter.src_handle == NULL);
+        CX_TEST_ASSERT(iter.src_handle.c == NULL);
         CX_TEST_ASSERT(iter.elem_handle == NULL);
         CX_TEST_ASSERT(!cxIteratorValid(iter));
     }
@@ -71,7 +71,7 @@
             CX_TEST_ASSERT(*e == expected);
             CX_TEST_ASSERT(iter.elem_size == sizeof(unsigned));
             CX_TEST_ASSERT(iter.elem_count == size);
-            CX_TEST_ASSERT(iter.src_handle == array);
+            CX_TEST_ASSERT(iter.src_handle.c == array);
             CX_TEST_ASSERT(iter.elem_handle == &array[expected]);
             expected++;
         }
@@ -96,7 +96,7 @@
             0, 2, 4, 6, 8, 10, 12, 14, 16, 18
     };
 
-    CxMutIterator iter = cxMutIterator(array, sizeof(unsigned), size, true);
+    CxIterator iter = cxMutIterator(array, sizeof(unsigned), size, true);
     CX_TEST_DO {
         unsigned expected = 0;
         cx_foreach(unsigned *, e, iter) {
@@ -104,7 +104,7 @@
             CX_TEST_ASSERT(iter.index == indices[expected]);
             CX_TEST_ASSERT(iter.elem_size == sizeof(unsigned));
             CX_TEST_ASSERT(iter.elem_count == elem_counts[expected]);
-            CX_TEST_ASSERT(iter.src_handle == array);
+            CX_TEST_ASSERT(iter.src_handle.m == array);
             CX_TEST_ASSERT(iter.elem_handle == &array[indices[expected]]);
             expected++;
             if (expected % 2 == 0) {
@@ -141,7 +141,7 @@
             15, 6, 14, 7, 13, 8, 12, 9, 11, 10
     };
 
-    CxMutIterator iter = cxMutIterator(array, sizeof(unsigned), size, false);
+    CxIterator iter = cxMutIterator(array, sizeof(unsigned), size, false);
     CX_TEST_DO {
         unsigned expected = 0;
         cx_foreach(unsigned *, e, iter) {
@@ -149,7 +149,7 @@
             CX_TEST_ASSERT(iter.index == indices[expected]);
             CX_TEST_ASSERT(iter.elem_size == sizeof(unsigned));
             CX_TEST_ASSERT(iter.elem_count == elem_counts[expected]);
-            CX_TEST_ASSERT(iter.src_handle == array);
+            CX_TEST_ASSERT(iter.src_handle.m == array);
             CX_TEST_ASSERT(iter.elem_handle == &array[indices[expected]]);
             expected++;
             if (expected % 2 == 0) {