diff -r f549fd9fbd8f -r 54565fd74e74 tests/test_hash_map.c
--- a/tests/test_hash_map.c	Wed Sep 18 00:02:18 2024 +0200
+++ b/tests/test_hash_map.c	Sat Sep 28 15:47:28 2024 +0200
@@ -242,7 +242,7 @@
 
         CxIterator iter = cxMapMutIterator(map);
         cx_foreach(CxMapEntry*, entry, iter) {
-            if (((char const *)entry->key->data)[4] % 2 == 1) cxIteratorFlagRemoval(iter);
+            if (((const char *)entry->key->data)[4] % 2 == 1) cxIteratorFlagRemoval(iter);
         }
         CX_TEST_ASSERT(map->collection.size == 3);
         CX_TEST_ASSERT(iter.index == map->collection.size);
@@ -438,7 +438,7 @@
 
         // note: we don't have a destructor here, so remove and detach are the same
         cxMapRemove(map, cx_str("test"));
-        char const *hallo = "hallo";
+        const char *hallo = "hallo";
         cxMapDetach(map, hallo);
         cxMapPut(map, cx_hash_key_str("key"), "value");
 
@@ -460,8 +460,8 @@
 }
 
 struct test_map_kv {
-    char const *key;
-    char const *value;
+    const char *key;
+    const char *value;
 };
 
 static struct test_map_kv const test_map_operations[] = {
@@ -499,7 +499,7 @@
 static size_t const test_map_reference_len =
         sizeof(test_map_reference) / sizeof(struct test_map_kv);
 
-static void test_map_reference_put(char const *key, char const* value) {
+static void test_map_reference_put(const char *key, const char *value) {
     for (size_t i = 0 ; i < test_map_reference_len ; i++) {
         if (0 == strcmp(key, test_map_reference[i].key)) {
             test_map_reference[i].value = value;
@@ -508,7 +508,7 @@
     }
 }
 
-static char const *test_map_reference_get(char const *key) {
+static const char *test_map_reference_get(const char *key) {
     for (size_t i = 0 ; i < test_map_reference_len ; i++) {
         if (0 == strcmp(key, test_map_reference[i].key)) {
             return test_map_reference[i].value;
@@ -517,10 +517,10 @@
     return NULL;
 }
 
-static char const *test_map_reference_remove(char const *key) {
+static const char *test_map_reference_remove(const char *key) {
     for (size_t i = 0 ; i < test_map_reference_len ; i++) {
         if (0 == strcmp(key, test_map_reference[i].key)) {
-            char const *ret = test_map_reference[i].value;
+            const char *ret = test_map_reference[i].value;
             test_map_reference[i].value = NULL;
             return ret;
         }
@@ -569,8 +569,8 @@
         CxIterator valiter = cxMapIteratorValues(map);
         CX_TEST_ASSERT(valiter.elem_size == map->collection.elem_size);
         CX_TEST_ASSERT(valiter.elem_count == map->collection.size);
-        char const** values = calloc(map->collection.size, sizeof(char const*));
-        cx_foreach(char const*, elem, valiter) {
+        const char ** values = calloc(map->collection.size, sizeof(const char *));
+        cx_foreach(const char *, elem, valiter) {
             values[valiter.index] = elem;
         }
         CX_TEST_ASSERT(valiter.index == map->collection.size);
@@ -595,7 +595,7 @@
         CX_TEST_ASSERT(pairiter.elem_count == map->collection.size);
         struct test_map_kv *pairs = calloc(map->collection.size, sizeof(struct test_map_kv));
         cx_foreach(CxMapEntry*, entry, pairiter) {
-            CxHashKey const *key = entry->key;
+            const CxHashKey *key = entry->key;
             pairs[pairiter.index].key = cx_strdup(cx_strn(key->data, key->len)).ptr;
             pairs[pairiter.index].value = entry->value;
         }
@@ -640,7 +640,7 @@
                 CX_TEST_ASSERT(0 == memcmp(kv.value, added, strlen(kv.value)));
             } else {
                 // execute a remove and verify that the removed element was returned (or NULL)
-                char const *found = test_map_reference_remove(kv.key);
+                const char *found = test_map_reference_remove(kv.key);
                 void *removed = cxMapRemoveAndGet(map, key);
                 CX_TEST_ASSERT(found == removed);
             }