diff options
Diffstat (limited to 'cpp/src')
-rw-r--r-- | cpp/src/Ice/StreamI.cpp | 30 | ||||
-rw-r--r-- | cpp/src/Ice/StreamI.h | 6 | ||||
-rw-r--r-- | cpp/src/Slice/PythonUtil.cpp | 12 | ||||
-rw-r--r-- | cpp/src/Slice/RubyUtil.cpp | 12 |
4 files changed, 2 insertions, 58 deletions
diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp index 8a333dbccc5..0d0a59df206 100644 --- a/cpp/src/Ice/StreamI.cpp +++ b/cpp/src/Ice/StreamI.cpp @@ -322,36 +322,6 @@ Ice::InputStreamI::skipSlice() } void -Ice::InputStreamI::startSeq(int numElements, int minSize) -{ - _is->startSeq(numElements, minSize); -} - -void -Ice::InputStreamI::checkSeq() -{ - _is->checkSeq(); -} - -void -Ice::InputStreamI::checkFixedSeq(int numElements, int minSize) -{ - _is->checkFixedSeq(numElements, minSize); -} - -void -Ice::InputStreamI::endSeq(int sz) -{ - _is->endSeq(sz); -} - -void -Ice::InputStreamI::endElement() -{ - _is->endElement(); -} - -void Ice::InputStreamI::readPendingObjects() { _is->readPendingObjects(); diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h index 39dd8dda0bf..4f5aba6b70f 100644 --- a/cpp/src/Ice/StreamI.h +++ b/cpp/src/Ice/StreamI.h @@ -83,12 +83,6 @@ public: virtual void skipEncapsulation(); virtual void endEncapsulation(); - virtual void startSeq(int, int); - virtual void checkSeq(); - virtual void checkFixedSeq(int, int); - virtual void endSeq(int); - virtual void endElement(); - virtual void readPendingObjects(); virtual void rewind(); diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index 482bd3ccd36..c1d8cb26d96 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -1317,21 +1317,11 @@ Slice::Python::CodeVisitor::visitSequence(const SequencePtr& p) } else { - TypePtr type = p->type(); _out << nl << "_M_" << getAbsolute(p, "_t_") << " = IcePy.defineSequence('" << scoped << "', "; writeMetaData(metaData); _out << ", "; writeType(p->type()); - _out << ", "; - if(type->isVariableLength()) - { - _out << "True"; - } - else - { - _out << "False"; - } - _out << ", " << type->minWireSize() << ")"; + _out << ")"; } _out.dec(); } diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp index c866ae5883a..5bf0587099a 100644 --- a/cpp/src/Slice/RubyUtil.cpp +++ b/cpp/src/Slice/RubyUtil.cpp @@ -1097,21 +1097,11 @@ Slice::Ruby::CodeVisitor::visitSequence(const SequencePtr& p) // string name = fixIdent(p->name(), IdentToUpper); string scoped = p->scoped(); - TypePtr type = p->type(); _out << sp << nl << "if not defined?(" << getAbsolute(p, IdentToUpper, "T_") << ')'; _out.inc(); _out << nl << "T_" << name << " = ::Ice::__defineSequence('" << scoped << "', "; writeType(p->type()); - _out << ", "; - if(type->isVariableLength()) - { - _out << "true"; - } - else - { - _out << "false"; - } - _out << ", " << type->minWireSize() << ")"; + _out << ")"; _out.dec(); _out << nl << "end"; // if not defined?() } |