diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-08-17 19:39:39 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-08-17 19:39:39 (GMT) |
| commit | f72006f4429975a9d221e046e43dabd4f41eda23 (patch) | |
| tree | be6e2e820a20408fd2702e32d43b4a10f11c470b /Include | |
| parent | 960c2113282927f7d1018f822be2cd7e0e82cdd3 (diff) | |
| download | cpython-f72006f4429975a9d221e046e43dabd4f41eda23.zip cpython-f72006f4429975a9d221e046e43dabd4f41eda23.tar.gz cpython-f72006f4429975a9d221e046e43dabd4f41eda23.tar.bz2 | |
Merged revisions 84146-84147,84150 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84146 | antoine.pitrou | 2010-08-17 19:55:07 +0200 (mar., 17 août 2010) | 4 lines
Issue #9612: The set object is now 64-bit clean under Windows.
........
r84147 | antoine.pitrou | 2010-08-17 20:30:06 +0200 (mar., 17 août 2010) | 3 lines
Fix <deque iterator>.__length_hint__() under 64-bit Windows.
........
r84150 | antoine.pitrou | 2010-08-17 21:33:30 +0200 (mar., 17 août 2010) | 3 lines
Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t".
........
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/setobject.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Include/setobject.h b/Include/setobject.h index 4a9baff..574caf7 100644 --- a/Include/setobject.h +++ b/Include/setobject.h @@ -22,7 +22,11 @@ no meaning otherwise. #define PySet_MINSIZE 8 typedef struct { - long hash; /* cached hash code for the entry key */ + /* Cached hash code of the key. Note that hash codes are C longs. + * We have to use Py_ssize_t instead because set_pop() abuses + * the hash field to hold a search finger. + */ + Py_ssize_t hash; PyObject *key; } setentry; |