1.1 --- a/tests/test_map.cpp Thu Apr 20 19:13:25 2023 +0200 1.2 +++ b/tests/test_map.cpp Fri Apr 21 18:38:18 2023 +0200 1.3 @@ -74,7 +74,7 @@ 1.4 auto keyiter = cxMapIteratorKeys(map); 1.5 std::unordered_set<std::string> keys; 1.6 cx_foreach(CxHashKey*, elem, keyiter) { 1.7 - keys.insert(std::string(elem->data.cstr, elem->len)); 1.8 + keys.insert(std::string(reinterpret_cast<char const*>(elem->data), elem->len)); 1.9 } 1.10 EXPECT_EQ(keyiter.index, map->size); 1.11 ASSERT_EQ(keys.size(), map->size); 1.12 @@ -103,7 +103,7 @@ 1.13 auto pairiter = cxMapIterator(map); 1.14 std::unordered_map<std::string, std::string> pairs; 1.15 cx_foreach(CxMapEntry*, entry, pairiter) { 1.16 - pairs[std::string(entry->key->data.cstr, entry->key->len)] = std::string((char *) entry->value); 1.17 + pairs[std::string(reinterpret_cast<char const*>(entry->key->data), entry->key->len)] = std::string((char *) entry->value); 1.18 } 1.19 EXPECT_EQ(pairiter.index, map->size); 1.20 ASSERT_EQ(pairs.size(), refmap.size()); 1.21 @@ -214,7 +214,7 @@ 1.22 1.23 auto iter = cxMapMutIterator(map); 1.24 cx_foreach(CxMapEntry*, entry, iter) { 1.25 - if (entry->key->data.cstr[4] % 2 == 1) cxIteratorFlagRemoval(iter); 1.26 + if (reinterpret_cast<char const*>(entry->key->data)[4] % 2 == 1) cxIteratorFlagRemoval(iter); 1.27 } 1.28 EXPECT_EQ(map->size, 3); 1.29 EXPECT_EQ(iter.index, map->size); 1.30 @@ -405,7 +405,7 @@ 1.31 { 1.32 auto iter = cxMapMutIteratorKeys(map); 1.33 cx_foreach(CxHashKey*, key, iter) { 1.34 - if (key->data.cstr[4] == '1') cxIteratorFlagRemoval(iter); 1.35 + if (reinterpret_cast<char const*>(key->data)[4] == '1') cxIteratorFlagRemoval(iter); 1.36 } 1.37 } 1.38 {