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/IceGrid/NodeSessionI.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/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 01bbb7679c0..9accf0eb7f3 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) { - __setNoDelete(true); + iceSetNoDelete(true); try { _database->getNode(info->name, true)->setSession(this); @@ -159,7 +159,7 @@ NodeSessionI::NodeSessionI(const DatabasePtr& database, } catch(const NodeActiveException&) { - __setNoDelete(false); + iceSetNoDelete(false); throw; } catch(...) @@ -174,10 +174,10 @@ NodeSessionI::NodeSessionI(const DatabasePtr& database, _database->getNode(info->name)->setSession(0); - __setNoDelete(false); + iceSetNoDelete(false); throw; } - __setNoDelete(false); + iceSetNoDelete(false); } void |