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/ServantManager.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/ServantManager.cpp')
| -rw-r--r-- | cpp/src/Ice/ServantManager.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp index 91d1578a487..ca990f2d33a 100644 --- a/cpp/src/Ice/ServantManager.cpp +++ b/cpp/src/Ice/ServantManager.cpp @@ -212,22 +212,22 @@ IceInternal::ServantManager::findServant(const Identity& ident, const string& fa if(p == servantMapMap.end() || (q = p->second.find(facet)) == p->second.end()) { - DefaultServantMap::const_iterator p = _defaultServantMap.find(ident.category); - if(p == _defaultServantMap.end()) + DefaultServantMap::const_iterator d = _defaultServantMap.find(ident.category); + if(d == _defaultServantMap.end()) { - p = _defaultServantMap.find(""); - if(p == _defaultServantMap.end()) + d = _defaultServantMap.find(""); + if(d == _defaultServantMap.end()) { return 0; } else { - return p->second; + return d->second; } } else { - return p->second; + return d->second; } } else |