summaryrefslogtreecommitdiff
path: root/php/src/php7/Proxy.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2018-05-03 16:40:47 +0200
committerBenoit Foucher <benoit@zeroc.com>2018-05-03 16:40:59 +0200
commit75d923080037abc369a068e03c3f9076a83d3879 (patch)
treefaf99fc07c3b14d63c2ffaedd6ca899ec7255bac /php/src/php7/Proxy.cpp
parentRemove useless lock in .NET TraceLoggerI (diff)
downloadice-75d923080037abc369a068e03c3f9076a83d3879.tar.bz2
ice-75d923080037abc369a068e03c3f9076a83d3879.tar.xz
ice-75d923080037abc369a068e03c3f9076a83d3879.zip
Fixed issue where parsing of 64-bits values would be incorrect on Windows, fixes #79
Diffstat (limited to 'php/src/php7/Proxy.cpp')
-rw-r--r--php/src/php7/Proxy.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/php/src/php7/Proxy.cpp b/php/src/php7/Proxy.cpp
index 7ce84804caa..712c9dad754 100644
--- a/php/src/php7/Proxy.cpp
+++ b/php/src/php7/Proxy.cpp
@@ -462,7 +462,7 @@ ZEND_METHOD(Ice_ObjectPrx, ice_locatorCacheTimeout)
ProxyPtr _this = Wrapper<ProxyPtr>::value(getThis());
assert(_this);
- long l;
+ zend_long l;
if(zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("l"), &l) != SUCCESS)
{
RETURN_NULL();
@@ -470,7 +470,7 @@ ZEND_METHOD(Ice_ObjectPrx, ice_locatorCacheTimeout)
try
{
- if(!_this->clone(return_value, _this->proxy->ice_locatorCacheTimeout(l)))
+ if(!_this->clone(return_value, _this->proxy->ice_locatorCacheTimeout(static_cast<Ice::Int>(l))))
{
RETURN_NULL();
}
@@ -556,7 +556,7 @@ ZEND_METHOD(Ice_ObjectPrx, ice_endpointSelection)
ProxyPtr _this = Wrapper<ProxyPtr>::value(getThis());
assert(_this);
- long l;
+ zend_long l;
if(zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("l"), &l) != SUCCESS)
{
RETURN_NULL();
@@ -1190,13 +1190,13 @@ ZEND_METHOD(Ice_ObjectPrx, ice_timeout)
try
{
- long l;
+ zend_long l;
if(zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("l"), &l) != SUCCESS)
{
RETURN_NULL();
}
// TODO: range check?
- if(!_this->clone(return_value, _this->proxy->ice_timeout(l)))
+ if(!_this->clone(return_value, _this->proxy->ice_timeout(static_cast<Ice::Int>(l))))
{
RETURN_NULL();
}
@@ -1237,20 +1237,20 @@ ZEND_METHOD(Ice_ObjectPrx, ice_getTimeout)
}
}
-ZEND_METHOD(Ice_ObjectPrx, ice_invocationTimeout )
+ZEND_METHOD(Ice_ObjectPrx, ice_invocationTimeout)
{
ProxyPtr _this = Wrapper<ProxyPtr>::value(getThis());
assert(_this);
try
{
- long l;
+ zend_long l;
if(zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("l"), &l) != SUCCESS)
{
RETURN_NULL();
}
// TODO: range check?
- if(!_this->clone(return_value, _this->proxy->ice_invocationTimeout (l)))
+ if(!_this->clone(return_value, _this->proxy->ice_invocationTimeout(static_cast<Ice::Int>(l))))
{
RETURN_NULL();
}