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/IceStorm | |
| 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/IceStorm')
| -rw-r--r-- | cpp/src/IceStorm/Instance.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/IceStorm/TopicI.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/IceStorm/TopicManagerI.cpp | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/IceStorm/Instance.cpp b/cpp/src/IceStorm/Instance.cpp index 7f92944c498..6d8334cab4d 100644 --- a/cpp/src/IceStorm/Instance.cpp +++ b/cpp/src/IceStorm/Instance.cpp @@ -117,7 +117,7 @@ Instance::Instance( { try { - iceSetNoDelete(true); + __setNoDelete(true); Ice::PropertiesPtr properties = communicator->getProperties(); if(properties->getProperty(name + ".TopicManager.AdapterId").empty()) @@ -167,11 +167,11 @@ Instance::Instance( { shutdown(); destroy(); - iceSetNoDelete(false); + __setNoDelete(false); throw; } - iceSetNoDelete(false); + __setNoDelete(false); } Instance::~Instance() diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp index c89e3146211..acea59e5c15 100644 --- a/cpp/src/IceStorm/TopicI.cpp +++ b/cpp/src/IceStorm/TopicI.cpp @@ -352,7 +352,7 @@ TopicImpl::TopicImpl( { try { - iceSetNoDelete(true); + __setNoDelete(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(); - iceSetNoDelete(false); + __setNoDelete(false); throw; } - iceSetNoDelete(false); + __setNoDelete(false); } TopicImpl::~TopicImpl() diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp index 57f5b619a4b..5c4ad1c6cbc 100644 --- a/cpp/src/IceStorm/TopicManagerI.cpp +++ b/cpp/src/IceStorm/TopicManagerI.cpp @@ -255,7 +255,7 @@ TopicManagerImpl::TopicManagerImpl(const PersistentInstancePtr& instance) : { try { - iceSetNoDelete(true); + __setNoDelete(true); if(_instance->observer()) { @@ -319,10 +319,10 @@ TopicManagerImpl::TopicManagerImpl(const PersistentInstancePtr& instance) : catch(...) { shutdown(); - iceSetNoDelete(false); + __setNoDelete(false); throw; } - iceSetNoDelete(false); + __setNoDelete(false); } TopicManagerImpl::~TopicManagerImpl() |