diff options
| author | Jose <jose@zeroc.com> | 2012-10-03 14:51:45 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-10-03 14:51:45 +0200 |
| commit | 319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd (patch) | |
| tree | 6cf6d939c3621633056403ff1d1106949a00b5f0 /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Minor C++ fixes (diff) | |
| download | ice-319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd.tar.bz2 ice-319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd.tar.xz ice-319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd.zip | |
ICE-4824 - Fixed VC6 style loops
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 30965746384..1779e93bdc6 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -718,19 +718,19 @@ Ice::ObjectAdapterI::isLocal(const ObjectPrx& proxy) const // Proxies which have at least one endpoint in common with the // endpoints used by this object adapter are considered local. // - vector<EndpointIPtr>::const_iterator p; - for(p = endpoints.begin(); p != endpoints.end(); ++p) + for(vector<EndpointIPtr>::const_iterator p = endpoints.begin(); p != endpoints.end(); ++p) { - vector<IncomingConnectionFactoryPtr>::const_iterator q; - for(q = _incomingConnectionFactories.begin(); q != _incomingConnectionFactories.end(); ++q) + for(vector<IncomingConnectionFactoryPtr>::const_iterator q = _incomingConnectionFactories.begin(); + q != _incomingConnectionFactories.end(); ++q) { if((*p)->equivalent((*q)->endpoint())) { return true; } } - vector<EndpointIPtr>::const_iterator r; - for(r = _publishedEndpoints.begin(); r != _publishedEndpoints.end(); ++r) + + for(vector<EndpointIPtr>::const_iterator r = _publishedEndpoints.begin(); + r != _publishedEndpoints.end(); ++r) { if((*p)->equivalent(*r)) { @@ -746,10 +746,9 @@ Ice::ObjectAdapterI::isLocal(const ObjectPrx& proxy) const // if(_routerInfo && _routerInfo->getRouter() == proxy->ice_getRouter()) { - for(p = endpoints.begin(); p != endpoints.end(); ++p) + for(vector<EndpointIPtr>::const_iterator p = endpoints.begin(); p != endpoints.end(); ++p) { - vector<EndpointIPtr>::const_iterator r; - for(r = _routerEndpoints.begin(); r != _routerEndpoints.end(); ++r) + for(vector<EndpointIPtr>::const_iterator r = _routerEndpoints.begin(); r != _routerEndpoints.end(); ++r) { if((*p)->equivalent(*r)) { @@ -1487,8 +1486,7 @@ Ice::ObjectAdapterI::filterProperties(StringSeq& unknownProps) bool noProps = true; PropertyDict props = _instance->initializationData().properties->getPropertiesForPrefix(prefix); - PropertyDict::const_iterator p; - for(p = props.begin(); p != props.end(); ++p) + for(PropertyDict::const_iterator p = props.begin(); p != props.end(); ++p) { bool valid = false; for(unsigned int i = 0; i < sizeof(suffixes)/sizeof(*suffixes); ++i) |