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/src/IceStorm/TopicI.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/src/IceStorm/TopicI.cpp')
| -rw-r--r-- | cpp/src/IceStorm/TopicI.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp index acea59e5c15..c89e3146211 100644 --- a/cpp/src/IceStorm/TopicI.cpp +++ b/cpp/src/IceStorm/TopicI.cpp @@ -352,7 +352,7 @@ TopicImpl::TopicImpl( { try { - __setNoDelete(true); + iceSetNoDelete(true); // TODO: If we want to improve the performance of the // non-replicated case we could allocate a null-topic impl here. @@ -435,10 +435,10 @@ TopicImpl::TopicImpl( catch(...) { shutdown(); - __setNoDelete(false); + iceSetNoDelete(false); throw; } - __setNoDelete(false); + iceSetNoDelete(false); } TopicImpl::~TopicImpl() |