diff options
48 files changed, 288 insertions, 257 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index ba141e904c0..7441b60aca4 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -1783,13 +1783,13 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out, if(st->isVariableLength()) { out << nl << "int pos = " << stream << ".startSize();"; - out << nl << typeS << ".write(" << stream << ", " << val << ");"; + out << nl << typeS << ".ice_write(" << stream << ", " << val << ");"; out << nl << stream << ".endSize(pos);"; } else { out << nl << stream << ".writeSize(" << st->minWireSize() << ");"; - out << nl << typeS << ".write(" << stream << ", " << val << ");"; + out << nl << typeS << ".ice_write(" << stream << ", " << val << ");"; } if(optionalParam) { @@ -1798,7 +1798,7 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out, } else { - out << nl << typeS << ".write(" << stream << ", " << v << ");"; + out << nl << typeS << ".ice_write(" << stream << ", " << v << ");"; } } else @@ -1818,7 +1818,7 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out, } out << nl << typeS << " tmpOpt = new " << typeS << "();"; - out << nl << "tmpOpt.read(" << stream << ");"; + out << nl << "tmpOpt.ice_readMembers(" << stream << ");"; out << nl << v << ".set(tmpOpt);"; out << eb; @@ -1841,11 +1841,11 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out, { out << nl << stream << ".skipSize();"; } - out << nl << v << " = " << typeS << ".read(" << stream << ", " << v << ");"; + out << nl << v << " = " << typeS << ".ice_read(" << stream << ", " << v << ");"; } else { - out << nl << v << " = " << typeS << ".read(" << stream << ", " << v << ");"; + out << nl << v << " = " << typeS << ".ice_read(" << stream << ", " << v << ");"; } } return; @@ -1864,20 +1864,20 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out, out << nl << "if(" << v << " != null && " << v << ".isSet() && " << stream << ".writeOptional(" << tag << ", " << getOptionalFormat(type) << "))"; out << sb; - out << nl << typeS << ".write(" << stream << ", " << v << ".get());"; + out << nl << typeS << ".ice_write(" << stream << ", " << v << ".get());"; out << eb; } else { out << nl << "if(" << stream << ".writeOptional(" << tag << ", " << getOptionalFormat(type) << "))"; out << sb; - out << nl << typeS << ".write(" << stream << ", " << v << ");"; + out << nl << typeS << ".ice_write(" << stream << ", " << v << ");"; out << eb; } } else { - out << nl << typeS << ".write(" << stream << ", " << v << ");"; + out << nl << typeS << ".ice_write(" << stream << ", " << v << ");"; } } else @@ -1886,7 +1886,7 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out, { out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getOptionalFormat(type) << "))"; out << sb; - out << nl << v << ".set(" << typeS << ".read(" << stream << "));"; + out << nl << v << ".set(" << typeS << ".ice_read(" << stream << "));"; out << eb; if(mode == OptionalOutParam) { @@ -1898,7 +1898,7 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out, } else { - out << nl << v << " = " << typeS << ".read(" << stream << ");"; + out << nl << v << " = " << typeS << ".ice_read(" << stream << ");"; } } return; @@ -4140,13 +4140,13 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out, if(st->isVariableLength()) { out << nl << "int pos = " << stream << ".startSize();"; - out << nl << typeS << ".write(" << stream << ", " << val << ");"; + out << nl << typeS << ".ice_write(" << stream << ", " << val << ");"; out << nl << stream << ".endSize(pos);"; } else { out << nl << stream << ".writeSize(" << st->minWireSize() << ");"; - out << nl << typeS << ".write(" << stream << ", " << val << ");"; + out << nl << typeS << ".ice_write(" << stream << ", " << val << ");"; } if(optionalParam) { @@ -4155,7 +4155,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out, } else { - out << nl << typeS << ".write(" << stream << ", " << param << ");"; + out << nl << typeS << ".ice_write(" << stream << ", " << param << ");"; } } else @@ -4174,7 +4174,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out, out << nl << stream << ".skipSize();"; } - out << nl << param << " = java.util.Optional.of(" << typeS << ".read(" << stream + out << nl << param << " = java.util.Optional.of(" << typeS << ".ice_read(" << stream << ", null));"; out << eb; @@ -4193,11 +4193,11 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out, { out << nl << stream << ".skipSize();"; } - out << nl << param << " = " << typeS << ".read(" << stream << ", " << param << ");"; + out << nl << param << " = " << typeS << ".ice_read(" << stream << ", " << param << ");"; } else { - out << nl << param << " = " << typeS << ".read(" << stream << ", " << param << ");"; + out << nl << param << " = " << typeS << ".ice_read(" << stream << ", " << param << ");"; } } return; @@ -4216,20 +4216,20 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out, out << nl << "if(" << param << " != null && " << param << ".isPresent() && " << stream << ".writeOptional(" << tag << ", " << getOptionalFormat(type) << "))"; out << sb; - out << nl << typeS << ".write(" << stream << ", " << param << ".get());"; + out << nl << typeS << ".ice_write(" << stream << ", " << param << ".get());"; out << eb; } else { out << nl << "if(" << stream << ".writeOptional(" << tag << ", " << getOptionalFormat(type) << "))"; out << sb; - out << nl << typeS << ".write(" << stream << ", " << param << ");"; + out << nl << typeS << ".ice_write(" << stream << ", " << param << ");"; out << eb; } } else { - out << nl << typeS << ".write(" << stream << ", " << param << ");"; + out << nl << typeS << ".ice_write(" << stream << ", " << param << ");"; } } else @@ -4238,7 +4238,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out, { out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getOptionalFormat(type) << "))"; out << sb; - out << nl << param << " = java.util.Optional.of(" << typeS << ".read(" << stream << "));"; + out << nl << param << " = java.util.Optional.of(" << typeS << ".ice_read(" << stream << "));"; out << eb; out << nl << "else"; out << sb; @@ -4247,7 +4247,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out, } else { - out << nl << param << " = " << typeS << ".read(" << stream << ");"; + out << nl << param << " = " << typeS << ".ice_read(" << stream << ");"; } } return; diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp index a9ac2f94042..af0e5305b70 100644 --- a/cpp/src/slice2cs/CsUtil.cpp +++ b/cpp/src/slice2cs/CsUtil.cpp @@ -688,22 +688,22 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out, { if(!isValueType(st)) { - out << nl << typeToString(st) << ".write(" << stream << ", " << param << ");"; + out << nl << typeToString(st) << ".ice_write(" << stream << ", " << param << ");"; } else { - out << nl << param << ".iceWrite(" << stream << ");"; + out << nl << param << ".ice_writeMembers(" << stream << ");"; } } else { if(!isValueType(st)) { - out << nl << param << " = " << typeToString(type) << ".read(" << stream << ");"; + out << nl << param << " = " << typeToString(type) << ".ice_read(" << stream << ");"; } else { - out << nl << param << ".iceRead(" << stream << ");"; + out << nl << param << ".ice_readMembers(" << stream << ");"; } } return; @@ -1542,7 +1542,7 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out, } } call += "."; - call += "iceWrite"; + call += "ice_writeMembers"; call += "(" + stream + ");"; out << nl << call; out << eb; @@ -1587,12 +1587,12 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out, { out << nl << v << "[ix] = new " << typeS << "();"; } - out << nl << v << "[ix].iceRead(" << stream << ");"; + out << nl << v << "[ix].ice_readMembers(" << stream << ");"; } else { out << nl << typeS << " val = new " << typeS << "();"; - out << nl << "val.iceRead(" << stream << ");"; + out << nl << "val.ice_readMembers(" << stream << ");"; out << nl << param << "." << addMethod << "(val);"; } out << eb; diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index ac2a5eb988b..a614e7e73a9 100644 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -111,10 +111,25 @@ emitDeprecate(const ContainedPtr& p1, const ContainedPtr& p2, Output& out, const } } -template<class List> -string getEscapedParamName(const List& params, const string& name) +string +getEscapedParamName(const OperationPtr& p, const string& name) +{ + ParamDeclList params = p->parameters(); + + for(ParamDeclList::const_iterator i = params.begin(); i != params.end(); ++i) + { + if((*i)->name() == name) + { + return name + "_"; + } + } + return name; +} + +string +getEscapedParamName(const DataMemberList& params, const string& name) { - for(typename List::const_iterator i = params.begin(); i != params.end(); ++i) + for(DataMemberList::const_iterator i = params.begin(); i != params.end(); ++i) { if((*i)->name() == name) { @@ -312,21 +327,29 @@ Slice::CsVisitor::writePostUnmarshalParams(const ParamDeclList& params, const Op } void -Slice::CsVisitor::writeMarshalDataMember(const DataMemberPtr& member, const string& name, const string& customStream) +Slice::CsVisitor::writeMarshalDataMember(const DataMemberPtr& member, const string& name, bool forStruct) { if(member->optional()) { - writeOptionalMarshalUnmarshalCode(_out, member->type(), name, member->tag(), true, customStream); + assert(!forStruct); + writeOptionalMarshalUnmarshalCode(_out, member->type(), name, member->tag(), true, "ostr_"); } else { - writeMarshalUnmarshalCode(_out, member->type(), name, true, customStream); + string stream = forStruct ? "" : "ostr_"; + string memberName = fixId(member->name()); + if(forStruct) + { + memberName = "this." + memberName; + } + + writeMarshalUnmarshalCode(_out, member->type(), name, true, stream); } } void Slice::CsVisitor::writeUnmarshalDataMember(const DataMemberPtr& member, const string& name, bool needPatcher, - int& patchIter, const string& customStream) + int& patchIter, bool forStruct) { const bool classType = isClassType(member->type()); @@ -345,12 +368,21 @@ Slice::CsVisitor::writeUnmarshalDataMember(const DataMemberPtr& member, const st if(member->optional()) { + assert(!forStruct); + writeOptionalMarshalUnmarshalCode(_out, member->type(), classType ? patcher : name, member->tag(), false, - customStream); + "istr_"); } else { - writeMarshalUnmarshalCode(_out, member->type(), classType ? patcher : name, false, customStream); + string stream = forStruct ? "" : "istr_"; + string memberName = fixId(member->name()); + if(forStruct) + { + memberName = "this." + memberName; + } + + writeMarshalUnmarshalCode(_out, member->type(), classType ? patcher : name, false, stream); } } @@ -822,12 +854,12 @@ Slice::CsVisitor::writeMarshaling(const ClassDefPtr& p) { if(!(*d)->optional()) { - writeMarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), "ostr_"); + writeMarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true)); } } for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d) { - writeMarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), "ostr_"); + writeMarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true)); } _out << nl << "ostr_.endSlice();"; if(base) @@ -986,12 +1018,12 @@ Slice::CsVisitor::writeMarshaling(const ClassDefPtr& p) { if(!(*d)->optional()) { - writeUnmarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), needCustomPatcher, patchIter, "istr_"); + writeUnmarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), needCustomPatcher, patchIter); } } for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d) { - writeUnmarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), needCustomPatcher, patchIter, "istr_"); + writeUnmarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), needCustomPatcher, patchIter); } _out << nl << "istr_.endSlice();"; if(base) @@ -1154,9 +1186,9 @@ Slice::CsVisitor::getDispatchParams(const OperationPtr& op, string& retS, vector retS = typeToString(op->returnType(), op->returnIsOptional()); } - string current = getEscapedParamName(paramDecls, "current"); - params.push_back("Ice.Current " + current + " = null"); - args.push_back(current); + string currentParamName = getEscapedParamName(op, "current"); + params.push_back("Ice.Current " + currentParamName + " = null"); + args.push_back(currentParamName); return name; } @@ -2577,8 +2609,8 @@ Slice::Gen::TypesVisitor::visitOperation(const OperationPtr& p) } _out << taskResultType(p); - string progress = getEscapedParamName(inParamDecls, "progress"); - string cancel = getEscapedParamName(inParamDecls, "cancel"); + string progress = getEscapedParamName(p, "progress"); + string cancel = getEscapedParamName(p, "cancel"); _out << " " << name << "Async" << spar << inParams << ("_System.IProgress<bool> " + progress + " = null") @@ -2597,8 +2629,8 @@ Slice::Gen::TypesVisitor::visitOperation(const OperationPtr& p) _out << "public abstract "; } _out << "Ice.AsyncResult begin_" << name << spar << inParams - << "Ice.AsyncCallback " + getEscapedParamName(inParamDecls, "callback") + " = null" - << "object " + getEscapedParamName(inParamDecls, "cookie") + " = null" << epar << ';'; + << "Ice.AsyncCallback " + getEscapedParamName(p, "callback") + " = null" + << "object " + getEscapedParamName(p, "cookie") + " = null" << epar << ';'; _out << sp; emitAttributes(p); @@ -2609,7 +2641,7 @@ Slice::Gen::TypesVisitor::visitOperation(const OperationPtr& p) _out << "public abstract "; } _out << retS << " end_" << name << spar << getOutParams(p, false, true) - << "Ice.AsyncResult " + getEscapedParamName(p->outParameters(), "asyncResult") << epar << ';'; + << "Ice.AsyncResult " + getEscapedParamName(p, "asyncResult") << epar << ';'; } } } @@ -2930,7 +2962,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) _out << nl << "ostr_.startSlice(\"" << scoped << "\", -1, " << (!base ? "true" : "false") << ");"; for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q) { - writeMarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception), "ostr_"); + writeMarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception)); } _out << nl << "ostr_.endSlice();"; if(base) @@ -3095,7 +3127,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) const bool needCustomPatcher = classMembers.size() > 1; for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q) { - writeUnmarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception), needCustomPatcher, patchIter, "istr_"); + writeUnmarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception), needCustomPatcher, patchIter); } _out << nl << "istr_.endSlice();"; if(base) @@ -3326,11 +3358,11 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p) _out << sp; emitGeneratedCodeAttribute(); - _out << nl << "public void iceWrite(Ice.OutputStream ostr_)"; + _out << nl << "public void ice_writeMembers(Ice.OutputStream ostr)"; _out << sb; for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q) { - writeMarshalDataMember(*q, fixId(*q, isClass ? DotNet::ICloneable : 0), "ostr_"); + writeMarshalDataMember(*q, fixId(*q, isClass ? DotNet::ICloneable : 0), true); } _out << eb; @@ -3411,44 +3443,44 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p) _out << sp; emitGeneratedCodeAttribute(); - _out << nl << "public void iceRead(Ice.InputStream istr_)"; + _out << nl << "public void ice_readMembers(Ice.InputStream istr)"; _out << sb; int patchIter = 0; const bool needCustomPatcher = classMembers.size() > 1; for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q) { writeUnmarshalDataMember(*q, fixId(*q, isClass ? DotNet::ICloneable : 0), needCustomPatcher, - patchIter, "istr_"); + patchIter, true); } _out << eb; _out << sp; emitGeneratedCodeAttribute(); - _out << nl << "public static void write(Ice.OutputStream ostr, " << name << " v)"; + _out << nl << "public static void ice_write(Ice.OutputStream ostr, " << name << " v)"; _out << sb; if(isClass) { _out << nl << "if(v == null)"; _out << sb; - _out << nl << "_nullMarshalValue.iceWrite(ostr);"; + _out << nl << "_nullMarshalValue.ice_writeMembers(ostr);"; _out << eb; _out << nl << "else"; _out << sb; - _out << nl << "v.iceWrite(ostr);"; + _out << nl << "v.ice_writeMembers(ostr);"; _out << eb; } else { - _out << nl << "v.iceWrite(ostr);"; + _out << nl << "v.ice_writeMembers(ostr);"; } _out << eb; _out << sp; emitGeneratedCodeAttribute(); - _out << nl << "public static " << name << " read(Ice.InputStream istr)"; + _out << nl << "public static " << name << " ice_read(Ice.InputStream istr)"; _out << sb; - _out << nl << name << " v = new " << name << "();"; - _out << nl << "v.iceRead(istr);"; + _out << nl << "var v = new " << name << "();"; + _out << nl << "v.ice_readMembers(istr);"; _out << nl << "return v;"; _out << eb; @@ -3972,7 +4004,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) // // Write the synchronous version of the operation. // - string context = getEscapedParamName(p->parameters(), "context"); + string context = getEscapedParamName(p, "context"); _out << sp; writeDocComment(p, deprecateReason, "<param name=\"" + context + " \">The Context map to send with the invocation.</param>"); @@ -3988,9 +4020,9 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) // // Write the async version of the operation (using Async Task API) // - string context = getEscapedParamName(inParamDecls, "context"); - string cancel = getEscapedParamName(inParamDecls, "cancel"); - string progress = getEscapedParamName(inParamDecls, "progress"); + string context = getEscapedParamName(p, "context"); + string cancel = getEscapedParamName(p, "cancel"); + string progress = getEscapedParamName(p, "progress"); _out << sp; writeDocCommentTaskAsyncAMI(p, deprecateReason, @@ -4016,10 +4048,10 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) string clScope = fixId(cl->scope()); string delType = clScope + "Callback_" + cl->name() + "_" + p->name(); - string context = getEscapedParamName(inParamDecls, "context"); - string callback = getEscapedParamName(inParamDecls, "callback"); - string cookie = getEscapedParamName(inParamDecls, "cookie"); - string asyncResult = getEscapedParamName(p->outParameters(), "asyncResult"); + string context = getEscapedParamName(p, "context"); + string callback = getEscapedParamName(p, "callback"); + string cookie = getEscapedParamName(p, "cookie"); + string asyncResult = getEscapedParamName(p, "asyncResult"); _out << sp; writeDocCommentAMI(p, InParam, deprecateReason, @@ -4320,7 +4352,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) throws.sort(Slice::DerivedToBaseCompare()); #endif - string context = getEscapedParamName(op->parameters(), "context"); + string context = getEscapedParamName(op, "context"); _out << sp; _out << nl << "public " << retS << " " << opName << spar << params @@ -4402,9 +4434,9 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) ParamDeclList inParams = op->inParameters(); ParamDeclList outParams = op->outParameters(); - string context = getEscapedParamName(inParams, "context"); - string cancel = getEscapedParamName(inParams, "cancel"); - string progress = getEscapedParamName(inParams, "progress"); + string context = getEscapedParamName(op, "context"); + string cancel = getEscapedParamName(op, "cancel"); + string progress = getEscapedParamName(op, "progress"); TypePtr ret = op->returnType(); @@ -4636,9 +4668,9 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) // string delType = clScope + "Callback_" + cl->name() + "_" + op->name(); - string context = getEscapedParamName(inParams, "context"); - string callback = getEscapedParamName(inParams, "callback"); - string cookie = getEscapedParamName(inParams, "cookie"); + string context = getEscapedParamName(op, "context"); + string callback = getEscapedParamName(op, "callback"); + string cookie = getEscapedParamName(op, "cookie"); _out << sp; _out << nl << "public Ice.AsyncResult<" << delType << "> begin_" << opName << spar << paramsAMI @@ -4669,7 +4701,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) // Write the end_ method. // string flatName = "_" + opName + "_name"; - string asyncResult = getEscapedParamName(outParams, "asyncResult"); + string asyncResult = getEscapedParamName(op, "asyncResult"); _out << sp << nl << "public " << retS << " end_" << opName << spar << getOutParams(op, false, true) << "Ice.AsyncResult " + asyncResult << epar; diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h index d4de81b812c..d061616693d 100644 --- a/cpp/src/slice2cs/Gen.h +++ b/cpp/src/slice2cs/Gen.h @@ -28,8 +28,8 @@ protected: void writeMarshalUnmarshalParams(const ParamDeclList&, const OperationPtr&, bool, bool = false, bool = false, const std::string& = ""); void writePostUnmarshalParams(const ParamDeclList&, const OperationPtr&); - void writeMarshalDataMember(const DataMemberPtr&, const std::string&, const std::string& = ""); - void writeUnmarshalDataMember(const DataMemberPtr&, const std::string&, bool, int&, const std::string& = ""); + void writeMarshalDataMember(const DataMemberPtr&, const std::string&, bool = false); + void writeUnmarshalDataMember(const DataMemberPtr&, const std::string&, bool, int&, bool = false); virtual void writeInheritedOperations(const ClassDefPtr&); virtual void writeDispatch(const ClassDefPtr&); diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 0e196df0626..d91af385c73 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -3320,7 +3320,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p) if(!p->isLocal()) { - out << sp << nl << "public void write(com.zeroc.Ice.OutputStream ostr)"; + out << sp << nl << "public void ice_writeMembers(com.zeroc.Ice.OutputStream ostr)"; out << sb; iter = 0; for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d) @@ -3331,7 +3331,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p) DataMemberList classMembers = p->classDataMembers(); - out << sp << nl << "public void read(com.zeroc.Ice.InputStream istr)"; + out << sp << nl << "public void ice_readMembers(com.zeroc.Ice.InputStream istr)"; out << sb; iter = 0; for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d) @@ -3340,25 +3340,25 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p) } out << eb; - out << sp << nl << "static public void write(com.zeroc.Ice.OutputStream ostr, " << name << " v)"; + out << sp << nl << "static public void ice_write(com.zeroc.Ice.OutputStream ostr, " << name << " v)"; out << sb; out << nl << "if(v == null)"; out << sb; - out << nl << "_nullMarshalValue.write(ostr);"; + out << nl << "_nullMarshalValue.ice_writeMembers(ostr);"; out << eb; out << nl << "else"; out << sb; - out << nl << "v.write(ostr);"; + out << nl << "v.ice_writeMembers(ostr);"; out << eb; out << eb; - out << sp << nl << "static public " << name << " read(com.zeroc.Ice.InputStream istr, " << name << " v)"; + out << sp << nl << "static public " << name << " ice_read(com.zeroc.Ice.InputStream istr, " << name << " v)"; out << sb; out << nl << "if(v == null)"; out << sb; out << nl << " v = new " << name << "();"; out << eb; - out << nl << "v.read(istr);"; + out << nl << "v.ice_readMembers(istr);"; out << nl << "return v;"; out << eb; @@ -3821,12 +3821,12 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p) if(!p->isLocal()) { - out << sp << nl << "public void write(com.zeroc.Ice.OutputStream ostr)"; + out << sp << nl << "public void ice_write(com.zeroc.Ice.OutputStream ostr)"; out << sb; out << nl << "ostr.writeEnum(_value, " << p->maxValue() << ");"; out << eb; - out << sp << nl << "public static void write(com.zeroc.Ice.OutputStream ostr, " << name << " v)"; + out << sp << nl << "public static void ice_write(com.zeroc.Ice.OutputStream ostr, " << name << " v)"; out << sb; out << nl << "if(v == null)"; out << sb; @@ -3839,7 +3839,7 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p) out << eb; out << eb; - out << sp << nl << "public static " << name << " read(com.zeroc.Ice.InputStream istr)"; + out << sp << nl << "public static " << name << " ice_read(com.zeroc.Ice.InputStream istr)"; out << sb; out << nl << "int v = istr.readEnum(" << p->maxValue() << ");"; out << nl << "return validate(v);"; diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp index d5894291f3e..a2347ae3b08 100644 --- a/cpp/src/slice2java/GenCompat.cpp +++ b/cpp/src/slice2java/GenCompat.cpp @@ -3689,7 +3689,7 @@ Slice::GenCompat::TypesVisitor::visitStructEnd(const StructPtr& p) if(!p->isLocal()) { - out << sp << nl << "public void" << nl << "write(Ice.OutputStream ostr)"; + out << sp << nl << "public void" << nl << "ice_writeMembers(Ice.OutputStream ostr)"; out << sb; iter = 0; for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d) @@ -3705,7 +3705,7 @@ Slice::GenCompat::TypesVisitor::visitStructEnd(const StructPtr& p) writePatcher(out, package, classMembers, DataMemberList()); } - out << sp << nl << "public void" << nl << "read(Ice.InputStream istr)"; + out << sp << nl << "public void" << nl << "ice_readMembers(Ice.InputStream istr)"; out << sb; iter = 0; int patchIter = 0; @@ -3716,25 +3716,25 @@ Slice::GenCompat::TypesVisitor::visitStructEnd(const StructPtr& p) } out << eb; - out << sp << nl << "static public void" << nl << "write(Ice.OutputStream ostr, " << name << " v)"; + out << sp << nl << "static public void" << nl << "ice_write(Ice.OutputStream ostr, " << name << " v)"; out << sb; out << nl << "if(v == null)"; out << sb; - out << nl << "_nullMarshalValue.write(ostr);"; + out << nl << "_nullMarshalValue.ice_writeMembers(ostr);"; out << eb; out << nl << "else"; out << sb; - out << nl << "v.write(ostr);"; + out << nl << "v.ice_writeMembers(ostr);"; out << eb; out << eb; - out << sp << nl << "static public " << name << nl << "read(Ice.InputStream istr, " << name << " v)"; + out << sp << nl << "static public " << name << nl << "ice_read(Ice.InputStream istr, " << name << " v)"; out << sb; out << nl << "if(v == null)"; out << sb; out << nl << " v = new " << name << "();"; out << eb; - out << nl << "v.read(istr);"; + out << nl << "v.ice_readMembers(istr);"; out << nl << "return v;"; out << eb; @@ -4104,12 +4104,12 @@ Slice::GenCompat::TypesVisitor::visitEnum(const EnumPtr& p) if(!p->isLocal()) { - out << sp << nl << "public void write(Ice.OutputStream ostr)"; + out << sp << nl << "public void ice_write(Ice.OutputStream ostr)"; out << sb; out << nl << "ostr.writeEnum(_value, " << p->maxValue() << ");"; out << eb; - out << sp << nl << "public static void write(Ice.OutputStream ostr, " << name << " v)"; + out << sp << nl << "public static void ice_write(Ice.OutputStream ostr, " << name << " v)"; out << sb; out << nl << "if(v == null)"; out << sb; @@ -4122,7 +4122,7 @@ Slice::GenCompat::TypesVisitor::visitEnum(const EnumPtr& p) out << eb; out << eb; - out << sp << nl << "public static " << name << " read(Ice.InputStream istr)"; + out << sp << nl << "public static " << name << " ice_read(Ice.InputStream istr)"; out << sb; out << nl << "int v = istr.readEnum(" << p->maxValue() << ");"; out << nl << "return validate(v);"; diff --git a/csharp/src/Ice/ConnectionI.cs b/csharp/src/Ice/ConnectionI.cs index 4475bb107a2..5988800b523 100644 --- a/csharp/src/Ice/ConnectionI.cs +++ b/csharp/src/Ice/ConnectionI.cs @@ -1071,10 +1071,10 @@ namespace Ice } ProtocolVersion pv = new ProtocolVersion(); - pv.iceRead(_readStream); + pv.ice_readMembers(_readStream); IceInternal.Protocol.checkSupportedProtocol(pv); EncodingVersion ev = new EncodingVersion(); - ev.iceRead(_readStream); + ev.ice_readMembers(_readStream); IceInternal.Protocol.checkSupportedProtocolEncoding(ev); _readStream.readByte(); // messageType @@ -1949,8 +1949,8 @@ namespace Ice // OutputStream os = new OutputStream(_instance, Util.currentProtocolEncoding); os.writeBlob(IceInternal.Protocol.magic); - Ice.Util.currentProtocol.iceWrite(os); - Ice.Util.currentProtocolEncoding.iceWrite(os); + Ice.Util.currentProtocol.ice_writeMembers(os); + Ice.Util.currentProtocolEncoding.ice_writeMembers(os); os.writeByte(IceInternal.Protocol.closeConnectionMsg); os.writeByte(_compressionSupported ? (byte)1 : (byte)0); os.writeInt(IceInternal.Protocol.headerSize); // Message size. @@ -1981,8 +1981,8 @@ namespace Ice { OutputStream os = new OutputStream(_instance, Util.currentProtocolEncoding); os.writeBlob(IceInternal.Protocol.magic); - Ice.Util.currentProtocol.iceWrite(os); - Ice.Util.currentProtocolEncoding.iceWrite(os); + Ice.Util.currentProtocol.ice_writeMembers(os); + Ice.Util.currentProtocolEncoding.ice_writeMembers(os); os.writeByte(IceInternal.Protocol.validateConnectionMsg); os.writeByte((byte)0); os.writeInt(IceInternal.Protocol.headerSize); // Message size. @@ -2027,8 +2027,8 @@ namespace Ice if(_writeStream.size() == 0) { _writeStream.writeBlob(IceInternal.Protocol.magic); - Ice.Util.currentProtocol.iceWrite(_writeStream); - Ice.Util.currentProtocolEncoding.iceWrite(_writeStream); + Ice.Util.currentProtocol.ice_writeMembers(_writeStream); + Ice.Util.currentProtocolEncoding.ice_writeMembers(_writeStream); _writeStream.writeByte(IceInternal.Protocol.validateConnectionMsg); _writeStream.writeByte((byte)0); // Compression status (always zero for validate connection). _writeStream.writeInt(IceInternal.Protocol.headerSize); // Message size. @@ -2098,11 +2098,11 @@ namespace Ice } ProtocolVersion pv = new ProtocolVersion(); - pv.iceRead(_readStream); + pv.ice_readMembers(_readStream); IceInternal.Protocol.checkSupportedProtocol(pv); EncodingVersion ev = new EncodingVersion(); - ev.iceRead(_readStream); + ev.ice_readMembers(_readStream); IceInternal.Protocol.checkSupportedProtocolEncoding(ev); byte messageType = _readStream.readByte(); diff --git a/csharp/src/Ice/Incoming.cs b/csharp/src/Ice/Incoming.cs index 36b0f721892..8041c89625e 100644 --- a/csharp/src/Ice/Incoming.cs +++ b/csharp/src/Ice/Incoming.cs @@ -110,7 +110,7 @@ namespace IceInternal // // Read the current. // - _current.id.iceRead(_is); + _current.id.ice_readMembers(_is); // // For compatibility with the old FacetPath. @@ -605,7 +605,7 @@ namespace IceInternal { Debug.Assert(false); } - ex.id.iceWrite(_os); + ex.id.ice_writeMembers(_os); // // For compatibility with the old FacetPath. diff --git a/csharp/src/Ice/InputStream.cs b/csharp/src/Ice/InputStream.cs index 1eac58e63f1..bf569a3dd82 100644 --- a/csharp/src/Ice/InputStream.cs +++ b/csharp/src/Ice/InputStream.cs @@ -558,7 +558,7 @@ namespace Ice _encapsStack.sz = sz; EncodingVersion encoding = new EncodingVersion(); - encoding.iceRead(this); + encoding.ice_readMembers(this); Protocol.checkSupportedEncoding(encoding); // Make sure the encoding is supported. _encapsStack.setEncoding(encoding); @@ -627,7 +627,7 @@ namespace Ice } var encoding = new EncodingVersion(); - encoding.iceRead(this); + encoding.ice_readMembers(this); if(encoding.Equals(Util.Encoding_1_0)) { if(sz != 6) @@ -664,7 +664,7 @@ namespace Ice } encoding = new EncodingVersion(); - encoding.iceRead(this); + encoding.ice_readMembers(this); _buf.b.position(_buf.b.position() - 6); byte[] v = new byte[sz]; @@ -710,7 +710,7 @@ namespace Ice throw new UnmarshalOutOfBoundsException(); } EncodingVersion encoding = new EncodingVersion(); - encoding.iceRead(this); + encoding.ice_readMembers(this); try { _buf.b.position(_buf.b.position() + sz - 6); diff --git a/csharp/src/Ice/OutgoingAsync.cs b/csharp/src/Ice/OutgoingAsync.cs index 44f87eb97fd..04c6069f7e9 100644 --- a/csharp/src/Ice/OutgoingAsync.cs +++ b/csharp/src/Ice/OutgoingAsync.cs @@ -695,7 +695,7 @@ namespace IceInternal Reference rf = proxy_.iceReference(); - rf.getIdentity().iceWrite(os_); + rf.getIdentity().ice_writeMembers(os_); // // For compatibility with the old FacetPath. @@ -786,7 +786,7 @@ namespace IceInternal case ReplyStatus.replyOperationNotExist: { Ice.Identity ident = new Ice.Identity(); - ident.iceRead(is_); + ident.ice_readMembers(is_); // // For compatibility with the old FacetPath. diff --git a/csharp/src/Ice/OutputStream.cs b/csharp/src/Ice/OutputStream.cs index 930270c4207..2dc2521c443 100644 --- a/csharp/src/Ice/OutputStream.cs +++ b/csharp/src/Ice/OutputStream.cs @@ -343,7 +343,7 @@ namespace Ice _encapsStack.start = _buf.b.position(); writeInt(0); // Placeholder for the encapsulation length. - _encapsStack.encoding.iceWrite(this); + _encapsStack.encoding.ice_writeMembers(this); } /// <summary> @@ -373,7 +373,7 @@ namespace Ice { Protocol.checkSupportedEncoding(encoding); writeInt(6); // Size - encoding.iceWrite(this); + encoding.ice_writeMembers(this); } /// <summary> @@ -1972,7 +1972,7 @@ namespace Ice else { Identity ident = new Identity(); - ident.iceWrite(this); + ident.ice_writeMembers(this); } } diff --git a/csharp/src/Ice/Proxy.cs b/csharp/src/Ice/Proxy.cs index 6f982179332..78ec0f9ecbe 100644 --- a/csharp/src/Ice/Proxy.cs +++ b/csharp/src/Ice/Proxy.cs @@ -2401,7 +2401,7 @@ namespace Ice public void iceWrite(OutputStream os) { - _reference.getIdentity().iceWrite(os); + _reference.getIdentity().ice_writeMembers(os); _reference.streamWrite(os); } diff --git a/csharp/src/Ice/ProxyFactory.cs b/csharp/src/Ice/ProxyFactory.cs index 159468ba8e3..012a26b0afe 100644 --- a/csharp/src/Ice/ProxyFactory.cs +++ b/csharp/src/Ice/ProxyFactory.cs @@ -57,7 +57,7 @@ namespace IceInternal public Ice.ObjectPrx streamToProxy(Ice.InputStream s) { Ice.Identity ident = new Ice.Identity(); - ident.iceRead(s); + ident.ice_readMembers(s); Reference r = _instance.referenceFactory().create(ident, s); return referenceToProxy(r); diff --git a/csharp/src/Ice/Reference.cs b/csharp/src/Ice/Reference.cs index 8ae5d9e78bf..6aa49ecac17 100644 --- a/csharp/src/Ice/Reference.cs +++ b/csharp/src/Ice/Reference.cs @@ -269,8 +269,8 @@ namespace IceInternal if(!s.getEncoding().Equals(Ice.Util.Encoding_1_0)) { - _protocol.iceWrite(s); - _encoding.iceWrite(s); + _protocol.ice_writeMembers(s); + _encoding.ice_writeMembers(s); } // Derived class writes the remainder of the reference. diff --git a/csharp/src/Ice/ReferenceFactory.cs b/csharp/src/Ice/ReferenceFactory.cs index d5782ed7ffc..b7716a1914a 100644 --- a/csharp/src/Ice/ReferenceFactory.cs +++ b/csharp/src/Ice/ReferenceFactory.cs @@ -593,9 +593,9 @@ namespace IceInternal if(!s.getEncoding().Equals(Ice.Util.Encoding_1_0)) { protocol = new Ice.ProtocolVersion(); - protocol.iceRead(s); + protocol.ice_readMembers(s); encoding = new Ice.EncodingVersion(); - encoding.iceRead(s); + encoding.ice_readMembers(s); } else { diff --git a/csharp/src/Ice/TraceUtil.cs b/csharp/src/Ice/TraceUtil.cs index 8aec8ed6de9..54e2783a187 100644 --- a/csharp/src/Ice/TraceUtil.cs +++ b/csharp/src/Ice/TraceUtil.cs @@ -183,7 +183,7 @@ namespace IceInternal } Ice.Identity identity = new Ice.Identity(); - identity.iceRead(str); + identity.ice_readMembers(str); s.Write("\nidentity = " + Ice.Util.identityToString(identity, toStringMode)); string[] facet = str.readStringSeq(); diff --git a/csharp/src/Ice/UdpEndpointI.cs b/csharp/src/Ice/UdpEndpointI.cs index 0bcdfc61c82..7180de35718 100644 --- a/csharp/src/Ice/UdpEndpointI.cs +++ b/csharp/src/Ice/UdpEndpointI.cs @@ -9,7 +9,6 @@ namespace IceInternal { - using System.Diagnostics; using System.Collections; using System.Collections.Generic; @@ -259,8 +258,8 @@ namespace IceInternal base.streamWriteImpl(s); if(s.getEncoding().Equals(Ice.Util.Encoding_1_0)) { - Ice.Util.Protocol_1_0.iceWrite(s); - Ice.Util.Encoding_1_0.iceWrite(s); + Ice.Util.Protocol_1_0.ice_writeMembers(s); + Ice.Util.Encoding_1_0.ice_writeMembers(s); } // Not transmitted. //s.writeBool(_connect); diff --git a/csharp/test/Ice/optional/AllTests.cs b/csharp/test/Ice/optional/AllTests.cs index b012684c7d3..ff2ea227be7 100644 --- a/csharp/test/Ice/optional/AllTests.cs +++ b/csharp/test/Ice/optional/AllTests.cs @@ -1021,7 +1021,7 @@ public class AllTests : TestCommon.TestApp os.startEncapsulation(); os.writeOptional(2, Ice.OptionalFormat.VSize); os.writeSize(1); - p1.Value.iceWrite(os); + p1.Value.ice_writeMembers(os); os.endEncapsulation(); inEncaps = os.finished(); initial.ice_invoke("opSmallStruct", Ice.OperationMode.Normal, inEncaps, out outEncaps); @@ -1030,11 +1030,11 @@ public class AllTests : TestCommon.TestApp test(@in.readOptional(1, Ice.OptionalFormat.VSize)); @in.skipSize(); Test.SmallStruct f = new Test.SmallStruct(); - f.iceRead(@in); + f.ice_readMembers(@in); test(f.m == (byte)56); test(@in.readOptional(3, Ice.OptionalFormat.VSize)); @in.skipSize(); - f.iceRead(@in); + f.ice_readMembers(@in); test(f.m == (byte)56); @in.endEncapsulation(); @@ -1070,7 +1070,7 @@ public class AllTests : TestCommon.TestApp os.startEncapsulation(); os.writeOptional(2, Ice.OptionalFormat.VSize); os.writeSize(4); - p1.Value.iceWrite(os); + p1.Value.ice_writeMembers(os); os.endEncapsulation(); inEncaps = os.finished(); initial.ice_invoke("opFixedStruct", Ice.OperationMode.Normal, inEncaps, out outEncaps); @@ -1079,11 +1079,11 @@ public class AllTests : TestCommon.TestApp test(@in.readOptional(1, Ice.OptionalFormat.VSize)); @in.skipSize(); Test.FixedStruct f = new Test.FixedStruct(); - f.iceRead(@in); + f.ice_readMembers(@in); test(f.m == 56); test(@in.readOptional(3, Ice.OptionalFormat.VSize)); @in.skipSize(); - f.iceRead(@in); + f.ice_readMembers(@in); test(f.m == 56); @in.endEncapsulation(); @@ -1124,7 +1124,7 @@ public class AllTests : TestCommon.TestApp os.startEncapsulation(); os.writeOptional(2, Ice.OptionalFormat.FSize); int pos = os.startSize(); - p1.Value.iceWrite(os); + p1.Value.ice_writeMembers(os); os.endSize(pos); os.endEncapsulation(); inEncaps = os.finished(); @@ -1134,11 +1134,11 @@ public class AllTests : TestCommon.TestApp test(@in.readOptional(1, Ice.OptionalFormat.FSize)); @in.skip(4); Test.VarStruct v = new Test.VarStruct(); - v.iceRead(@in); + v.ice_readMembers(@in); test(v.m.Equals("test")); test(@in.readOptional(3, Ice.OptionalFormat.FSize)); @in.skip(4); - v.iceRead(@in); + v.ice_readMembers(@in); test(v.m.Equals("test")); @in.endEncapsulation(); diff --git a/csharp/test/Ice/stream/AllTests.cs b/csharp/test/Ice/stream/AllTests.cs index 19eef43c41d..ddc16de2ae9 100644 --- a/csharp/test/Ice/stream/AllTests.cs +++ b/csharp/test/Ice/stream/AllTests.cs @@ -269,9 +269,9 @@ public class AllTests : TestCommon.TestApp s.str = "7"; s.e = MyEnum.enum2; s.p = MyClassPrxHelper.uncheckedCast(communicator.stringToProxy("test:default")); - SmallStruct.write(outS, s); + SmallStruct.ice_write(outS, s); var data = outS.finished(); - var s2 = SmallStruct.read(new Ice.InputStream(communicator, data)); + var s2 = SmallStruct.ice_read(new Ice.InputStream(communicator, data)); test(s2.Equals(s)); } diff --git a/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java b/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java index 92d1c6fee04..f4f1b32f4bf 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java +++ b/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java @@ -887,10 +887,10 @@ public final class ConnectionI extends IceInternal.EventHandler throw ex; } - _readProtocol.read(_readStream); + _readProtocol.ice_readMembers(_readStream); IceInternal.Protocol.checkSupportedProtocol(_readProtocol); - _readProtocolEncoding.read(_readStream); + _readProtocolEncoding.ice_readMembers(_readStream); IceInternal.Protocol.checkSupportedProtocolEncoding(_readProtocolEncoding); _readStream.readByte(); // messageType @@ -1885,8 +1885,8 @@ public final class ConnectionI extends IceInternal.EventHandler // OutputStream os = new OutputStream(_instance, IceInternal.Protocol.currentProtocolEncoding); os.writeBlob(IceInternal.Protocol.magic); - IceInternal.Protocol.currentProtocol.write(os); - IceInternal.Protocol.currentProtocolEncoding.write(os); + IceInternal.Protocol.currentProtocol.ice_writeMembers(os); + IceInternal.Protocol.currentProtocolEncoding.ice_writeMembers(os); os.writeByte(IceInternal.Protocol.closeConnectionMsg); os.writeByte((byte) 0); // compression status: always report 0 for // CloseConnection in Java. @@ -1918,8 +1918,8 @@ public final class ConnectionI extends IceInternal.EventHandler { OutputStream os = new OutputStream(_instance, IceInternal.Protocol.currentProtocolEncoding); os.writeBlob(IceInternal.Protocol.magic); - IceInternal.Protocol.currentProtocol.write(os); - IceInternal.Protocol.currentProtocolEncoding.write(os); + IceInternal.Protocol.currentProtocol.ice_writeMembers(os); + IceInternal.Protocol.currentProtocolEncoding.ice_writeMembers(os); os.writeByte(IceInternal.Protocol.validateConnectionMsg); os.writeByte((byte) 0); os.writeInt(IceInternal.Protocol.headerSize); // Message size. @@ -1969,8 +1969,8 @@ public final class ConnectionI extends IceInternal.EventHandler if(_writeStream.isEmpty()) { _writeStream.writeBlob(IceInternal.Protocol.magic); - IceInternal.Protocol.currentProtocol.write(_writeStream); - IceInternal.Protocol.currentProtocolEncoding.write(_writeStream); + IceInternal.Protocol.currentProtocol.ice_writeMembers(_writeStream); + IceInternal.Protocol.currentProtocolEncoding.ice_writeMembers(_writeStream); _writeStream.writeByte(IceInternal.Protocol.validateConnectionMsg); _writeStream.writeByte((byte) 0); // Compression status // (always zero for @@ -2043,10 +2043,10 @@ public final class ConnectionI extends IceInternal.EventHandler throw ex; } - _readProtocol.read(_readStream); + _readProtocol.ice_readMembers(_readStream); IceInternal.Protocol.checkSupportedProtocol(_readProtocol); - _readProtocolEncoding.read(_readStream); + _readProtocolEncoding.ice_readMembers(_readStream); IceInternal.Protocol.checkSupportedProtocolEncoding(_readProtocolEncoding); byte messageType = _readStream.readByte(); diff --git a/java-compat/src/Ice/src/main/java/Ice/InputStream.java b/java-compat/src/Ice/src/main/java/Ice/InputStream.java index 46ad2ffdbf1..eab7649730f 100644 --- a/java-compat/src/Ice/src/main/java/Ice/InputStream.java +++ b/java-compat/src/Ice/src/main/java/Ice/InputStream.java @@ -581,7 +581,7 @@ public class InputStream _encapsStack.sz = sz; EncodingVersion encoding = new EncodingVersion(); - encoding.read(this); + encoding.ice_readMembers(this); IceInternal.Protocol.checkSupportedEncoding(encoding); // Make sure the encoding is supported. _encapsStack.setEncoding(encoding); @@ -650,7 +650,7 @@ public class InputStream throw new Ice.UnmarshalOutOfBoundsException(); } - EncodingVersion encoding = EncodingVersion.read(this, null); + EncodingVersion encoding = EncodingVersion.ice_read(this, null); if(encoding.equals(Ice.Util.Encoding_1_0)) { if(sz != 6) @@ -691,7 +691,7 @@ public class InputStream if(encoding != null) { - encoding.read(this); + encoding.ice_readMembers(this); _buf.b.position(_buf.b.position() - 6); } else @@ -745,7 +745,7 @@ public class InputStream throw new UnmarshalOutOfBoundsException(); } EncodingVersion encoding = new EncodingVersion(); - encoding.read(this); + encoding.ice_readMembers(this); try { _buf.b.position(_buf.b.position() + sz - 6); diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java b/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java index cb6ccb2adb2..b6804ecaf9e 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java +++ b/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java @@ -2545,7 +2545,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public void _write(OutputStream os) { - _reference.getIdentity().write(os); + _reference.getIdentity().ice_writeMembers(os); _reference.streamWrite(os); } diff --git a/java-compat/src/Ice/src/main/java/Ice/OutputStream.java b/java-compat/src/Ice/src/main/java/Ice/OutputStream.java index 3b5df79e17e..17978cd18f2 100644 --- a/java-compat/src/Ice/src/main/java/Ice/OutputStream.java +++ b/java-compat/src/Ice/src/main/java/Ice/OutputStream.java @@ -386,7 +386,7 @@ public class OutputStream _encapsStack.start = _buf.size(); writeInt(0); // Placeholder for the encapsulation length. - _encapsStack.encoding.write(this); + _encapsStack.encoding.ice_writeMembers(this); } /** @@ -417,7 +417,7 @@ public class OutputStream { IceInternal.Protocol.checkSupportedEncoding(encoding); writeInt(6); // Size - encoding.write(this); + encoding.ice_writeMembers(this); } /** @@ -1578,7 +1578,7 @@ public class OutputStream else { Identity ident = new Identity(); - ident.write(this); + ident.ice_writeMembers(this); } } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java b/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java index 5234074afc0..a7143580287 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java @@ -101,7 +101,7 @@ final public class Incoming extends IncomingBase implements Ice.Request // // Read the current. // - _current.id.read(_is); + _current.id.ice_readMembers(_is); // // For compatibility with the old FacetPath. diff --git a/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java b/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java index df4a9d419c7..2367f23e868 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java @@ -345,7 +345,7 @@ class IncomingBase { assert(false); } - ex.id.write(_os); + ex.id.ice_writeMembers(_os); // // For compatibility with the old FacetPath. diff --git a/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java b/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java index 2d47a89a4da..eba13bd4fd1 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java @@ -72,7 +72,7 @@ public class OutgoingAsync extends ProxyOutgoingAsyncBase Reference ref = _proxy._getReference(); - ref.getIdentity().write(_os); + ref.getIdentity().ice_writeMembers(_os); // // For compatibility with the old FacetPath. @@ -233,7 +233,7 @@ public class OutgoingAsync extends ProxyOutgoingAsyncBase case ReplyStatus.replyOperationNotExist: { Ice.Identity id = new Ice.Identity(); - id.read(_is); + id.ice_readMembers(_is); // // For compatibility with the old FacetPath. diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java index 8b96b2081bc..43fd22d3030 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java @@ -60,7 +60,7 @@ public final class ProxyFactory streamToProxy(Ice.InputStream s) { Ice.Identity ident = new Ice.Identity(); - ident.read(s); + ident.ice_readMembers(s); Reference ref = _instance.referenceFactory().create(ident, s); return referenceToProxy(ref); diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Reference.java b/java-compat/src/Ice/src/main/java/IceInternal/Reference.java index cbe05e19cd9..a1869b1fcda 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Reference.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Reference.java @@ -283,8 +283,8 @@ public abstract class Reference implements Cloneable if(!s.getEncoding().equals(Ice.Util.Encoding_1_0)) { - _protocol.write(s); - _encoding.write(s); + _protocol.ice_writeMembers(s); + _encoding.ice_writeMembers(s); } // Derived class writes the remainder of the reference. diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java index 4162156654e..66582f9c55d 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java @@ -587,9 +587,9 @@ public final class ReferenceFactory if(!s.getEncoding().equals(Ice.Util.Encoding_1_0)) { protocol = new Ice.ProtocolVersion(); - protocol.read(s); + protocol.ice_readMembers(s); encoding = new Ice.EncodingVersion(); - encoding.read(s); + encoding.ice_readMembers(s); } else { diff --git a/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java b/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java index f433f823bd1..4159c15550d 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java @@ -173,7 +173,7 @@ public final class TraceUtil } Ice.Identity identity = new Ice.Identity(); - identity.read(stream); + identity.ice_readMembers(stream); out.write("\nidentity = " + Ice.Util.identityToString(identity, toStringMode)); String[] facet = stream.readStringSeq(); diff --git a/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java b/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java index 740e33354c8..9d8a1f45c54 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java @@ -256,8 +256,8 @@ final class UdpEndpointI extends IPEndpointI super.streamWriteImpl(s); if(s.getEncoding().equals(Ice.Util.Encoding_1_0)) { - Ice.Util.Protocol_1_0.write(s); - Ice.Util.Encoding_1_0.write(s); + Ice.Util.Protocol_1_0.ice_writeMembers(s); + Ice.Util.Encoding_1_0.ice_writeMembers(s); } // Not transmitted. //s.writeBool(_connect); diff --git a/java-compat/test/src/main/java/test/Ice/enums/AllTests.java b/java-compat/test/src/main/java/test/Ice/enums/AllTests.java index ea044f068ab..9f2ad470db6 100644 --- a/java-compat/test/src/main/java/test/Ice/enums/AllTests.java +++ b/java-compat/test/src/main/java/test/Ice/enums/AllTests.java @@ -129,22 +129,22 @@ public class AllTests communicator.getProperties().getProperty("Ice.Default.EncodingVersion").equals("1.0"); os = new Ice.OutputStream(communicator); - ByteEnum.write(os, ByteEnum.benum11); + ByteEnum.ice_write(os, ByteEnum.benum11); bytes = os.finished(); test(bytes.length == 1); // ByteEnum should require one byte os = new Ice.OutputStream(communicator); - ShortEnum.write(os, ShortEnum.senum11); + ShortEnum.ice_write(os, ShortEnum.senum11); bytes = os.finished(); test(bytes.length == (encoding_1_0 ? 2 : 5)); os = new Ice.OutputStream(communicator); - IntEnum.write(os, IntEnum.ienum11); + IntEnum.ice_write(os, IntEnum.ienum11); bytes = os.finished(); test(bytes.length == (encoding_1_0 ? 4 : 5)); os = new Ice.OutputStream(communicator); - SimpleEnum.write(os, SimpleEnum.blue); + SimpleEnum.ice_write(os, SimpleEnum.blue); bytes = os.finished(); test(bytes.length == 1); // SimpleEnum should require one byte @@ -250,7 +250,7 @@ public class AllTests os = new Ice.OutputStream(communicator); os.writeByte((byte)2); // Invalid enumerator Ice.InputStream in = new Ice.InputStream(communicator, os.finished()); - ByteEnum.read(in); + ByteEnum.ice_read(in); test(false); } catch(Ice.MarshalException ex) @@ -262,7 +262,7 @@ public class AllTests os = new Ice.OutputStream(communicator); os.writeByte((byte)128); // Invalid enumerator Ice.InputStream in = new Ice.InputStream(communicator, os.finished()); - ByteEnum.read(in); + ByteEnum.ice_read(in); test(false); } catch(Ice.MarshalException ex) @@ -274,7 +274,7 @@ public class AllTests os = new Ice.OutputStream(communicator); os.writeShort((short)-1); // Negative enumerators are not supported Ice.InputStream in = new Ice.InputStream(communicator, os.finished()); - ShortEnum.read(in); + ShortEnum.ice_read(in); test(false); } catch(Ice.MarshalException ex) @@ -286,7 +286,7 @@ public class AllTests os = new Ice.OutputStream(communicator); os.writeShort((short)0); // Invalid enumerator Ice.InputStream in = new Ice.InputStream(communicator, os.finished()); - ShortEnum.read(in); + ShortEnum.ice_read(in); test(false); } catch(Ice.MarshalException ex) @@ -298,7 +298,7 @@ public class AllTests os = new Ice.OutputStream(communicator); os.writeShort((short)32767); // Invalid enumerator Ice.InputStream in = new Ice.InputStream(communicator, os.finished()); - ShortEnum.read(in); + ShortEnum.ice_read(in); test(false); } catch(Ice.MarshalException ex) @@ -310,7 +310,7 @@ public class AllTests os = new Ice.OutputStream(communicator); os.writeInt(-1); // Negative enumerators are not supported Ice.InputStream in = new Ice.InputStream(communicator, os.finished()); - IntEnum.read(in); + IntEnum.ice_read(in); test(false); } catch(Ice.MarshalException ex) @@ -322,7 +322,7 @@ public class AllTests os = new Ice.OutputStream(communicator); os.writeInt(2); // Invalid enumerator Ice.InputStream in = new Ice.InputStream(communicator, os.finished()); - IntEnum.read(in); + IntEnum.ice_read(in); test(false); } catch(Ice.MarshalException ex) diff --git a/java-compat/test/src/main/java/test/Ice/optional/AllTests.java b/java-compat/test/src/main/java/test/Ice/optional/AllTests.java index fdfa3ff0f6d..5680234d11d 100644 --- a/java-compat/test/src/main/java/test/Ice/optional/AllTests.java +++ b/java-compat/test/src/main/java/test/Ice/optional/AllTests.java @@ -1005,16 +1005,16 @@ public class AllTests os = new Ice.OutputStream(communicator); os.startEncapsulation(); os.writeOptional(2, Ice.OptionalFormat.Size); - MyEnum.write(os, p1.get()); + MyEnum.ice_write(os, p1.get()); os.endEncapsulation(); inEncaps = os.finished(); initial.ice_invoke("opMyEnumReq", Ice.OperationMode.Normal, inEncaps, outEncaps); in = new Ice.InputStream(communicator, outEncaps.value); in.startEncapsulation(); test(in.readOptional(1, Ice.OptionalFormat.Size)); - test(MyEnum.read(in) == MyEnum.MyEnumMember); + test(MyEnum.ice_read(in) == MyEnum.MyEnumMember); test(in.readOptional(3, Ice.OptionalFormat.Size)); - test(MyEnum.read(in) == MyEnum.MyEnumMember); + test(MyEnum.ice_read(in) == MyEnum.MyEnumMember); in.endEncapsulation(); in = new Ice.InputStream(communicator, outEncaps.value); @@ -1052,7 +1052,7 @@ public class AllTests os.startEncapsulation(); os.writeOptional(2, Ice.OptionalFormat.VSize); os.writeSize(1); - SmallStruct.write(os, p1.get()); + SmallStruct.ice_write(os, p1.get()); os.endEncapsulation(); inEncaps = os.finished(); initial.ice_invoke("opSmallStructReq", Ice.OperationMode.Normal, inEncaps, outEncaps); @@ -1060,11 +1060,11 @@ public class AllTests in.startEncapsulation(); test(in.readOptional(1, Ice.OptionalFormat.VSize)); in.skipSize(); - SmallStruct f = SmallStruct.read(in, null); + SmallStruct f = SmallStruct.ice_read(in, null); test(f.m == (byte)56); test(in.readOptional(3, Ice.OptionalFormat.VSize)); in.skipSize(); - SmallStruct.read(in, f); + SmallStruct.ice_read(in, f); test(f.m == (byte)56); in.endEncapsulation(); @@ -1101,7 +1101,7 @@ public class AllTests os.startEncapsulation(); os.writeOptional(2, Ice.OptionalFormat.VSize); os.writeSize(4); - FixedStruct.write(os, p1.get()); + FixedStruct.ice_write(os, p1.get()); os.endEncapsulation(); inEncaps = os.finished(); initial.ice_invoke("opFixedStructReq", Ice.OperationMode.Normal, inEncaps, outEncaps); @@ -1109,11 +1109,11 @@ public class AllTests in.startEncapsulation(); test(in.readOptional(1, Ice.OptionalFormat.VSize)); in.skipSize(); - FixedStruct f = FixedStruct.read(in, null); + FixedStruct f = FixedStruct.ice_read(in, null); test(f.m == 56); test(in.readOptional(3, Ice.OptionalFormat.VSize)); in.skipSize(); - FixedStruct.read(in, f); + FixedStruct.ice_read(in, f); test(f.m == 56); in.endEncapsulation(); @@ -1150,7 +1150,7 @@ public class AllTests os.startEncapsulation(); os.writeOptional(2, Ice.OptionalFormat.FSize); int pos = os.startSize(); - VarStruct.write(os, p1.get()); + VarStruct.ice_write(os, p1.get()); os.endSize(pos); os.endEncapsulation(); inEncaps = os.finished(); @@ -1159,11 +1159,11 @@ public class AllTests in.startEncapsulation(); test(in.readOptional(1, Ice.OptionalFormat.FSize)); in.skip(4); - VarStruct v = VarStruct.read(in, null); + VarStruct v = VarStruct.ice_read(in, null); test(v.m.equals("test")); test(in.readOptional(3, Ice.OptionalFormat.FSize)); in.skip(4); - VarStruct.read(in, v); + VarStruct.ice_read(in, v); test(v.m.equals("test")); in.endEncapsulation(); diff --git a/java-compat/test/src/main/java/test/Ice/stream/Client.java b/java-compat/test/src/main/java/test/Ice/stream/Client.java index 6bce9f33e62..103222e8820 100644 --- a/java-compat/test/src/main/java/test/Ice/stream/Client.java +++ b/java-compat/test/src/main/java/test/Ice/stream/Client.java @@ -251,10 +251,10 @@ public class Client extends test.Util.Application { out = new Ice.OutputStream(comm); - MyEnum.write(out, MyEnum.enum3); + MyEnum.ice_write(out, MyEnum.enum3); byte[] data = out.finished(); in = new Ice.InputStream(comm, data); - test(MyEnum.read(in) == MyEnum.enum3); + test(MyEnum.ice_read(in) == MyEnum.enum3); } { @@ -270,10 +270,10 @@ public class Client extends test.Util.Application s.str = "7"; s.e = MyEnum.enum2; s.p = MyClassPrxHelper.uncheckedCast(comm.stringToProxy("test:default")); - SmallStruct.write(out, s); + SmallStruct.ice_write(out, s); byte[] data = out.finished(); in = new Ice.InputStream(comm, data); - SmallStruct s2 = SmallStruct.read(in, null); + SmallStruct s2 = SmallStruct.ice_read(in, null); test(s2.equals(s)); } diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java index 3b73897443b..ef086dbf88a 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java @@ -850,10 +850,10 @@ public final class ConnectionI extends com.zeroc.IceInternal.EventHandler throw ex; } - _readProtocol.read(_readStream); + _readProtocol.ice_readMembers(_readStream); Protocol.checkSupportedProtocol(_readProtocol); - _readProtocolEncoding.read(_readStream); + _readProtocolEncoding.ice_readMembers(_readStream); Protocol.checkSupportedProtocolEncoding(_readProtocolEncoding); _readStream.readByte(); // messageType @@ -1849,8 +1849,8 @@ public final class ConnectionI extends com.zeroc.IceInternal.EventHandler // OutputStream os = new OutputStream(_instance, Protocol.currentProtocolEncoding); os.writeBlob(Protocol.magic); - Protocol.currentProtocol.write(os); - Protocol.currentProtocolEncoding.write(os); + Protocol.currentProtocol.ice_writeMembers(os); + Protocol.currentProtocolEncoding.ice_writeMembers(os); os.writeByte(Protocol.closeConnectionMsg); os.writeByte((byte) 0); // compression status: always report 0 for // CloseConnection in Java. @@ -1882,8 +1882,8 @@ public final class ConnectionI extends com.zeroc.IceInternal.EventHandler { OutputStream os = new OutputStream(_instance, Protocol.currentProtocolEncoding); os.writeBlob(Protocol.magic); - Protocol.currentProtocol.write(os); - Protocol.currentProtocolEncoding.write(os); + Protocol.currentProtocol.ice_writeMembers(os); + Protocol.currentProtocolEncoding.ice_writeMembers(os); os.writeByte(Protocol.validateConnectionMsg); os.writeByte((byte) 0); os.writeInt(Protocol.headerSize); // Message size. @@ -1933,8 +1933,8 @@ public final class ConnectionI extends com.zeroc.IceInternal.EventHandler if(_writeStream.isEmpty()) { _writeStream.writeBlob(Protocol.magic); - Protocol.currentProtocol.write(_writeStream); - Protocol.currentProtocolEncoding.write(_writeStream); + Protocol.currentProtocol.ice_writeMembers(_writeStream); + Protocol.currentProtocolEncoding.ice_writeMembers(_writeStream); _writeStream.writeByte(Protocol.validateConnectionMsg); _writeStream.writeByte((byte) 0); // Compression status // (always zero for @@ -2006,10 +2006,10 @@ public final class ConnectionI extends com.zeroc.IceInternal.EventHandler throw ex; } - _readProtocol.read(_readStream); + _readProtocol.ice_readMembers(_readStream); Protocol.checkSupportedProtocol(_readProtocol); - _readProtocolEncoding.read(_readStream); + _readProtocolEncoding.ice_readMembers(_readStream); Protocol.checkSupportedProtocolEncoding(_readProtocolEncoding); byte messageType = _readStream.readByte(); diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java b/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java index 0da5e67d431..e9168100e18 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java @@ -585,7 +585,7 @@ public class InputStream } _encapsStack.sz = sz; - EncodingVersion encoding = EncodingVersion.read(this, null); + EncodingVersion encoding = EncodingVersion.ice_read(this, null); Protocol.checkSupportedEncoding(encoding); // Make sure the encoding is supported. _encapsStack.setEncoding(encoding); @@ -654,7 +654,7 @@ public class InputStream throw new UnmarshalOutOfBoundsException(); } - EncodingVersion encoding = EncodingVersion.read(this, null); + EncodingVersion encoding = EncodingVersion.ice_read(this, null); if(encoding.equals(Util.Encoding_1_0)) { if(sz != 6) @@ -695,7 +695,7 @@ public class InputStream if(encoding != null) { - encoding.read(this); + encoding.ice_readMembers(this); _buf.b.position(_buf.b.position() - 6); } else @@ -748,7 +748,7 @@ public class InputStream { throw new UnmarshalOutOfBoundsException(); } - EncodingVersion encoding = EncodingVersion.read(this, null); + EncodingVersion encoding = EncodingVersion.ice_read(this, null); try { _buf.b.position(_buf.b.position() + sz - 6); diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java b/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java index 4df391c80ce..c48c3a2ac6c 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/OutputStream.java @@ -387,7 +387,7 @@ public class OutputStream _encapsStack.start = _buf.size(); writeInt(0); // Placeholder for the encapsulation length. - _encapsStack.encoding.write(this); + _encapsStack.encoding.ice_writeMembers(this); } /** @@ -418,7 +418,7 @@ public class OutputStream { com.zeroc.IceInternal.Protocol.checkSupportedEncoding(encoding); writeInt(6); // Size - encoding.write(this); + encoding.ice_writeMembers(this); } /** @@ -1579,7 +1579,7 @@ public class OutputStream else { Identity ident = new Identity(); - ident.write(this); + ident.ice_writeMembers(this); } } diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java index 322257dbd1d..426c3b24e3b 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java @@ -438,7 +438,7 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable @Override public void _write(OutputStream os) { - _reference.getIdentity().write(os); + _reference.getIdentity().ice_writeMembers(os); _reference.streamWrite(os); } diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java index 687bc03d412..3284578e9d9 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java @@ -114,7 +114,7 @@ final public class Incoming implements com.zeroc.Ice.Request // // Read the current. // - _current.id.read(_is); + _current.id.ice_readMembers(_is); // // For compatibility with the old FacetPath. @@ -617,7 +617,7 @@ final public class Incoming implements com.zeroc.Ice.Request { assert(false); } - ex.id.write(_os); + ex.id.ice_writeMembers(_os); // // For compatibility with the old FacetPath. diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java index 0150fb73f78..5fef6998469 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java @@ -59,7 +59,7 @@ public final class ProxyFactory public com.zeroc.Ice.ObjectPrx streamToProxy(com.zeroc.Ice.InputStream s) { - com.zeroc.Ice.Identity ident = com.zeroc.Ice.Identity.read(s, null); + com.zeroc.Ice.Identity ident = com.zeroc.Ice.Identity.ice_read(s, null); Reference ref = _instance.referenceFactory().create(ident, s); return referenceToProxy(ref); diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBaseI.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBaseI.java index 7cb2a1ee367..d717ef07a49 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBaseI.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyOutgoingAsyncBaseI.java @@ -71,7 +71,7 @@ public abstract class ProxyOutgoingAsyncBaseI<T> extends OutgoingAsyncBaseI<T> i case ReplyStatus.replyFacetNotExist: case ReplyStatus.replyOperationNotExist: { - com.zeroc.Ice.Identity id = com.zeroc.Ice.Identity.read(is, null); + com.zeroc.Ice.Identity id = com.zeroc.Ice.Identity.ice_read(is, null); // // For compatibility with the old FacetPath. @@ -472,7 +472,7 @@ public abstract class ProxyOutgoingAsyncBaseI<T> extends OutgoingAsyncBaseI<T> i Reference ref = _proxy._getReference(); - ref.getIdentity().write(_os); + ref.getIdentity().ice_writeMembers(_os); // // For compatibility with the old FacetPath. diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java index 0b246868519..51cfc65c06e 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Reference.java @@ -283,8 +283,8 @@ public abstract class Reference implements Cloneable if(!s.getEncoding().equals(com.zeroc.Ice.Util.Encoding_1_0)) { - _protocol.write(s); - _encoding.write(s); + _protocol.ice_writeMembers(s); + _encoding.ice_writeMembers(s); } // Derived class writes the remainder of the reference. diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReferenceFactory.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReferenceFactory.java index 47d6622bafa..1543263bfa0 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReferenceFactory.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ReferenceFactory.java @@ -589,8 +589,8 @@ public final class ReferenceFactory com.zeroc.Ice.EncodingVersion encoding; if(!s.getEncoding().equals(com.zeroc.Ice.Util.Encoding_1_0)) { - protocol = com.zeroc.Ice.ProtocolVersion.read(s, null); - encoding = com.zeroc.Ice.EncodingVersion.read(s, null); + protocol = com.zeroc.Ice.ProtocolVersion.ice_read(s, null); + encoding = com.zeroc.Ice.EncodingVersion.ice_read(s, null); } else { diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/TraceUtil.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/TraceUtil.java index 36b60e57168..852c190b4ff 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/TraceUtil.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/TraceUtil.java @@ -174,7 +174,7 @@ public final class TraceUtil toStringMode = stream.instance().toStringMode(); } - com.zeroc.Ice.Identity identity = com.zeroc.Ice.Identity.read(stream, null); + com.zeroc.Ice.Identity identity = com.zeroc.Ice.Identity.ice_read(stream, null); out.write("\nidentity = " + com.zeroc.Ice.Util.identityToString(identity, toStringMode)); String[] facet = stream.readStringSeq(); diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointI.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointI.java index 67057b67191..7b7707adf42 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointI.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpEndpointI.java @@ -258,8 +258,8 @@ final class UdpEndpointI extends IPEndpointI super.streamWriteImpl(s); if(s.getEncoding().equals(com.zeroc.Ice.Util.Encoding_1_0)) { - com.zeroc.Ice.Util.Protocol_1_0.write(s); - com.zeroc.Ice.Util.Encoding_1_0.write(s); + com.zeroc.Ice.Util.Protocol_1_0.ice_writeMembers(s); + com.zeroc.Ice.Util.Encoding_1_0.ice_writeMembers(s); } // Not transmitted. //s.writeBool(_connect); diff --git a/java/test/src/main/java/test/Ice/enums/AllTests.java b/java/test/src/main/java/test/Ice/enums/AllTests.java index 98d6ecc862c..ede32b99d90 100644 --- a/java/test/src/main/java/test/Ice/enums/AllTests.java +++ b/java/test/src/main/java/test/Ice/enums/AllTests.java @@ -127,22 +127,22 @@ public class AllTests communicator.getProperties().getProperty("Ice.Default.EncodingVersion").equals("1.0"); os = new com.zeroc.Ice.OutputStream(communicator); - ByteEnum.write(os, ByteEnum.benum11); + ByteEnum.ice_write(os, ByteEnum.benum11); bytes = os.finished(); test(bytes.length == 1); // ByteEnum should require one byte os = new com.zeroc.Ice.OutputStream(communicator); - ShortEnum.write(os, ShortEnum.senum11); + ShortEnum.ice_write(os, ShortEnum.senum11); bytes = os.finished(); test(bytes.length == (encoding_1_0 ? 2 : 5)); os = new com.zeroc.Ice.OutputStream(communicator); - IntEnum.write(os, IntEnum.ienum11); + IntEnum.ice_write(os, IntEnum.ienum11); bytes = os.finished(); test(bytes.length == (encoding_1_0 ? 4 : 5)); os = new com.zeroc.Ice.OutputStream(communicator); - SimpleEnum.write(os, SimpleEnum.blue); + SimpleEnum.ice_write(os, SimpleEnum.blue); bytes = os.finished(); test(bytes.length == 1); // SimpleEnum should require one byte @@ -252,7 +252,7 @@ public class AllTests os = new com.zeroc.Ice.OutputStream(communicator); os.writeByte((byte)2); // Invalid enumerator com.zeroc.Ice.InputStream in = new com.zeroc.Ice.InputStream(communicator, os.finished()); - ByteEnum.read(in); + ByteEnum.ice_read(in); test(false); } catch(com.zeroc.Ice.MarshalException ex) @@ -264,7 +264,7 @@ public class AllTests os = new com.zeroc.Ice.OutputStream(communicator); os.writeByte((byte)128); // Invalid enumerator com.zeroc.Ice.InputStream in = new com.zeroc.Ice.InputStream(communicator, os.finished()); - ByteEnum.read(in); + ByteEnum.ice_read(in); test(false); } catch(com.zeroc.Ice.MarshalException ex) @@ -276,7 +276,7 @@ public class AllTests os = new com.zeroc.Ice.OutputStream(communicator); os.writeShort((short)-1); // Negative enumerators are not supported com.zeroc.Ice.InputStream in = new com.zeroc.Ice.InputStream(communicator, os.finished()); - ShortEnum.read(in); + ShortEnum.ice_read(in); test(false); } catch(com.zeroc.Ice.MarshalException ex) @@ -288,7 +288,7 @@ public class AllTests os = new com.zeroc.Ice.OutputStream(communicator); os.writeShort((short)0); // Invalid enumerator com.zeroc.Ice.InputStream in = new com.zeroc.Ice.InputStream(communicator, os.finished()); - ShortEnum.read(in); + ShortEnum.ice_read(in); test(false); } catch(com.zeroc.Ice.MarshalException ex) @@ -300,7 +300,7 @@ public class AllTests os = new com.zeroc.Ice.OutputStream(communicator); os.writeShort((short)32767); // Invalid enumerator com.zeroc.Ice.InputStream in = new com.zeroc.Ice.InputStream(communicator, os.finished()); - ShortEnum.read(in); + ShortEnum.ice_read(in); test(false); } catch(com.zeroc.Ice.MarshalException ex) @@ -312,7 +312,7 @@ public class AllTests os = new com.zeroc.Ice.OutputStream(communicator); os.writeInt(-1); // Negative enumerators are not supported com.zeroc.Ice.InputStream in = new com.zeroc.Ice.InputStream(communicator, os.finished()); - IntEnum.read(in); + IntEnum.ice_read(in); test(false); } catch(com.zeroc.Ice.MarshalException ex) @@ -324,7 +324,7 @@ public class AllTests os = new com.zeroc.Ice.OutputStream(communicator); os.writeInt(2); // Invalid enumerator com.zeroc.Ice.InputStream in = new com.zeroc.Ice.InputStream(communicator, os.finished()); - IntEnum.read(in); + IntEnum.ice_read(in); test(false); } catch(com.zeroc.Ice.MarshalException ex) diff --git a/java/test/src/main/java/test/Ice/optional/AllTests.java b/java/test/src/main/java/test/Ice/optional/AllTests.java index b2de927b7bc..069f1d113dd 100644 --- a/java/test/src/main/java/test/Ice/optional/AllTests.java +++ b/java/test/src/main/java/test/Ice/optional/AllTests.java @@ -966,16 +966,16 @@ public class AllTests os = new OutputStream(communicator); os.startEncapsulation(); os.writeOptional(2, OptionalFormat.Size); - MyEnum.write(os, p1.get()); + MyEnum.ice_write(os, p1.get()); os.endEncapsulation(); inEncaps = os.finished(); inv = initial.ice_invoke("opMyEnumReq", OperationMode.Normal, inEncaps); in = new InputStream(communicator, inv.outParams); in.startEncapsulation(); test(in.readOptional(1, OptionalFormat.Size)); - test(MyEnum.read(in) == MyEnum.MyEnumMember); + test(MyEnum.ice_read(in) == MyEnum.MyEnumMember); test(in.readOptional(3, OptionalFormat.Size)); - test(MyEnum.read(in) == MyEnum.MyEnumMember); + test(MyEnum.ice_read(in) == MyEnum.MyEnumMember); in.endEncapsulation(); in = new InputStream(communicator, inv.outParams); @@ -1008,7 +1008,7 @@ public class AllTests os.startEncapsulation(); os.writeOptional(2, OptionalFormat.VSize); os.writeSize(1); - SmallStruct.write(os, p1.get()); + SmallStruct.ice_write(os, p1.get()); os.endEncapsulation(); inEncaps = os.finished(); inv = initial.ice_invoke("opSmallStructReq", OperationMode.Normal, inEncaps); @@ -1016,11 +1016,11 @@ public class AllTests in.startEncapsulation(); test(in.readOptional(1, OptionalFormat.VSize)); in.skipSize(); - SmallStruct f = SmallStruct.read(in, null); + SmallStruct f = SmallStruct.ice_read(in, null); test(f.m == (byte)56); test(in.readOptional(3, OptionalFormat.VSize)); in.skipSize(); - SmallStruct.read(in, f); + SmallStruct.ice_read(in, f); test(f.m == (byte)56); in.endEncapsulation(); @@ -1052,7 +1052,7 @@ public class AllTests os.startEncapsulation(); os.writeOptional(2, OptionalFormat.VSize); os.writeSize(4); - FixedStruct.write(os, p1.get()); + FixedStruct.ice_write(os, p1.get()); os.endEncapsulation(); inEncaps = os.finished(); inv = initial.ice_invoke("opFixedStructReq", OperationMode.Normal, inEncaps); @@ -1060,11 +1060,11 @@ public class AllTests in.startEncapsulation(); test(in.readOptional(1, OptionalFormat.VSize)); in.skipSize(); - FixedStruct f = FixedStruct.read(in, null); + FixedStruct f = FixedStruct.ice_read(in, null); test(f.m == 56); test(in.readOptional(3, OptionalFormat.VSize)); in.skipSize(); - FixedStruct.read(in, f); + FixedStruct.ice_read(in, f); test(f.m == 56); in.endEncapsulation(); @@ -1096,7 +1096,7 @@ public class AllTests os.startEncapsulation(); os.writeOptional(2, OptionalFormat.FSize); int pos = os.startSize(); - VarStruct.write(os, p1.get()); + VarStruct.ice_write(os, p1.get()); os.endSize(pos); os.endEncapsulation(); inEncaps = os.finished(); @@ -1105,11 +1105,11 @@ public class AllTests in.startEncapsulation(); test(in.readOptional(1, OptionalFormat.FSize)); in.skip(4); - VarStruct v = VarStruct.read(in, null); + VarStruct v = VarStruct.ice_read(in, null); test(v.m.equals("test")); test(in.readOptional(3, OptionalFormat.FSize)); in.skip(4); - VarStruct.read(in, v); + VarStruct.ice_read(in, v); test(v.m.equals("test")); in.endEncapsulation(); diff --git a/java/test/src/main/java/test/Ice/stream/Client.java b/java/test/src/main/java/test/Ice/stream/Client.java index 054b39302d4..f7556235fe1 100644 --- a/java/test/src/main/java/test/Ice/stream/Client.java +++ b/java/test/src/main/java/test/Ice/stream/Client.java @@ -230,10 +230,10 @@ public class Client extends test.Util.Application { out = new OutputStream(comm); - MyEnum.write(out, MyEnum.enum3); + MyEnum.ice_write(out, MyEnum.enum3); byte[] data = out.finished(); in = new InputStream(comm, data); - test(MyEnum.read(in) == MyEnum.enum3); + test(MyEnum.ice_read(in) == MyEnum.enum3); } { @@ -249,10 +249,10 @@ public class Client extends test.Util.Application s.str = "7"; s.e = MyEnum.enum2; s.p = comm.stringToProxy("test:default"); - SmallStruct.write(out, s); + SmallStruct.ice_write(out, s); byte[] data = out.finished(); in = new InputStream(comm, data); - SmallStruct s2 = SmallStruct.read(in, null); + SmallStruct s2 = SmallStruct.ice_read(in, null); test(s2.equals(s)); } |