diff options
| author | Mark Spruiell <mes@zeroc.com> | 2016-05-11 14:35:33 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2016-05-11 14:35:33 -0700 |
| commit | 778d6231d1521f1b36426969f797b02e8ff5c66a (patch) | |
| tree | 798cb498e5a2297225b2132937d3a713c25f508c /cpp/src/Ice/SlicedData.cpp | |
| parent | Replaced BDB by LMDB (diff) | |
| download | ice-778d6231d1521f1b36426969f797b02e8ff5c66a.tar.bz2 ice-778d6231d1521f1b36426969f797b02e8ff5c66a.tar.xz ice-778d6231d1521f1b36426969f797b02e8ff5c66a.zip | |
cleaning up stream API in C++/Java/JS
Diffstat (limited to 'cpp/src/Ice/SlicedData.cpp')
| -rw-r--r-- | cpp/src/Ice/SlicedData.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp index 9418bbf6d8d..a746be2803f 100644 --- a/cpp/src/Ice/SlicedData.cpp +++ b/cpp/src/Ice/SlicedData.cpp @@ -17,7 +17,7 @@ using namespace Ice; #ifndef ICE_CPP11_MAPPING IceUtil::Shared* Ice::upCast(SliceInfo* p) { return p; } IceUtil::Shared* Ice::upCast(SlicedData* p) { return p; } -IceUtil::Shared* Ice::upCast(UnknownSlicedObject* p) { return p; } +IceUtil::Shared* Ice::upCast(UnknownSlicedValue* p) { return p; } #endif Ice::SlicedData::SlicedData(const SliceInfoSeq& seq) : @@ -35,7 +35,7 @@ Ice::SlicedData::__gcVisitMembers(IceInternal::GCVisitor& visitor) // for(SliceInfoSeq::const_iterator p = slices.begin(); p != slices.end(); ++p) { - for(vector<ObjectPtr>::iterator q = (*p)->objects.begin(); q != (*p)->objects.end(); ++q) + for(vector<ObjectPtr>::iterator q = (*p)->instances.begin(); q != (*p)->instances.end(); ++q) { if(q->get()->__gcVisit(visitor)) { @@ -46,7 +46,7 @@ Ice::SlicedData::__gcVisitMembers(IceInternal::GCVisitor& visitor) } void -Ice::UnknownSlicedObject::__gcVisitMembers(IceInternal::GCVisitor& _v) +Ice::UnknownSlicedValue::__gcVisitMembers(IceInternal::GCVisitor& _v) { if(_slicedData) { @@ -55,32 +55,32 @@ Ice::UnknownSlicedObject::__gcVisitMembers(IceInternal::GCVisitor& _v) } #endif -Ice::UnknownSlicedObject::UnknownSlicedObject(const string& unknownTypeId) : _unknownTypeId(unknownTypeId) +Ice::UnknownSlicedValue::UnknownSlicedValue(const string& unknownTypeId) : _unknownTypeId(unknownTypeId) { } const string& -Ice::UnknownSlicedObject::getUnknownTypeId() const +Ice::UnknownSlicedValue::getUnknownTypeId() const { return _unknownTypeId; } SlicedDataPtr -Ice::UnknownSlicedObject::getSlicedData() const +Ice::UnknownSlicedValue::getSlicedData() const { return _slicedData; } void -Ice::UnknownSlicedObject::__write(Ice::OutputStream* __os) const +Ice::UnknownSlicedValue::__write(Ice::OutputStream* __os) const { - __os->startObject(_slicedData); - __os->endObject(); + __os->startValue(_slicedData); + __os->endValue(); } void -Ice::UnknownSlicedObject::__read(Ice::InputStream* __is) +Ice::UnknownSlicedValue::__read(Ice::InputStream* __is) { - __is->startObject(); - _slicedData = __is->endObject(true); + __is->startValue(); + _slicedData = __is->endValue(true); } |