From 42c905a3ca29a1e911e7def9c2d9d9b8e95383cd Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Fri, 26 Oct 2018 17:17:11 -0400
Subject: Extra C++ warning flags with clang and g++.

Fixes 223.
---
 cpp/src/IceGrid/NodeCache.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'cpp/src/IceGrid/NodeCache.cpp')

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&)
                     {
-- 
cgit v1.2.3