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/IceGrid/NodeSessionI.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/IceGrid/NodeSessionI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeSessionI.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp index 9accf0eb7f3..01bbb7679c0 100644 --- a/cpp/src/IceGrid/NodeSessionI.cpp +++ b/cpp/src/IceGrid/NodeSessionI.cpp @@ -145,7 +145,7 @@ NodeSessionI::NodeSessionI(const DatabasePtr& database, _load(load), _destroy(false) { - iceSetNoDelete(true); + __setNoDelete(true); try { _database->getNode(info->name, true)->setSession(this); @@ -159,7 +159,7 @@ NodeSessionI::NodeSessionI(const DatabasePtr& database, } catch(const NodeActiveException&) { - iceSetNoDelete(false); + __setNoDelete(false); throw; } catch(...) @@ -174,10 +174,10 @@ NodeSessionI::NodeSessionI(const DatabasePtr& database, _database->getNode(info->name)->setSession(0); - iceSetNoDelete(false); + __setNoDelete(false); throw; } - iceSetNoDelete(false); + __setNoDelete(false); } void |