diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:35 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:35 -0400 |
| commit | 298bccf0b6243f2cd741af59b1547b915128356b (patch) | |
| tree | aff10041d00b5aec3413e620db079cc735c83375 /cpp/test/Ice/gc/Client.cpp | |
| parent | Revert "Replaced double underscores in C# mapping by ice-prefix names" (diff) | |
| download | ice-298bccf0b6243f2cd741af59b1547b915128356b.tar.bz2 ice-298bccf0b6243f2cd741af59b1547b915128356b.tar.xz ice-298bccf0b6243f2cd741af59b1547b915128356b.zip | |
Revert "Reverted previous double-underscore changes in IceUtil classes"
This reverts commit 2e6243dd2955e6a292bbe8a569d4e1711253746a.
Diffstat (limited to 'cpp/test/Ice/gc/Client.cpp')
| -rw-r--r-- | cpp/test/Ice/gc/Client.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/test/Ice/gc/Client.cpp b/cpp/test/Ice/gc/Client.cpp index f19a02225fa..e6f6c9f188d 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->__hasFlag(IceInternal::GCObject::Visiting)) + if(obj->iceHasFlag(IceInternal::GCObject::Visiting)) { return false; } - test(obj->__hasFlag(IceInternal::GCObject::CycleMember) && obj->__hasFlag(IceInternal::GCObject::Collectable)); + test(obj->iceHasFlag(IceInternal::GCObject::CycleMember) && obj->iceHasFlag(IceInternal::GCObject::Collectable)); - obj->__setFlag(IceInternal::GCObject::Visiting); + obj->iceSetFlag(IceInternal::GCObject::Visiting); obj->iceGcVisitMembers(*this); - obj->__clearFlag(IceInternal::GCObject::Visiting); + obj->iceClearFlag(IceInternal::GCObject::Visiting); return false; } }; |