luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/smcv/64-bit-hash' into 'main'

Browse Source 
ghash: Correctly retrieve low 32 bits of 64-bit values

Closes #2787

See merge request GNOME/glib!2994
This commit is contained in:
Philip Withnall 2022-10-24 20:22:15 +00:00
commit e33f23a6b5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glib/ghash.c
View File

@ -2496,7 +2496,9 @@ g_int64_equal (gconstpointer v1,
guint guint
g_int64_hash (gconstpointer v) g_int64_hash (gconstpointer v)
{ {
return (guint) ((const guint) (*(guint64 *) v >> 32)) ^ (*(const guint *) v); const guint64 *bits = v;
return (guint) ((*bits >> 32) ^ (*bits & 0xffffffffU));
} }
/** /**
@ -2537,5 +2539,8 @@ g_double_equal (gconstpointer v1,
guint guint
g_double_hash (gconstpointer v) g_double_hash (gconstpointer v)
{ {
return (guint) ((const guint) (*(guint64 *) v >> 32)) ^ (*(const guint *) v); /* Same as g_int64_hash() */
const guint64 *bits = v;
return (guint) ((*bits >> 32) ^ (*bits & 0xffffffffU));
} }