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 /ruby/src/IceRuby/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 'ruby/src/IceRuby/Operation.cpp')
-rw-r--r-- | ruby/src/IceRuby/Operation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ruby/src/IceRuby/Operation.cpp b/ruby/src/IceRuby/Operation.cpp index 1f81af99ccd..8f8a0f77480 100644 --- a/ruby/src/IceRuby/Operation.cpp +++ b/ruby/src/IceRuby/Operation.cpp @@ -461,7 +461,7 @@ IceRuby::OperationI::prepareRequest(const Ice::ObjectPrx& proxy, VALUE args, Ice { ParamInfoPtr info = *p; volatile VALUE arg = RARRAY_PTR(args)[info->pos]; - if(arg != Unset && os->writeOpt(info->tag, info->type->optionalFormat())) + if(arg != Unset && os->writeOptional(info->tag, info->type->optionalFormat())) { info->type->marshal(arg, os, &objectMap, true); } @@ -536,7 +536,7 @@ IceRuby::OperationI::unmarshalResults(const vector<Ice::Byte>& bytes, const Ice: for(p = _optionalOutParams.begin(); p != _optionalOutParams.end(); ++p) { ParamInfoPtr info = *p; - if(is.readOpt(info->tag, info->type->optionalFormat())) + if(is.readOptional(info->tag, info->type->optionalFormat())) { void* closure = reinterpret_cast<void*>(info->pos); info->type->unmarshal(&is, info, results, closure, true); |