diff options
Diffstat (limited to 'ruby/src')
| -rw-r--r-- | ruby/src/IceRuby/Operation.cpp | 4 | ||||
| -rw-r--r-- | ruby/src/IceRuby/Types.cpp | 6 |
2 files changed, 5 insertions, 5 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); diff --git a/ruby/src/IceRuby/Types.cpp b/ruby/src/IceRuby/Types.cpp index dabbbd39858..14b07dc2dca 100644 --- a/ruby/src/IceRuby/Types.cpp +++ b/ruby/src/IceRuby/Types.cpp @@ -2508,7 +2508,7 @@ IceRuby::ObjectWriter::writeMembers(Ice::OutputStream* os, const DataMemberList& volatile VALUE val = callRuby(rb_ivar_get, _object, member->rubyID); - if(member->optional && (val == Unset || !os->writeOpt(member->tag, member->type->optionalFormat()))) + if(member->optional && (val == Unset || !os->writeOptional(member->tag, member->type->optionalFormat()))) { continue; } @@ -2587,7 +2587,7 @@ IceRuby::ObjectReader::__read(Ice::InputStream* is) for(p = info->optionalMembers.begin(); p != info->optionalMembers.end(); ++p) { DataMemberPtr member = *p; - if(is->readOpt(member->tag, member->type->optionalFormat())) + if(is->readOptional(member->tag, member->type->optionalFormat())) { member->type->unmarshal(is, member, _object, 0, true); } @@ -2728,7 +2728,7 @@ IceRuby::ExceptionInfo::unmarshal(Ice::InputStream* is) for(q = info->optionalMembers.begin(); q != info->optionalMembers.end(); ++q) { DataMemberPtr member = *q; - if(is->readOpt(member->tag, member->type->optionalFormat())) + if(is->readOptional(member->tag, member->type->optionalFormat())) { member->type->unmarshal(is, member, obj, 0, true); } |