Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fixed compiler warnings in compact dict implementation on 32-bit platforms.

This commit is contained in:
Serhiy Storchaka 2016-09-10 21:34:43 +03:00
parent b0d497c072
commit 473e0e4dba
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Objects/dictobject.c
View File

@ -326,16 +326,16 @@ dk_get_index(PyDictKeysObject *keys, Py_ssize_t i)
int16_t *indices = keys->dk_indices.as_2;
ix = indices[i];
}
else if (s <= 0xffffffff) {
int32_t *indices = keys->dk_indices.as_4;
ix = indices[i];
}
#if SIZEOF_VOID_P > 4
else {
else if (s > 0xffffffff) {
int64_t *indices = keys->dk_indices.as_8;
ix = indices[i];
}
#endif
else {
int32_t *indices = keys->dk_indices.as_4;
ix = indices[i];
}
assert(ix >= DKIX_DUMMY);
return ix;
}
@ -358,17 +358,17 @@ dk_set_index(PyDictKeysObject *keys, Py_ssize_t i, Py_ssize_t ix)
assert(ix <= 0x7fff);
indices[i] = (int16_t)ix;
}
else if (s <= 0xffffffff) {
int32_t *indices = keys->dk_indices.as_4;
assert(ix <= 0x7fffffff);
indices[i] = (int32_t)ix;
}
#if SIZEOF_VOID_P > 4
else {
else if (s > 0xffffffff) {
int64_t *indices = keys->dk_indices.as_8;
indices[i] = ix;
}
#endif
else {
int32_t *indices = keys->dk_indices.as_4;
assert(ix <= 0x7fffffff);
indices[i] = (int32_t)ix;
}
}