diff options
| author | Mark Spruiell <mes@zeroc.com> | 2009-10-22 16:43:02 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2009-10-22 16:43:02 -0700 |
| commit | f1ccf47b0db983418ae6125bf824c956b2e7160a (patch) | |
| tree | 98c1c875812455b3a1b6744bd579e6e9805c2ba9 /php/src | |
| parent | fixing VC6 compilation failures (diff) | |
| download | ice-f1ccf47b0db983418ae6125bf824c956b2e7160a.tar.bz2 ice-f1ccf47b0db983418ae6125bf824c956b2e7160a.tar.xz ice-f1ccf47b0db983418ae6125bf824c956b2e7160a.zip | |
PHP fixes for 5.3
Diffstat (limited to 'php/src')
| -rw-r--r-- | php/src/IcePHP/Connection.cpp | 8 | ||||
| -rw-r--r-- | php/src/IcePHP/Endpoint.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/php/src/IcePHP/Connection.cpp b/php/src/IcePHP/Connection.cpp index d658a80139a..9ec42a64078 100644 --- a/php/src/IcePHP/Connection.cpp +++ b/php/src/IcePHP/Connection.cpp @@ -479,7 +479,7 @@ IcePHP::createConnectionInfo(zval* zv, const Ice::ConnectionInfoPtr& p TSRMLS_DC Ice::UDPConnectionInfoPtr info = Ice::UDPConnectionInfoPtr::dynamicCast(p); if((status = object_init_ex(zv, udpConnectionInfoClassEntry)) == SUCCESS) { - add_property_string(zv, STRCAST("mcastAddress"), STRCAST(info->mcastAddress.c_str()), 1); + add_property_string(zv, STRCAST("mcastAddress"), const_cast<char*>(info->mcastAddress.c_str()), 1); add_property_long(zv, STRCAST("mcastPort"), static_cast<long>(info->mcastPort)); } } @@ -501,14 +501,14 @@ IcePHP::createConnectionInfo(zval* zv, const Ice::ConnectionInfoPtr& p TSRMLS_DC if(Ice::IPConnectionInfoPtr::dynamicCast(p)) { Ice::IPConnectionInfoPtr info = Ice::IPConnectionInfoPtr::dynamicCast(p); - add_property_string(zv, STRCAST("localAddress"), STRCAST(info->localAddress.c_str()), 1); + add_property_string(zv, STRCAST("localAddress"), const_cast<char*>(info->localAddress.c_str()), 1); add_property_long(zv, STRCAST("localPort"), static_cast<long>(info->localPort)); - add_property_string(zv, STRCAST("remoteAddress"), STRCAST(info->remoteAddress.c_str()), 1); + add_property_string(zv, STRCAST("remoteAddress"), const_cast<char*>(info->remoteAddress.c_str()), 1); add_property_long(zv, STRCAST("remotePort"), static_cast<long>(info->remotePort)); } add_property_bool(zv, STRCAST("incoming"), p->incoming ? 1 : 0); - add_property_string(zv, STRCAST("adapterName"), STRCAST(p->adapterName.c_str()), 1); + add_property_string(zv, STRCAST("adapterName"), const_cast<char*>(p->adapterName.c_str()), 1); Wrapper<Ice::ConnectionInfoPtr>* obj = Wrapper<Ice::ConnectionInfoPtr>::extract(zv TSRMLS_CC); assert(obj); diff --git a/php/src/IcePHP/Endpoint.cpp b/php/src/IcePHP/Endpoint.cpp index b7aa6e3168f..d492f8de339 100644 --- a/php/src/IcePHP/Endpoint.cpp +++ b/php/src/IcePHP/Endpoint.cpp @@ -412,7 +412,7 @@ IcePHP::createEndpointInfo(zval* zv, const Ice::EndpointInfoPtr& p TSRMLS_DC) add_property_long(zv, STRCAST("protocolMinor"), static_cast<long>(info->protocolMinor)); add_property_long(zv, STRCAST("encodingMajor"), static_cast<long>(info->encodingMajor)); add_property_long(zv, STRCAST("encodingMinor"), static_cast<long>(info->encodingMinor)); - add_property_string(zv, STRCAST("mcastInterface"), STRCAST(info->mcastInterface.c_str()), 1); + add_property_string(zv, STRCAST("mcastInterface"), const_cast<char*>(info->mcastInterface.c_str()), 1); add_property_long(zv, STRCAST("mcastTtl"), static_cast<long>(info->mcastTtl)); } } @@ -450,7 +450,7 @@ IcePHP::createEndpointInfo(zval* zv, const Ice::EndpointInfoPtr& p TSRMLS_DC) if(Ice::IPEndpointInfoPtr::dynamicCast(p)) { Ice::IPEndpointInfoPtr info = Ice::IPEndpointInfoPtr::dynamicCast(p); - add_property_string(zv, STRCAST("host"), STRCAST(info->host.c_str()), 1); + add_property_string(zv, STRCAST("host"), const_cast<char*>(info->host.c_str()), 1); add_property_long(zv, STRCAST("port"), static_cast<long>(info->port)); } |