diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-07-21 09:42:01 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-07-21 09:42:01 -0230 |
| commit | b30759dfccb7f844d3957bc09d68d0077a334e6a (patch) | |
| tree | 7c3f9f8bccc3f674aedd70014a1925755937d5d9 /php/src | |
| parent | Fixed build failure on Windows 64bits (diff) | |
| download | ice-b30759dfccb7f844d3957bc09d68d0077a334e6a.tar.bz2 ice-b30759dfccb7f844d3957bc09d68d0077a334e6a.tar.xz ice-b30759dfccb7f844d3957bc09d68d0077a334e6a.zip | |
ICE-5481 use size_type for Stream startSize() return type
Diffstat (limited to 'php/src')
| -rw-r--r-- | php/src/IcePHP/Types.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/php/src/IcePHP/Types.cpp b/php/src/IcePHP/Types.cpp index dae6ffd2268..202f2d785f4 100644 --- a/php/src/IcePHP/Types.cpp +++ b/php/src/IcePHP/Types.cpp @@ -1357,7 +1357,7 @@ IcePHP::StructInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap* assert(Z_TYPE_P(zv) == IS_OBJECT); // validate() should have caught this. assert(Z_OBJCE_P(zv) == zce); // validate() should have caught this. - int sizePos = -1; + Ice::OutputStream::size_type sizePos = 0; if(optional) { if(_variableLength) @@ -1528,7 +1528,7 @@ IcePHP::SequenceInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMa sz = static_cast<Ice::Int>(zend_hash_num_elements(arr)); } - int sizePos = -1; + Ice::OutputStream::size_type sizePos = 0; if(optional) { if(elementType->variableLength()) @@ -2088,7 +2088,7 @@ IcePHP::DictionaryInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, Object sz = static_cast<Ice::Int>(zend_hash_num_elements(arr)); } - int sizePos = -1; + Ice::OutputStream::size_type sizePos = 0; if(optional) { if(_variableLength) @@ -2771,7 +2771,7 @@ IcePHP::ProxyInfo::optionalFormat() const void IcePHP::ProxyInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap*, bool optional TSRMLS_DC) { - int sizePos = -1; + Ice::OutputStream::size_type sizePos = 0; if(optional) { sizePos = os->startSize(); |