diff options
| author | Mark Spruiell <mes@zeroc.com> | 2011-12-29 16:26:58 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2011-12-29 16:26:58 -0800 |
| commit | d9996d556b399ca993f6b834fbf3b991f605afae (patch) | |
| tree | 9a704f3b7cecfff2695c6257273cb19d953120aa /php/src/IcePHP/Connection.cpp | |
| parent | ICE-3441 - Compute serialVersionUID (diff) | |
| download | ice-d9996d556b399ca993f6b834fbf3b991f605afae.tar.bz2 ice-d9996d556b399ca993f6b834fbf3b991f605afae.tar.xz ice-d9996d556b399ca993f6b834fbf3b991f605afae.zip | |
ICE-4764 - PHP 5.4 compatibility
Diffstat (limited to 'php/src/IcePHP/Connection.cpp')
| -rw-r--r-- | php/src/IcePHP/Connection.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/php/src/IcePHP/Connection.cpp b/php/src/IcePHP/Connection.cpp index cd1784a5176..407a6fad47d 100644 --- a/php/src/IcePHP/Connection.cpp +++ b/php/src/IcePHP/Connection.cpp @@ -236,7 +236,8 @@ handleConnectionFreeStorage(void* p TSRMLS_DC) { Wrapper<Ice::ConnectionPtr>* obj = static_cast<Wrapper<Ice::ConnectionPtr>*>(p); delete obj->ptr; - zend_objects_free_object_storage(static_cast<zend_object*>(p) TSRMLS_CC); + zend_object_std_dtor(static_cast<zend_object*>(p) TSRMLS_CC); + efree(p); } #ifdef _WIN32 @@ -271,11 +272,11 @@ handleConnectionCompare(zval* zobj1, zval* zobj2 TSRMLS_DC) // // Predefined methods for Connection. // -static function_entry _interfaceMethods[] = +static zend_function_entry _interfaceMethods[] = { {0, 0, 0} }; -static function_entry _connectionClassMethods[] = +static zend_function_entry _connectionClassMethods[] = { ZEND_ME(Ice_Connection, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) ZEND_ME(Ice_Connection, __toString, NULL, ZEND_ACC_PUBLIC) @@ -297,7 +298,7 @@ ZEND_METHOD(Ice_ConnectionInfo, __construct) // // Predefined methods for ConnectionInfo. // -static function_entry _connectionInfoClassMethods[] = +static zend_function_entry _connectionInfoClassMethods[] = { ZEND_ME(Ice_ConnectionInfo, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) {0, 0, 0} @@ -329,7 +330,8 @@ handleConnectionInfoFreeStorage(void* p TSRMLS_DC) { Wrapper<Ice::ConnectionInfoPtr>* obj = static_cast<Wrapper<Ice::ConnectionInfoPtr>*>(p); delete obj->ptr; - zend_objects_free_object_storage(static_cast<zend_object*>(p) TSRMLS_CC); + zend_object_std_dtor(static_cast<zend_object*>(p) TSRMLS_CC); + efree(p); } bool |