diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:56 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:56 -0400 |
| commit | a9207c4a7e8190cb64286afc1b373f16010d0feb (patch) | |
| tree | b6815a6debc9b9589145cc12f192b6dd83b3f49e /cpp/src/Ice/SlicedData.cpp | |
| parent | Revert "Reverted previous double-underscore changes in IceUtil classes" (diff) | |
| download | ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.tar.bz2 ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.tar.xz ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.zip | |
Revert "Replaced double and triple underscores in C++ by ice-prefixed names"
This reverts commit 91fa99c34d1211d426b24bf68001fc27a87b3f00.
Diffstat (limited to 'cpp/src/Ice/SlicedData.cpp')
| -rw-r--r-- | cpp/src/Ice/SlicedData.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp index 320763a1bda..6a433ffbe4d 100644 --- a/cpp/src/Ice/SlicedData.cpp +++ b/cpp/src/Ice/SlicedData.cpp @@ -33,7 +33,7 @@ Ice::SlicedData::SlicedData(const SliceInfoSeq& seq) : #ifndef ICE_CPP11_MAPPING void -Ice::SlicedData::iceGcVisitMembers(IceInternal::GCVisitor& visitor) +Ice::SlicedData::__gcVisitMembers(IceInternal::GCVisitor& visitor) { // // Iterate over the object references in each preserved slice. @@ -42,7 +42,7 @@ Ice::SlicedData::iceGcVisitMembers(IceInternal::GCVisitor& visitor) { for(vector<ObjectPtr>::iterator q = (*p)->instances.begin(); q != (*p)->instances.end(); ++q) { - if(q->get()->iceGcVisit(visitor)) + if(q->get()->__gcVisit(visitor)) { *q = 0; } @@ -51,11 +51,11 @@ Ice::SlicedData::iceGcVisitMembers(IceInternal::GCVisitor& visitor) } void -Ice::UnknownSlicedValue::iceGcVisitMembers(IceInternal::GCVisitor& _v) +Ice::UnknownSlicedValue::__gcVisitMembers(IceInternal::GCVisitor& _v) { if(_slicedData) { - _slicedData->iceGcVisitMembers(_v); + _slicedData->__gcVisitMembers(_v); } } @@ -78,17 +78,17 @@ Ice::UnknownSlicedValue::getSlicedData() const } void -Ice::UnknownSlicedValue::iceWrite(Ice::OutputStream* iceOs) const +Ice::UnknownSlicedValue::__write(Ice::OutputStream* __os) const { - iceOs->startValue(_slicedData); - iceOs->endValue(); + __os->startValue(_slicedData); + __os->endValue(); } void -Ice::UnknownSlicedValue::iceRead(Ice::InputStream* iceIs) +Ice::UnknownSlicedValue::__read(Ice::InputStream* __is) { - iceIs->startValue(); - _slicedData = iceIs->endValue(true); + __is->startValue(); + _slicedData = __is->endValue(true); } #ifdef ICE_CPP11_MAPPING |