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

(limited to 'cpp/src/Ice/PropertiesAdminI.cpp')

diff --git a/cpp/src/Ice/PropertiesAdminI.cpp b/cpp/src/Ice/PropertiesAdminI.cpp
index 131830fa17d..fca4132d3b4 100644
--- a/cpp/src/Ice/PropertiesAdminI.cpp
+++ b/cpp/src/Ice/PropertiesAdminI.cpp
@@ -198,7 +198,7 @@ PropertiesAdminI::setProperties(const PropertyDict& props, const Current&)
         for(const auto& cb : callbacks)
 #else
         vector<PropertiesAdminUpdateCallbackPtr> callbacks = _updateCallbacks;
-        for(vector<PropertiesAdminUpdateCallbackPtr>::const_iterator p = callbacks.begin(); p != callbacks.end(); ++p)
+        for(vector<PropertiesAdminUpdateCallbackPtr>::const_iterator q = callbacks.begin(); q != callbacks.end(); ++q)
 #endif
         {
             try
@@ -206,7 +206,7 @@ PropertiesAdminI::setProperties(const PropertyDict& props, const Current&)
 #ifdef ICE_CPP11_MAPPING
                 cb(changes);
 #else
-                (*p)->updated(changes);
+                (*q)->updated(changes);
 #endif
             }
             catch(const std::exception& ex)
-- 
cgit v1.2.3