*** src/Slice/CsUtil.cpp 16 Feb 2005 20:22:23 -0000 1.33 --- src/Slice/CsUtil.cpp 28 Feb 2005 03:44:16 -0000 *************** *** 608,614 **** } out << nl << "for(int __ix = 0; __ix < __lenx; ++__ix)"; out << sb; ! out << nl << param << "[__ix] = " << stream << ".readProxy();"; } if(!streamingAPI && builtin->isVariableLength()) { --- 608,623 ---- } out << nl << "for(int __ix = 0; __ix < __lenx; ++__ix)"; out << sb; ! if(isArray) ! { ! out << nl << param << "[__ix] = " << stream << ".readProxy();"; ! } ! else ! { ! out << nl << "Ice.ObjectPrx __val = new Ice.ObjectPrxHelperBase();"; ! out << nl << "__val = " << stream << ".readProxy();"; ! out << nl << param << ".Add(__val);"; ! } } if(!streamingAPI && builtin->isVariableLength()) { *************** *** 764,772 **** out << fixId(seq->scoped()) << "(szx)"; } out << ';'; ! out << nl << "for(int __ix = 0; __ix < " << param << '.' << limitID << "; ++__ix)"; out << sb; ! out << nl << param << "[__ix].__read(" << stream << ");"; if(!streamingAPI && type->isVariableLength()) { out << nl << stream << ".checkSeq();"; --- 773,790 ---- out << fixId(seq->scoped()) << "(szx)"; } out << ';'; ! out << nl << "for(int __ix = 0; __ix < szx; ++__ix)"; out << sb; ! if(isArray) ! { ! out << nl << param << "[__ix].__read(" << stream << ");"; ! } ! else ! { ! out << nl << typeS << " __val = new " << typeS << "();"; ! out << nl << "__val.__read(" << stream << ");"; ! out << nl << param << ".Add(__val);"; ! } if(!streamingAPI && type->isVariableLength()) { out << nl << stream << ".checkSeq();"; *** src/Slice/VbUtil.cpp 16 Feb 2005 20:22:23 -0000 1.12 --- src/Slice/VbUtil.cpp 28 Feb 2005 03:44:16 -0000 *************** *** 590,601 **** { if(builtin->isVariableLength()) { ! out << nl << stream << ".startSeq(__len, " << static_cast(builtin->minWireSize()) << ")"; } else { ! out << nl << stream << ".checkFixedSeq(__len, " << static_cast(builtin->minWireSize()) << ")"; } } --- 590,601 ---- { if(builtin->isVariableLength()) { ! out << nl << stream << ".startSeq(__lenx, " << static_cast(builtin->minWireSize()) << ")"; } else { ! out << nl << stream << ".checkFixedSeq(__lenx, " << static_cast(builtin->minWireSize()) << ")"; } } *************** *** 637,643 **** } out << nl << "For __ix As Integer = 0 To __lenx - 1"; out.inc(); ! out << nl << param << "(__ix) = " << stream << ".readProxy()"; out.dec(); out << nl << "Next"; } --- 637,652 ---- } out << nl << "For __ix As Integer = 0 To __lenx - 1"; out.inc(); ! if(isArray) ! { ! out << nl << param << "(__ix) = " << stream << ".readProxy()"; ! } ! else ! { ! out << nl << "Dim __val As Ice.ObjectPrx = New Ice.ObjectPrxHelperBase"; ! out << nl << "__val = " << stream << ".readProxy()"; ! out << nl << param << ".Add(__val)"; ! } out.dec(); out << nl << "Next"; } *************** *** 802,810 **** { out << fixId(seq->scoped()) << "(szx)"; } ! out << nl << "For __ix As Integer = 0 To " << param << '.' << limitID << " - 1"; out.inc(); ! out << nl << param << "(__ix).__read(" << stream << ")"; if(!streamingAPI && type->isVariableLength()) { out << nl << stream << ".checkSeq()"; --- 811,828 ---- { out << fixId(seq->scoped()) << "(szx)"; } ! out << nl << "For __ix As Integer = 0 To szx - 1"; out.inc(); ! if(isArray) ! { ! out << nl << param << "(__ix).__read(" << stream << ")"; ! } ! else ! { ! out << nl << "Dim __val As " << typeS << " = New " << typeS; ! out << nl << "__val.__read(" << stream << ')'; ! out << nl << param << ".Add(__val)"; ! } if(!streamingAPI && type->isVariableLength()) { out << nl << stream << ".checkSeq()";