diff options
| author | Robert Schuppenies <okkotonushi@googlemail.com> | 2008-06-28 23:58:47 (GMT) |
|---|---|---|
| committer | Robert Schuppenies <okkotonushi@googlemail.com> | 2008-06-28 23:58:47 (GMT) |
| commit | 4d45bfe4c561f06b0dacfcecd37d6c395d6da3a2 (patch) | |
| tree | 78ddcfde7087d50dec587e31d1a038699673db97 /Objects/dictobject.c | |
| parent | 42806bad9bb1a3f16bd53f90078bf24c648e1431 (diff) | |
| download | cpython-4d45bfe4c561f06b0dacfcecd37d6c395d6da3a2.zip cpython-4d45bfe4c561f06b0dacfcecd37d6c395d6da3a2.tar.gz cpython-4d45bfe4c561f06b0dacfcecd37d6c395d6da3a2.tar.bz2 | |
Merged revisions 64518,64521-64525,64528-64533 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64518 | robert.schuppenies | 2008-06-25 11:20:03 +0200 (Wed, 25 Jun 2008) | 2 lines
Issue 3147: Fixed SizeofTest failure for LLP64 systems.
........
r64533 | robert.schuppenies | 2008-06-26 17:20:35 +0200 (Thu, 26 Jun 2008) | 3 lines
Corrected inconsistencies in sizeof tests and addressed issue pointed
out by Jean Brouwers.
........
Diffstat (limited to 'Objects/dictobject.c')
| -rw-r--r-- | Objects/dictobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index f133614..4d06318 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1845,7 +1845,7 @@ dict_sizeof(PyDictObject *mp) { Py_ssize_t res; - res = sizeof(PyDictObject) + sizeof(mp->ma_table); + res = sizeof(PyDictObject); if (mp->ma_table != mp->ma_smalltable) res = res + (mp->ma_mask + 1) * sizeof(PyDictEntry); return PyLong_FromSsize_t(res); |