mirror of
https://github.com/python/cpython.git
synced 2025-09-28 19:25:27 +00:00
Merge.
This commit is contained in:
commit
cd81520e44
1 changed files with 3 additions and 3 deletions
|
@ -36,9 +36,6 @@ static PyObject _dummy_struct;
|
||||||
|
|
||||||
#define dummy (&_dummy_struct)
|
#define dummy (&_dummy_struct)
|
||||||
|
|
||||||
/* Exported for the gdb plugin's benefit. */
|
|
||||||
PyObject *_PySet_Dummy = dummy;
|
|
||||||
|
|
||||||
|
|
||||||
/* ======================================================================== */
|
/* ======================================================================== */
|
||||||
/* ======= Begin logic for probing the hash table ========================= */
|
/* ======= Begin logic for probing the hash table ========================= */
|
||||||
|
@ -2345,6 +2342,9 @@ _PySet_Update(PyObject *set, PyObject *iterable)
|
||||||
return set_update_internal((PySetObject *)set, iterable);
|
return set_update_internal((PySetObject *)set, iterable);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Exported for the gdb plugin's benefit. */
|
||||||
|
PyObject *_PySet_Dummy = dummy;
|
||||||
|
|
||||||
#ifdef Py_DEBUG
|
#ifdef Py_DEBUG
|
||||||
|
|
||||||
/* Test code to be called with any three element set.
|
/* Test code to be called with any three element set.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue