1.1 --- a/tests/test_iterator.c Thu May 23 18:21:36 2024 +0200
1.2 +++ b/tests/test_iterator.c Thu May 23 19:29:14 2024 +0200
1.3 @@ -40,7 +40,7 @@
1.4 CX_TEST_ASSERT(iter.index == 0);
1.5 CX_TEST_ASSERT(iter.elem_size == sizeof(unsigned));
1.6 CX_TEST_ASSERT(iter.elem_count == size);
1.7 - CX_TEST_ASSERT(iter.src_handle == array);
1.8 + CX_TEST_ASSERT(iter.src_handle.c == array);
1.9 CX_TEST_ASSERT(iter.elem_handle == &array[0]);
1.10 CX_TEST_ASSERT(cxIteratorValid(iter));
1.11 }
1.12 @@ -52,7 +52,7 @@
1.13 CX_TEST_ASSERT(iter.index == 0);
1.14 CX_TEST_ASSERT(iter.elem_size == sizeof(unsigned));
1.15 CX_TEST_ASSERT(iter.elem_count == 0);
1.16 - CX_TEST_ASSERT(iter.src_handle == NULL);
1.17 + CX_TEST_ASSERT(iter.src_handle.c == NULL);
1.18 CX_TEST_ASSERT(iter.elem_handle == NULL);
1.19 CX_TEST_ASSERT(!cxIteratorValid(iter));
1.20 }
1.21 @@ -71,7 +71,7 @@
1.22 CX_TEST_ASSERT(*e == expected);
1.23 CX_TEST_ASSERT(iter.elem_size == sizeof(unsigned));
1.24 CX_TEST_ASSERT(iter.elem_count == size);
1.25 - CX_TEST_ASSERT(iter.src_handle == array);
1.26 + CX_TEST_ASSERT(iter.src_handle.c == array);
1.27 CX_TEST_ASSERT(iter.elem_handle == &array[expected]);
1.28 expected++;
1.29 }
1.30 @@ -96,7 +96,7 @@
1.31 0, 2, 4, 6, 8, 10, 12, 14, 16, 18
1.32 };
1.33
1.34 - CxMutIterator iter = cxMutIterator(array, sizeof(unsigned), size, true);
1.35 + CxIterator iter = cxMutIterator(array, sizeof(unsigned), size, true);
1.36 CX_TEST_DO {
1.37 unsigned expected = 0;
1.38 cx_foreach(unsigned *, e, iter) {
1.39 @@ -104,7 +104,7 @@
1.40 CX_TEST_ASSERT(iter.index == indices[expected]);
1.41 CX_TEST_ASSERT(iter.elem_size == sizeof(unsigned));
1.42 CX_TEST_ASSERT(iter.elem_count == elem_counts[expected]);
1.43 - CX_TEST_ASSERT(iter.src_handle == array);
1.44 + CX_TEST_ASSERT(iter.src_handle.m == array);
1.45 CX_TEST_ASSERT(iter.elem_handle == &array[indices[expected]]);
1.46 expected++;
1.47 if (expected % 2 == 0) {
1.48 @@ -141,7 +141,7 @@
1.49 15, 6, 14, 7, 13, 8, 12, 9, 11, 10
1.50 };
1.51
1.52 - CxMutIterator iter = cxMutIterator(array, sizeof(unsigned), size, false);
1.53 + CxIterator iter = cxMutIterator(array, sizeof(unsigned), size, false);
1.54 CX_TEST_DO {
1.55 unsigned expected = 0;
1.56 cx_foreach(unsigned *, e, iter) {
1.57 @@ -149,7 +149,7 @@
1.58 CX_TEST_ASSERT(iter.index == indices[expected]);
1.59 CX_TEST_ASSERT(iter.elem_size == sizeof(unsigned));
1.60 CX_TEST_ASSERT(iter.elem_count == elem_counts[expected]);
1.61 - CX_TEST_ASSERT(iter.src_handle == array);
1.62 + CX_TEST_ASSERT(iter.src_handle.m == array);
1.63 CX_TEST_ASSERT(iter.elem_handle == &array[indices[expected]]);
1.64 expected++;
1.65 if (expected % 2 == 0) {
