diff options
| author | Raymond Hettinger <python@rcn.com> | 2015-07-16 06:52:29 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2015-07-16 06:52:29 (GMT) |
| commit | d702044bcdb0678cb0ba96235c43ffcaa737214c (patch) | |
| tree | a2388922f676be7b49bd511c638849b0b21802cc /Objects/setobject.c | |
| parent | 3a2290865972e47d68360af4fed6ad9ef4b4434c (diff) | |
| parent | a3626bc5bddf9bf43f33060f4ea1a99f25e0c7f1 (diff) | |
| download | cpython-d702044bcdb0678cb0ba96235c43ffcaa737214c.zip cpython-d702044bcdb0678cb0ba96235c43ffcaa737214c.tar.gz cpython-d702044bcdb0678cb0ba96235c43ffcaa737214c.tar.bz2 | |
merge
Diffstat (limited to 'Objects/setobject.c')
| -rw-r--r-- | Objects/setobject.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Objects/setobject.c b/Objects/setobject.c index e6fb46e..922c619 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -668,7 +668,8 @@ set_merge(PySetObject *so, PyObject *otherset) } /* We can't assure there are no duplicates, so do normal insertions */ - for (i = 0; i <= other->mask; i++, other_entry++) { + for (i = 0; i <= other->mask; i++) { + other_entry = &other->table[i]; key = other_entry->key; if (key != NULL && key != dummy) { if (set_add_entry(so, key, other_entry->hash)) |