summaryrefslogtreecommitdiffstats
path: root/Objects/tupleobject.c
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2012-12-11 02:34:09 (GMT)
committerGregory P. Smith <greg@krypto.org>2012-12-11 02:34:09 (GMT)
commita6be61ec71be600e1d270aea17f1d90dccf6088b (patch)
tree251b15c76e041863af98e9dc4882780d52f18623 /Objects/tupleobject.c
parent27cbcd6241d787b5e99c6ed05ec8377051f397aa (diff)
downloadcpython-a6be61ec71be600e1d270aea17f1d90dccf6088b.zip
cpython-a6be61ec71be600e1d270aea17f1d90dccf6088b.tar.gz
cpython-a6be61ec71be600e1d270aea17f1d90dccf6088b.tar.bz2
Keep y a Py_hash_t instead of Py_uhash_t as it is compared with == -1 and the
compiler logic will do the right thing with just x as a Py_uhash_t. This matches what was already done in the 3.3 version. cleanup only - no functionality or hash values change.
Diffstat (limited to 'Objects/tupleobject.c')
-rw-r--r--Objects/tupleobject.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index c725227..9e914cb 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -315,7 +315,8 @@ error:
static Py_hash_t
tuplehash(PyTupleObject *v)
{
- register Py_uhash_t x, y; /* Unsigned for defined overflow behavior. */
+ register Py_uhash_t x; /* Unsigned for defined overflow behavior. */
+ register Py_hash_t y;
register Py_ssize_t len = Py_SIZE(v);
register PyObject **p;
Py_uhash_t mult = _PyHASH_MULTIPLIER;