minor fixes to stream classes; restoring test/Ice/stream

2 files changed, 8 insertions, 8 deletions

diff --git a/python/modules/IcePy/Operation.cpp b/python/modules/IcePy/Operation.cpp
index 696f3291214..208656d28ec 100644
--- a/python/modules/IcePy/Operation.cpp
+++ b/python/modules/IcePy/Operation.cpp
@@ -1581,7 +1581,7 @@ IcePy::TypedInvocation::prepareRequest(PyObject* args, MappingType mapping, Ice:
             {
                 ParamInfoPtr info = *p;
                 PyObject* arg = PyTuple_GET_ITEM(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, &info->metaData);
                 }
@@ -1665,7 +1665,7 @@ IcePy::TypedInvocation::unmarshalResults(const pair<const Ice::Byte*, const Ice:
         for(p = _op->optionalOutParams.begin(); p != _op->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.get(), closure, true, &info->metaData);
@@ -3271,7 +3271,7 @@ IcePy::TypedUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*, con
             for(p = _op->optionalInParams.begin(); p != _op->optionalInParams.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 + offset);
                     info->type->unmarshal(&is, info, args.get(), closure, true, &info->metaData);
@@ -3488,7 +3488,7 @@ IcePy::TypedUpcall::response(PyObject* args, const Ice::EncodingVersion& encodin
             {
                 ParamInfoPtr info = *p;
                 PyObject* arg = PyTuple_GET_ITEM(t.get(), 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, &info->metaData);
                 }
diff --git a/python/modules/IcePy/Types.cpp b/python/modules/IcePy/Types.cpp
index 39a951bfc4c..6424beb4ad2 100644
--- a/python/modules/IcePy/Types.cpp
+++ b/python/modules/IcePy/Types.cpp
@@ -3291,7 +3291,7 @@ IcePy::ObjectWriter::writeMembers(Ice::OutputStream* os, const DataMemberList& m
             }
         }
         else if(member->optional &&
-                (val.get() == Unset || !os->writeOpt(member->tag, member->type->optionalFormat())))
+                (val.get() == Unset || !os->writeOptional(member->tag, member->type->optionalFormat())))
         {
             continue;
         }
@@ -3372,7 +3372,7 @@ IcePy::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, &member->metaData);
                 }
@@ -3563,7 +3563,7 @@ IcePy::ExceptionInfo::writeMembers(PyObject* p, Ice::OutputStream* os, const Dat
             }
         }
         else if(member->optional &&
-                (val.get() == Unset || !os->writeOpt(member->tag, member->type->optionalFormat())))
+                (val.get() == Unset || !os->writeOptional(member->tag, member->type->optionalFormat())))
         {
             continue;
         }
@@ -3603,7 +3603,7 @@ IcePy::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, p.get(), 0, true, &member->metaData);
             }