From: Éric Araujo <merwok@netwok.org>
Date: Wed, 23 Mar 2011 02:43:22 +0000 (+0100)
Subject: Merge from 3.1.
X-Git-Tag: v3.2.1b1~227^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbcfc1f2d926c1198b4c23a6e5640e3f3aee9d98;p=python

Merge from 3.1.

The fix was already committed to 3.2, but I merged two small changes
recommended by Raymond while I was working on the 2.7 patch to ease
future merges.
---

bbcfc1f2d926c1198b4c23a6e5640e3f3aee9d98
diff --cc Objects/setobject.c
index 478b5cb651,7aa1a7faee..48edad8a31
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@@ -365,6 -365,7 +365,7 @@@ set_add_entry(register PySetObject *so
  {
      register Py_ssize_t n_used;
      PyObject *key = entry->key;
 -    long hash = entry->hash;
++    Py_hash_t hash = entry->hash;
  
      assert(so->fill <= so->mask);  /* at least one empty slot */
      n_used = so->used;
@@@ -639,6 -640,7 +640,7 @@@ set_merge(PySetObject *so, PyObject *ot
  {
      PySetObject *other;
      PyObject *key;
 -    long hash;
++    Py_hash_t hash;
      register Py_ssize_t i;
      register setentry *entry;