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/Ice/PropertiesAdminI.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/Ice/PropertiesAdminI.cpp')
| -rw-r--r-- | cpp/src/Ice/PropertiesAdminI.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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) |