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/Instance.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/src/IceStorm/Instance.cpp')
| -rw-r--r-- | cpp/src/IceStorm/Instance.cpp | 6 |
1 files changed, 3 insertions, 3 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() |