diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-11-02 17:56:08 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-11-02 17:56:08 -0400 |
| commit | 91fa99c34d1211d426b24bf68001fc27a87b3f00 (patch) | |
| tree | 15af995f00414098b678b4cff09a9f0c29830fa8 /cpp/src/Ice/SlicedData.cpp | |
| parent | Add C# code sign support (diff) | |
| download | ice-91fa99c34d1211d426b24bf68001fc27a87b3f00.tar.bz2 ice-91fa99c34d1211d426b24bf68001fc27a87b3f00.tar.xz ice-91fa99c34d1211d426b24bf68001fc27a87b3f00.zip | |
Replaced double and triple underscores in C++ by ice-prefixed names
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 6a433ffbe4d..320763a1bda 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::__gcVisitMembers(IceInternal::GCVisitor& visitor) +Ice::SlicedData::iceGcVisitMembers(IceInternal::GCVisitor& visitor) { // // Iterate over the object references in each preserved slice. @@ -42,7 +42,7 @@ Ice::SlicedData::__gcVisitMembers(IceInternal::GCVisitor& visitor) { for(vector<ObjectPtr>::iterator q = (*p)->instances.begin(); q != (*p)->instances.end(); ++q) { - if(q->get()->__gcVisit(visitor)) + if(q->get()->iceGcVisit(visitor)) { *q = 0; } @@ -51,11 +51,11 @@ Ice::SlicedData::__gcVisitMembers(IceInternal::GCVisitor& visitor) } void -Ice::UnknownSlicedValue::__gcVisitMembers(IceInternal::GCVisitor& _v) +Ice::UnknownSlicedValue::iceGcVisitMembers(IceInternal::GCVisitor& _v) { if(_slicedData) { - _slicedData->__gcVisitMembers(_v); + _slicedData->iceGcVisitMembers(_v); } } @@ -78,17 +78,17 @@ Ice::UnknownSlicedValue::getSlicedData() const } void -Ice::UnknownSlicedValue::__write(Ice::OutputStream* __os) const +Ice::UnknownSlicedValue::iceWrite(Ice::OutputStream* iceOs) const { - __os->startValue(_slicedData); - __os->endValue(); + iceOs->startValue(_slicedData); + iceOs->endValue(); } void -Ice::UnknownSlicedValue::__read(Ice::InputStream* __is) +Ice::UnknownSlicedValue::iceRead(Ice::InputStream* iceIs) { - __is->startValue(); - _slicedData = __is->endValue(true); + iceIs->startValue(); + _slicedData = iceIs->endValue(true); } #ifdef ICE_CPP11_MAPPING |