diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-10-26 17:17:11 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2018-10-26 17:17:11 -0400 |
| commit | 42c905a3ca29a1e911e7def9c2d9d9b8e95383cd (patch) | |
| tree | 1b704d084e39c0acd15859f2dd258eff7aaa7fc6 /cpp/src/IceGrid/NodeCache.cpp | |
| parent | Do not use time.clock() with Python >= 3.3 as it is deprecated (diff) | |
| download | ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.tar.bz2 ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.tar.xz ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.zip | |
Extra C++ warning flags with clang and g++.
Fixes 223.
Diffstat (limited to 'cpp/src/IceGrid/NodeCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeCache.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp index cfefc48eedd..023f677d1a1 100644 --- a/cpp/src/IceGrid/NodeCache.cpp +++ b/cpp/src/IceGrid/NodeCache.cpp @@ -204,11 +204,11 @@ public: } void - exception(const Ice::Exception& ex) + exception(const Ice::Exception& lex) { try { - ex.ice_throw(); + lex.ice_throw(); } catch(const DeploymentException& ex) { @@ -266,11 +266,11 @@ public: } void - exception(const Ice::Exception& ex) + exception(const Ice::Exception& dex) { try { - ex.ice_throw(); + dex.ice_throw(); } catch(const DeploymentException& ex) { @@ -389,18 +389,18 @@ NodeEntry::setSession(const NodeSessionIPtr& session) } else { - NodeSessionIPtr session = _session; + NodeSessionIPtr s = _session; sync.release(); try { - session->getNode()->ice_ping(); + s->getNode()->ice_ping(); throw NodeActiveException(); } catch(const Ice::LocalException&) { try { - session->destroy(Ice::emptyCurrent); + s->destroy(Ice::emptyCurrent); } catch(const Ice::ObjectNotExistException&) { |