Update to the 4.13.2 version of SIP

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-03-02 21:53:21 +00:00
parent 32c3701e4e
commit 42a1a97211
3 changed files with 16 additions and 9 deletions

View File

@@ -38,11 +38,11 @@ unstable_series = (version.VER_MINOR % 2) == 1 # is the minor version odd or ev
isWindows = sys.platform.startswith('win')
isDarwin = sys.platform == "darwin"
sipCurrentVersion = '4.13.1'
sipCurrentVersion = '4.13.2'
sipCurrentVersionMD5 = {
'darwin' : '542198b5a4b05a65c41ac888bc59f779',
'win32' : '2a7194cbfbca8d0110c68857a94e0efa',
'linux2' : '0049b8d33e83ae008fc2664ded4eb567',
'darwin' : 'b9262c3ea3d2a0010f4c59c27c60e8c1',
'win32' : 'b5885b420b7fe16e9dc5e32ef381a847',
'linux2' : '5956f74dc9a1e0673633e7a494705dca',
}
toolsURL = 'http://wxpython.org/Phoenix/tools'

View File

@@ -264,9 +264,16 @@ static void add_object(sipObjectMap *om, void *addr, sipSimpleWrapper *val)
{
sipSimpleWrapper *next = sw->next;
/* We are removing it from the map here. */
sipSetNotInMap(sw);
sip_api_common_dtor(sw);
if (sipIsAlias(sw))
{
sip_api_free(sw);
}
else
{
/* We are removing it from the map here. */
sipSetNotInMap(sw);
sip_api_common_dtor(sw);
}
sw = next;
}

View File

@@ -54,8 +54,8 @@ extern "C" {
/*
* Define the SIP version number.
*/
#define SIP_VERSION 0x040d01
#define SIP_VERSION_STR "4.13.1"
#define SIP_VERSION 0x040d02
#define SIP_VERSION_STR "4.13.2"
/*