Mercurial > hg > ucx / changeset

     1.1 --- a/src/cx/hash_key.h	Sun Nov 06 14:17:33 2022 +0100
     1.2 +++ b/src/cx/hash_key.h	Sun Nov 06 14:46:59 2022 +0100
     1.3 @@ -50,9 +50,10 @@
     1.4      union {
     1.5          unsigned char *bytes;
     1.6          unsigned char const *cbytes;
     1.7 +        char *str;
     1.8          char const *cstr;
     1.9 -        char *str;
    1.10          void *obj;
    1.11 +        void const *cobj;
    1.12      } data;
    1.13      /**
    1.14       * The key data length.
    1.15 @@ -114,7 +115,7 @@
    1.16   */
    1.17  __attribute__((__warn_unused_result__))
    1.18  CxHashKey cx_hash_key(
    1.19 -        void *obj,
    1.20 +        void const *obj,
    1.21          size_t len
    1.22  );
    1.23  

     2.1 --- a/src/hash_key.c	Sun Nov 06 14:17:33 2022 +0100
     2.2 +++ b/src/hash_key.c	Sun Nov 06 14:46:59 2022 +0100
     2.3 @@ -96,11 +96,11 @@
     2.4  }
     2.5  
     2.6  CxHashKey cx_hash_key(
     2.7 -        void *obj,
     2.8 +        void const *obj,
     2.9          size_t len
    2.10  ) {
    2.11      CxHashKey key;
    2.12 -    key.data.obj = obj;
    2.13 +    key.data.cobj = obj;
    2.14      key.len = len;
    2.15      cx_hash_murmur(&key);
    2.16      return key;

     3.1 --- a/test/test_hash_key.cpp	Sun Nov 06 14:17:33 2022 +0100
     3.2 +++ b/test/test_hash_key.cpp	Sun Nov 06 14:46:59 2022 +0100
     3.3 @@ -37,7 +37,8 @@
     3.4      auto str_key = cx_hash_key_str(str);
     3.5      auto bytes_key = cx_hash_key_bytes(
     3.6              reinterpret_cast<unsigned char const *>(str), len);
     3.7 -    auto obj_key = cx_hash_key((void *) str, len);
     3.8 +    auto obj_key = cx_hash_key(
     3.9 +            reinterpret_cast<void const *>(str), len);
    3.10  
    3.11      EXPECT_EQ(str_key.hash, bytes_key.hash);
    3.12      EXPECT_EQ(obj_key.hash, bytes_key.hash);