diff options
| author | Mark Spruiell <mes@zeroc.com> | 2016-02-09 15:19:03 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2016-02-09 15:19:03 -0800 |
| commit | 2fa55f190efe5a0409be24c5107ddac79b2a3a6b (patch) | |
| tree | d931db935809d9614b970e68b1574bb55fa9918d /php/src/IcePHP/Operation.cpp | |
| parent | Updated Objective-C mapping to use new stream classes (diff) | |
| download | ice-2fa55f190efe5a0409be24c5107ddac79b2a3a6b.tar.bz2 ice-2fa55f190efe5a0409be24c5107ddac79b2a3a6b.tar.xz ice-2fa55f190efe5a0409be24c5107ddac79b2a3a6b.zip | |
minor fixes to stream classes; restoring test/Ice/stream
Diffstat (limited to 'php/src/IcePHP/Operation.cpp')
| -rw-r--r-- | php/src/IcePHP/Operation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/php/src/IcePHP/Operation.cpp b/php/src/IcePHP/Operation.cpp index a6bb7e4d7ed..283f61ddd82 100644 --- a/php/src/IcePHP/Operation.cpp +++ b/php/src/IcePHP/Operation.cpp @@ -528,7 +528,7 @@ IcePHP::TypedInvocation::prepareRequest(int argc, zval** args, Ice::OutputStream { ParamInfoPtr info = *p; zval* arg = args[info->pos]; - if(!isUnset(arg TSRMLS_CC) && os->writeOpt(info->tag, info->type->optionalFormat())) + if(!isUnset(arg TSRMLS_CC) && os->writeOptional(info->tag, info->type->optionalFormat())) { info->type->marshal(arg, os, &objectMap, true TSRMLS_CC); } @@ -623,7 +623,7 @@ IcePHP::TypedInvocation::unmarshalResults(int argc, zval** args, zval* ret, outParamCallbacks[info->pos] = cb; } - if(is.readOpt(info->tag, info->type->optionalFormat())) + if(is.readOptional(info->tag, info->type->optionalFormat())) { info->type->unmarshal(&is, cb, _communicator, 0, 0, true TSRMLS_CC); } |