diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-07-05 16:50:46 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-07-05 16:50:46 +0200 |
| commit | ad8595525980d30ce3c528b3c668a7cc744e2e14 (patch) | |
| tree | 1506a6d20846b395b23afaf2c7fc6dff3eef8efb /cpp/src/Ice/SlicedData.cpp | |
| parent | Fixed IceSSL SecureTransport memory leaks (diff) | |
| download | ice-ad8595525980d30ce3c528b3c668a7cc744e2e14.tar.bz2 ice-ad8595525980d30ce3c528b3c668a7cc744e2e14.tar.xz ice-ad8595525980d30ce3c528b3c668a7cc744e2e14.zip | |
Fixed ICE-8223 - renamed cloneImpl to _iceCloneImpl
Diffstat (limited to 'cpp/src/Ice/SlicedData.cpp')
| -rw-r--r-- | cpp/src/Ice/SlicedData.cpp | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp index e9519d73d7d..56b10f6aba1 100644 --- a/cpp/src/Ice/SlicedData.cpp +++ b/cpp/src/Ice/SlicedData.cpp @@ -66,15 +66,6 @@ Ice::SlicedData::_iceGcVisitMembers(IceInternal::GCVisitor& visitor) } } } - -void -Ice::UnknownSlicedValue::_iceGcVisitMembers(IceInternal::GCVisitor& _v) -{ - if(_slicedData) - { - _slicedData->_iceGcVisitMembers(_v); - } -} #endif Ice::UnknownSlicedValue::UnknownSlicedValue(const string& unknownTypeId) : _unknownTypeId(unknownTypeId) @@ -87,20 +78,6 @@ Ice::UnknownSlicedValue::getUnknownTypeId() const return _unknownTypeId; } -void -Ice::UnknownSlicedValue::_iceWrite(Ice::OutputStream* ostr) const -{ - ostr->startValue(_slicedData); - ostr->endValue(); -} - -void -Ice::UnknownSlicedValue::_iceRead(Ice::InputStream* istr) -{ - istr->startValue(); - _slicedData = istr->endValue(true); -} - SlicedDataPtr Ice::UnknownSlicedValue::ice_getSlicedData() const { @@ -118,13 +95,38 @@ Ice::UnknownSlicedValue::ice_id() const shared_ptr<Ice::UnknownSlicedValue> Ice::UnknownSlicedValue::ice_clone() const { - return static_pointer_cast<UnknownSlicedValue>(cloneImpl()); + return static_pointer_cast<UnknownSlicedValue>(_iceCloneImpl()); } shared_ptr<Ice::Value> -Ice::UnknownSlicedValue::cloneImpl() const +Ice::UnknownSlicedValue::_iceCloneImpl() const { return make_shared<UnknownSlicedValue>(static_cast<const UnknownSlicedValue&>(*this)); } +#else + +void +Ice::UnknownSlicedValue::_iceGcVisitMembers(IceInternal::GCVisitor& _v) +{ + if(_slicedData) + { + _slicedData->_iceGcVisitMembers(_v); + } +} + #endif + +void +Ice::UnknownSlicedValue::_iceWrite(Ice::OutputStream* ostr) const +{ + ostr->startValue(_slicedData); + ostr->endValue(); +} + +void +Ice::UnknownSlicedValue::_iceRead(Ice::InputStream* istr) +{ + istr->startValue(); + _slicedData = istr->endValue(true); +} |