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/test/Ice/gc/Client.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/test/Ice/gc/Client.cpp')
| -rw-r--r-- | cpp/test/Ice/gc/Client.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/test/Ice/gc/Client.cpp b/cpp/test/Ice/gc/Client.cpp index e6f6c9f188d..4298d102621 100644 --- a/cpp/test/Ice/gc/Client.cpp +++ b/cpp/test/Ice/gc/Client.cpp @@ -132,15 +132,15 @@ public: virtual bool visit(IceInternal::GCObject* obj) { - if(obj->iceHasFlag(IceInternal::GCObject::Visiting)) + if(obj->__hasFlag(IceInternal::GCObject::Visiting)) { return false; } - test(obj->iceHasFlag(IceInternal::GCObject::CycleMember) && obj->iceHasFlag(IceInternal::GCObject::Collectable)); + test(obj->__hasFlag(IceInternal::GCObject::CycleMember) && obj->__hasFlag(IceInternal::GCObject::Collectable)); - obj->iceSetFlag(IceInternal::GCObject::Visiting); - obj->iceGcVisitMembers(*this); - obj->iceClearFlag(IceInternal::GCObject::Visiting); + obj->__setFlag(IceInternal::GCObject::Visiting); + obj->__gcVisitMembers(*this); + obj->__clearFlag(IceInternal::GCObject::Visiting); return false; } }; |