jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PHP] Pick a default dtor which can't collide

Browse source
This commit is contained in:
Olly Betts 2016-12-01 15:09:36 +13:00
commit da1dd2ffd2
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Modules/php.cxx
View file

@ -165,7 +165,7 @@ static void SwigPHP_emit_resource_registrations() {
} }
if (!rsrc_dtor_name) { if (!rsrc_dtor_name) {
rsrc_dtor_name = NewString("_wrap_default_rsrc_destroy"); rsrc_dtor_name = NewString("_swig_default_rsrc_destroy");
if (!emitted_default_dtor) { if (!emitted_default_dtor) {
// Write out custom destructor function // Write out custom destructor function
Printf(s_wrappers, "static ZEND_RSRC_DTOR_FUNC(%s) {\n", rsrc_dtor_name); Printf(s_wrappers, "static ZEND_RSRC_DTOR_FUNC(%s) {\n", rsrc_dtor_name);

2
Source/Modules/php5.cxx
View file

@ -165,7 +165,7 @@ static void SwigPHP_emit_resource_registrations() {
} }
if (!rsrc_dtor_name) { if (!rsrc_dtor_name) {
rsrc_dtor_name = NewString("_wrap_default_rsrc_destroy"); rsrc_dtor_name = NewString("_swig_default_rsrc_destroy");
if (!emitted_default_dtor) { if (!emitted_default_dtor) {
// Write out custom destructor function // Write out custom destructor function
Printf(s_wrappers, "static ZEND_RSRC_DTOR_FUNC(%s) {\n", rsrc_dtor_name); Printf(s_wrappers, "static ZEND_RSRC_DTOR_FUNC(%s) {\n", rsrc_dtor_name);