diff options
author | Mark Spruiell <mes@zeroc.com> | 2012-05-25 08:52:05 -0700 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2012-05-25 08:52:05 -0700 |
commit | 97526bbe65566503ad2170f040df6a1f6b8c06fb (patch) | |
tree | 0d11e9d70d122a9d1eeda97e8d1da1811a085088 /cpp/src/Ice/SlicedData.cpp | |
parent | remove use of readPendingObjects/writePendingObjects (diff) | |
download | ice-97526bbe65566503ad2170f040df6a1f6b8c06fb.tar.bz2 ice-97526bbe65566503ad2170f040df6a1f6b8c06fb.tar.xz ice-97526bbe65566503ad2170f040df6a1f6b8c06fb.zip |
removing hasObjects/clearObjects from SlicedData
Diffstat (limited to 'cpp/src/Ice/SlicedData.cpp')
-rw-r--r-- | cpp/src/Ice/SlicedData.cpp | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp index 8633aa309c9..72409a2d79c 100644 --- a/cpp/src/Ice/SlicedData.cpp +++ b/cpp/src/Ice/SlicedData.cpp @@ -19,36 +19,6 @@ IceUtil::Shared* Ice::upCast(SlicedData* p) { return p; } Ice::SlicedData::SlicedData(const SliceInfoSeq& seq) : slices(seq) { - // - // Check if any of the preserved slices contain object references. - // - _hasObjects = false; - for(SliceInfoSeq::const_iterator p = seq.begin(); p != seq.end(); ++p) - { - if(!(*p)->objects.empty()) - { - _hasObjects = true; - break; - } - } -} - -void -Ice::SlicedData::clearObjects() -{ - for(SliceInfoSeq::const_iterator p = slices.begin(); p != slices.end(); ++p) - { - // - // Don't just call (*p)->objects.clear(), as releasing references - // to the objects could have unexpected side effects. We exchange - // the vector into a temporary and then let the temporary fall out - // of scope. - // - vector<ObjectPtr> tmp; - tmp.swap((*p)->objects); - } - - _hasObjects = false; } void @@ -84,8 +54,6 @@ Ice::SlicedData::__gcClear() } (*p)->objects.clear(); } - - _hasObjects = false; } void |