diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-03-22 14:42:18 +0100 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-03-22 14:42:18 +0100 |
| commit | 89929cdac80dabdb5067cd701af562aff7b26e9c (patch) | |
| tree | e7b010ac3fc8276872e7bcf912d24e083b00c318 /Objects/tupleobject.c | |
| parent | 5854dc6558a2b3dc8419581938b66799d236228f (diff) | |
| parent | b6353eacd8fea3649b687bc3e82f48275f7a4561 (diff) | |
| download | cpython-89929cdac80dabdb5067cd701af562aff7b26e9c.tar.gz | |
Issue #14387: Do not include accu.h from Python.h.
Diffstat (limited to 'Objects/tupleobject.c')
| -rw-r--r-- | Objects/tupleobject.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index e99eda06f1..dde34ade11 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -87,7 +87,7 @@ PyTuple_New(register Py_ssize_t size) { return PyErr_NoMemory(); } - nbytes += sizeof(PyTupleObject) - sizeof(PyObject *); + /* nbytes += sizeof(PyTupleObject) - sizeof(PyObject *); */ op = PyObject_GC_NewVar(PyTupleObject, &PyTuple_Type, size); if (op == NULL) @@ -313,11 +313,12 @@ error: static Py_hash_t tuplehash(PyTupleObject *v) { - register Py_hash_t x, y; + register Py_uhash_t x; + register Py_hash_t y; register Py_ssize_t len = Py_SIZE(v); register PyObject **p; - Py_hash_t mult = _PyHASH_MULTIPLIER; - x = 0x345678L; + Py_uhash_t mult = _PyHASH_MULTIPLIER; + x = 0x345678; p = v->ob_item; while (--len >= 0) { y = PyObject_Hash(*p++); @@ -328,7 +329,7 @@ tuplehash(PyTupleObject *v) mult += (Py_hash_t)(82520L + len + len); } x += 97531L; - if (x == -1) + if (x == (Py_uhash_t)-1) x = -2; return x; } @@ -544,10 +545,8 @@ tuplerichcompare(PyObject *v, PyObject *w, int op) Py_ssize_t i; Py_ssize_t vlen, wlen; - if (!PyTuple_Check(v) || !PyTuple_Check(w)) { - Py_INCREF(Py_NotImplemented); - return Py_NotImplemented; - } + if (!PyTuple_Check(v) || !PyTuple_Check(w)) + Py_RETURN_NOTIMPLEMENTED; vt = (PyTupleObject *)v; wt = (PyTupleObject *)w; |