diff -r 5d0244c6fa3e -r 2c2304622981 tests/test_map.cpp --- a/tests/test_map.cpp Thu Apr 20 19:13:25 2023 +0200 +++ b/tests/test_map.cpp Fri Apr 21 18:38:18 2023 +0200 @@ -74,7 +74,7 @@ auto keyiter = cxMapIteratorKeys(map); std::unordered_set keys; cx_foreach(CxHashKey*, elem, keyiter) { - keys.insert(std::string(elem->data.cstr, elem->len)); + keys.insert(std::string(reinterpret_cast(elem->data), elem->len)); } EXPECT_EQ(keyiter.index, map->size); ASSERT_EQ(keys.size(), map->size); @@ -103,7 +103,7 @@ auto pairiter = cxMapIterator(map); std::unordered_map pairs; cx_foreach(CxMapEntry*, entry, pairiter) { - pairs[std::string(entry->key->data.cstr, entry->key->len)] = std::string((char *) entry->value); + pairs[std::string(reinterpret_cast(entry->key->data), entry->key->len)] = std::string((char *) entry->value); } EXPECT_EQ(pairiter.index, map->size); ASSERT_EQ(pairs.size(), refmap.size()); @@ -214,7 +214,7 @@ auto iter = cxMapMutIterator(map); cx_foreach(CxMapEntry*, entry, iter) { - if (entry->key->data.cstr[4] % 2 == 1) cxIteratorFlagRemoval(iter); + if (reinterpret_cast(entry->key->data)[4] % 2 == 1) cxIteratorFlagRemoval(iter); } EXPECT_EQ(map->size, 3); EXPECT_EQ(iter.index, map->size); @@ -405,7 +405,7 @@ { auto iter = cxMapMutIteratorKeys(map); cx_foreach(CxHashKey*, key, iter) { - if (key->data.cstr[4] == '1') cxIteratorFlagRemoval(iter); + if (reinterpret_cast(key->data)[4] == '1') cxIteratorFlagRemoval(iter); } } {