[Python-checkins] CVS: python/dist/src/Include dictobject.h,2.21,2.22
Guido van Rossum
gvanrossum@users.sourceforge.net
2001年8月10日 13:28:30 -0700
Update of /cvsroot/python/python/dist/src/Include
In directory usw-pr-cvs1:/tmp/cvs-serv27392/Include
Modified Files:
dictobject.h
Log Message:
Add PyDict_Merge(a, b, override):
PyDict_Merge(a, b, 1) is the same as PyDict_Update(a, b).
PyDict_Merge(a, b, 0) does something similar but leaves existing items
unchanged.
Index: dictobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/dictobject.h,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -d -r2.21 -r2.22
*** dictobject.h 2001年08月02日 04:15:00 2.21
--- dictobject.h 2001年08月10日 20:28:28 2.22
***************
*** 99,102 ****
--- 99,103 ----
extern DL_IMPORT(PyObject *) PyDict_Copy(PyObject *mp);
extern DL_IMPORT(int) PyDict_Update(PyObject *mp, PyObject *other);
+ extern DL_IMPORT(int) PyDict_Merge(PyObject *mp, PyObject *other, int override);