diff options
| author | Jose <jose@zeroc.com> | 2017-03-22 23:16:08 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-03-22 23:16:08 +0100 |
| commit | 394546e066b39d282565e891d4d8fec6ee2c60d5 (patch) | |
| tree | f0ef5fe7a1f7842ef4b52b3340315e89cddeb1db /php/src/php5 | |
| parent | Fix bzip2 version in CSharpMapping env (diff) | |
| download | ice-394546e066b39d282565e891d4d8fec6ee2c60d5.tar.bz2 ice-394546e066b39d282565e891d4d8fec6ee2c60d5.tar.xz ice-394546e066b39d282565e891d4d8fec6ee2c60d5.zip | |
Fix PHP optional non set value to use Ice\None constant
Diffstat (limited to 'php/src/php5')
| -rw-r--r-- | php/src/php5/Types.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/php/src/php5/Types.cpp b/php/src/php5/Types.cpp index 4e58a36e221..739e50fc19c 100644 --- a/php/src/php5/Types.cpp +++ b/php/src/php5/Types.cpp @@ -4089,9 +4089,10 @@ IcePHP::typesInit(INIT_FUNC_ARGS) exceptionInfoClassEntry = zend_register_internal_class(&ce TSRMLS_CC); memcpy(&_exceptionInfoHandlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); - REGISTER_STRING_CONSTANT("Ice_Unset", const_cast<char*>(_unsetGUID.c_str()), CONST_CS|CONST_PERSISTENT); #ifdef ICEPHP_USE_NAMESPACES - REGISTER_NS_STRING_CONSTANT("Ice", "Unset", const_cast<char*>(_unsetGUID.c_str()), CONST_CS|CONST_PERSISTENT); + REGISTER_NS_STRING_CONSTANT("Ice", "None", const_cast<char*>(_unsetGUID.c_str()), CONST_CS|CONST_PERSISTENT); +#else + REGISTER_STRING_CONSTANT("Ice_Unset", const_cast<char*>(_unsetGUID.c_str()), CONST_CS|CONST_PERSISTENT); #endif return true; |