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/DescriptorHelper.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index 569fa6ff3a2..d4302c6fad4 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -995,8 +995,8 @@ Resolver::getProperties(const Ice::StringSeq& references, set<string>& resolved)
         if(!desc.references.empty())
         {
             resolved.insert(*p);
-            PropertyDescriptorSeq p = getProperties(desc.references, resolved);
-            properties.insert(properties.end(), p.begin(), p.end());
+            PropertyDescriptorSeq q = getProperties(desc.references, resolved);
+            properties.insert(properties.end(), q.begin(), q.end());
         }
 
         PropertyDescriptorSeq pds = operator()(desc.properties);
@@ -2655,11 +2655,11 @@ NodeHelper::printDiff(Output& out, const NodeHelper& helper) const
 }
 
 ApplicationHelper::ApplicationHelper(const Ice::CommunicatorPtr& communicator,
-                                     const ApplicationDescriptor& desc,
+                                     const ApplicationDescriptor& appDesc,
                                      bool enableWarning,
                                      bool instantiate) :
     _communicator(communicator),
-    _def(desc)
+    _def(appDesc)
 {
     if(_def.name.empty())
     {
-- 
cgit v1.2.3