ICE-4824 - Fixed VC6 style loops

44 files changed, 477 insertions, 679 deletions

diff --git a/cpp/src/FreezeScript/TransformAnalyzer.cpp b/cpp/src/FreezeScript/TransformAnalyzer.cpp
index 91e429435c3..6c617a8e165 100644
--- a/cpp/src/FreezeScript/TransformAnalyzer.cpp
+++ b/cpp/src/FreezeScript/TransformAnalyzer.cpp
@@ -388,23 +388,21 @@ FreezeScript::AnalyzeTransformVisitor::compareMembers(const DataMemberList& oldM
                                                       const DataMemberList& newMembers)
 {
     map<string, DataMemberPtr> oldMap, newMap;
-    map<string, DataMemberPtr>::iterator q;
-    DataMemberList::const_iterator p;
 
-    for(p = oldMembers.begin(); p != oldMembers.end(); ++p)
+    for(DataMemberList::const_iterator p = oldMembers.begin(); p != oldMembers.end(); ++p)
     {
         oldMap.insert(pair<string, DataMemberPtr>((*p)->name(), *p));
     }
 
-    for(p = newMembers.begin(); p != newMembers.end(); ++p)
+    for(DataMemberList::const_iterator p = newMembers.begin(); p != newMembers.end(); ++p)
     {
         newMap.insert(pair<string, DataMemberPtr>((*p)->name(), *p));
     }
 
-    for(p = oldMembers.begin(); p != oldMembers.end(); ++p)
+    for(DataMemberList::const_iterator p = oldMembers.begin(); p != oldMembers.end(); ++p)
     {
         string name = (*p)->name();
-        q = newMap.find(name);
+        map<string, DataMemberPtr>::iterator q = newMap.find(name);
         if(q == newMap.end())
         {
             _out.newline();
@@ -428,7 +426,7 @@ FreezeScript::AnalyzeTransformVisitor::compareMembers(const DataMemberList& oldM
     // Iterate over the remaining entries in newMap. These represent
     // members that were added in the new definition.
     //
-    for(q = newMap.begin(); q != newMap.end(); ++q)
+    for(map<string, DataMemberPtr>::iterator q = newMap.begin(); q != newMap.end(); ++q)
     {
         _out.newline();
         _out << "<!-- NOTICE: " << q->first << " has been added -->";
diff --git a/cpp/src/Glacier2/RoutingTable.cpp b/cpp/src/Glacier2/RoutingTable.cpp
index d3019d66a4b..285c0c231df 100644
--- a/cpp/src/Glacier2/RoutingTable.cpp
+++ b/cpp/src/Glacier2/RoutingTable.cpp
@@ -32,8 +32,7 @@ Glacier2::RoutingTable::add(const ObjectProxySeq& unfiltered, const Ice::Current
     // in a rejection.
     //
     ObjectProxySeq proxies; 
-    ObjectProxySeq::const_iterator prx;
-    for(prx = unfiltered.begin(); prx != unfiltered.end(); ++prx)
+    for(ObjectProxySeq::const_iterator prx = unfiltered.begin(); prx != unfiltered.end(); ++prx)
     {
         if(!*prx) // We ignore null proxies.
         {
@@ -50,7 +49,7 @@ Glacier2::RoutingTable::add(const ObjectProxySeq& unfiltered, const Ice::Current
     }
 
     ObjectProxySeq evictedProxies;
-    for(prx = proxies.begin(); prx != proxies.end(); ++prx)
+    for(ObjectProxySeq::const_iterator prx = proxies.begin(); prx != proxies.end(); ++prx)
     {
         ObjectPrx proxy = *prx;
         EvictorMap::iterator p = _map.find(proxy->ice_getIdentity());
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index a607fa928e2..7f7b5e90ea3 100755
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -335,8 +335,7 @@ IceInternal::OutgoingConnectionFactory::setRouterInfo(const RouterInfoPtr& route
     //
     ObjectAdapterPtr adapter = routerInfo->getAdapter();
     vector<EndpointIPtr> endpoints = routerInfo->getClientEndpoints();
-    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)
     {
         EndpointIPtr endpoint = *p;
 
@@ -359,8 +358,8 @@ IceInternal::OutgoingConnectionFactory::setRouterInfo(const RouterInfoPtr& route
         //
         endpoint = endpoint->compress(false);
 
-        multimap<ConnectorPtr, ConnectionIPtr>::const_iterator q;
-        for(q = _connections.begin(); q != _connections.end(); ++q)
+        for(multimap<ConnectorPtr, ConnectionIPtr>::const_iterator q = _connections.begin(); 
+            q != _connections.end(); ++q)
         {
             if(q->second->endpoint() == endpoint)
             {
@@ -717,13 +716,12 @@ IceInternal::OutgoingConnectionFactory::finishGetConnection(const vector<Connect
             }
         }
 
-        set<ConnectCallbackPtr>::iterator r;
-        for(r = connectionCallbacks.begin(); r != connectionCallbacks.end(); ++r)
+        for(set<ConnectCallbackPtr>::iterator r = connectionCallbacks.begin(); r != connectionCallbacks.end(); ++r)
         {
             (*r)->removeFromPending();
             callbacks.erase(*r);
         }
-        for(r = callbacks.begin(); r != callbacks.end(); ++r)
+        for(set<ConnectCallbackPtr>::iterator r = callbacks.begin(); r != callbacks.end(); ++r)
         {
             (*r)->removeFromPending();
         }
@@ -741,12 +739,11 @@ IceInternal::OutgoingConnectionFactory::finishGetConnection(const vector<Connect
         compress = ci.endpoint->compress();
     }
 
-    set<ConnectCallbackPtr>::const_iterator p;
-    for(p = callbacks.begin(); p != callbacks.end(); ++p)
+    for(set<ConnectCallbackPtr>::const_iterator p = callbacks.begin(); p != callbacks.end(); ++p)
     {
         (*p)->getConnection();
     }
-    for(p = connectionCallbacks.begin(); p != connectionCallbacks.end(); ++p)
+    for(set<ConnectCallbackPtr>::const_iterator p = connectionCallbacks.begin(); p != connectionCallbacks.end(); ++p)
     {
         (*p)->setConnection(connection, compress);
     }
@@ -793,13 +790,12 @@ IceInternal::OutgoingConnectionFactory::finishGetConnection(const vector<Connect
         }
         notifyAll();
     }
-        
-    set<ConnectCallbackPtr>::const_iterator p;
-    for(p = callbacks.begin(); p != callbacks.end(); ++p)
+    
+    for(set<ConnectCallbackPtr>::const_iterator p = callbacks.begin(); p != callbacks.end(); ++p)
     {
         (*p)->getConnection();
     }
-    for(p = failedCallbacks.begin(); p != failedCallbacks.end(); ++p)
+    for(set<ConnectCallbackPtr>::const_iterator p = failedCallbacks.begin(); p != failedCallbacks.end(); ++p)
     {
         (*p)->setException(ex);
     }
diff --git a/cpp/src/Ice/GC.cpp b/cpp/src/Ice/GC.cpp
index 57fecadc549..20d8b36014f 100644
--- a/cpp/src/Ice/GC.cpp
+++ b/cpp/src/Ice/GC.cpp
@@ -331,25 +331,22 @@ IceInternal::GC::collectGarbage()
     //
     // What is left in the counts map can be garbage collected.
     //
+    for(GCCountMap::const_iterator i = counts.begin(); i != counts.end(); ++i)
     {
-        GCCountMap::const_iterator i;
-        for(i = counts.begin(); i != counts.end(); ++i)
-        {
-            //
-            // For classes with members that point at potentially-cyclic instances, __gcClear()
-            // decrements the reference count of the pointed-at instances as many times as they are
-            // pointed at and clears the corresponding Ptr members in the pointing class.
-            // For classes that cannot be part of a cycle (because they do not contain class members)
-            // and are therefore true leaves, __gcClear() assigns 0 to the corresponding class member,
-            // which either decrements the ref count or, if it reaches zero, deletes the instance as usual.
-            //
-            i->first->__gcClear();
-        }
-        for(i = counts.begin(); i != counts.end(); ++i)
-        {
-            gcObjects->erase(i->first); // Remove this object from candidate set.
-            delete i->first; // Delete this object.
-        }
+        //
+        // For classes with members that point at potentially-cyclic instances, __gcClear()
+        // decrements the reference count of the pointed-at instances as many times as they are
+        // pointed at and clears the corresponding Ptr members in the pointing class.
+        // For classes that cannot be part of a cycle (because they do not contain class members)
+        // and are therefore true leaves, __gcClear() assigns 0 to the corresponding class member,
+        // which either decrements the ref count or, if it reaches zero, deletes the instance as usual.
+        //
+        i->first->__gcClear();
+    }
+    for(GCCountMap::const_iterator i = counts.begin(); i != counts.end(); ++i)
+    {
+        gcObjects->erase(i->first); // Remove this object from candidate set.
+        delete i->first; // Delete this object.
     }
 
     if(_statsCallback)
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index b49a8b6f132..2dbbdadb50e 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -444,8 +444,7 @@ getLocalAddresses(ProtocolSupport protocol)
                     struct in_addr* inaddr = &reinterpret_cast<struct sockaddr_in*>(&addr)->sin_addr;
                     if(inaddr->s_addr != 0 && inaddr->s_addr != htonl(INADDR_LOOPBACK))
                     {
-                        unsigned int j;
-                        for(j = 0; j < result.size(); ++j)
+                        for(unsigned int j = 0; j < result.size(); ++j)
                         {
                             if(compareAddress(addr, result[j]) == 0)
                             {
@@ -465,8 +464,7 @@ getLocalAddresses(ProtocolSupport protocol)
                     struct in6_addr* inaddr6 = &reinterpret_cast<struct sockaddr_in6*>(&addr)->sin6_addr;
                     if(!IN6_IS_ADDR_UNSPECIFIED(inaddr6) && !IN6_IS_ADDR_LOOPBACK(inaddr6))
                     {
-                        unsigned int j;
-                        for(j = 0; j < result.size(); ++j)
+                        for(unsigned int j = 0; j < result.size(); ++j)
                         {
                             if(compareAddress(addr, result[j]) == 0)
                             {
@@ -719,8 +717,7 @@ IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol
         throw ex;
     }
 
-    struct addrinfo* p;
-    for(p = info; p != NULL; p = p->ai_next)
+    for(struct addrinfo* p = info; p != NULL; p = p->ai_next)
     {
         memcpy(&addr, p->ai_addr, p->ai_addrlen);
         if(p->ai_family == PF_INET)
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)
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index 9bde5157184..0dc7d29e1fc 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -126,8 +126,7 @@ Ice::PropertiesI::getPropertiesForPrefix(const string& prefix)
     IceUtil::Mutex::Lock sync(*this);
 
     PropertyDict result;
-    map<string, PropertyValue>::iterator p;
-    for(p = _properties.begin(); p != _properties.end(); ++p)
+    for(map<string, PropertyValue>::iterator p = _properties.begin(); p != _properties.end(); ++p)
     {
         if(prefix.empty() || p->first.compare(0, prefix.size(), prefix) == 0)
         {
@@ -244,8 +243,7 @@ Ice::PropertiesI::getCommandLineOptions()
 
     StringSeq result;
     result.reserve(_properties.size());
-    map<string, PropertyValue>::const_iterator p;
-    for(p = _properties.begin(); p != _properties.end(); ++p)
+    for(map<string, PropertyValue>::const_iterator p = _properties.begin(); p != _properties.end(); ++p)
     {
         result.push_back("--" + p->first + "=" + p->second.value);
     }
@@ -263,8 +261,7 @@ Ice::PropertiesI::parseCommandLineOptions(const string& prefix, const StringSeq&
     pfx = "--" + pfx;
     
     StringSeq result;
-    StringSeq::size_type i;
-    for(i = 0; i < options.size(); i++)
+    for(StringSeq::size_type i = 0; i < options.size(); i++)
     {
         string opt = options[i];
        
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index 1d5f4dd1b91..69df87b2924 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -1126,8 +1126,7 @@ IceInternal::RoutableReference::toString() const
 
     if(!_endpoints.empty())
     {
-        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)
         {
             string endp = (*p)->toString();
             if(!endp.empty())
diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp
index 4c0c716811b..37ccafa1976 100644
--- a/cpp/src/Ice/ReferenceFactory.cpp
+++ b/cpp/src/Ice/ReferenceFactory.cpp
@@ -676,8 +676,7 @@ IceInternal::ReferenceFactory::checkForUnknownProperties(const string& prefix)
 
     StringSeq unknownProps;
     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)
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index 722a729229d..9b24501844c 100644
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -1697,8 +1697,7 @@ Ice::Service::runDaemon(int argc, char* argv[], const InitializationData& initDa
             string stdOut = properties->getProperty("Ice.StdOut");
             string stdErr = properties->getProperty("Ice.StdErr");
 
-            vector<int>::const_iterator p;
-            for(p = fdsToClose.begin(); p != fdsToClose.end(); ++p)
+            for(vector<int>::const_iterator p = fdsToClose.begin(); p != fdsToClose.end(); ++p)
             {
                 //
                 // NOTE: Do not close stdout if Ice.StdOut is defined. Likewise for Ice.StdErr.
diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index 89d8512c663..55ac3cf2729 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -155,9 +155,7 @@ Client::run(int argc, char* argv[])
         }
     }
 
-    
-    vector<string>::const_iterator r;
-    for(r = commands.begin(); r != commands.end(); ++r)
+    for(vector<string>::const_iterator r = commands.begin(); r != commands.end(); ++r)
     {
         if((*r) == "shutdown")
         {
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index f91e9cd8da2..6a19450e6ce 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -171,9 +171,7 @@ IceBox::ServiceManagerI::startService(const string& name, const Current&)
 
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this);
-
-        vector<ServiceInfo>::iterator p;
-        for(p = _services.begin(); p != _services.end(); ++p)
+        for(vector<ServiceInfo>::iterator p = _services.begin(); p != _services.end(); ++p)
         {
             if(p->name == name)
             {
@@ -249,9 +247,7 @@ IceBox::ServiceManagerI::stopService(const string& name, const Current&)
 
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this);
-
-        vector<ServiceInfo>::iterator p;
-        for(p = _services.begin(); p != _services.end(); ++p)
+        for(vector<ServiceInfo>::iterator p = _services.begin(); p != _services.end(); ++p)
         {
             if(p->name == name)
             {
@@ -744,7 +740,6 @@ IceBox::ServiceManagerI::stopAll()
     //
     // Services are stopped in the reverse order from which they are started.
     //
-    vector<ServiceInfo>::reverse_iterator p;
 
     vector<string> stoppedServices;
 
@@ -752,7 +747,7 @@ IceBox::ServiceManagerI::stopAll()
     // First, for each service, we call stop on the service and flush its database environment to
     // the disk.
     //
-    for(p = _services.rbegin(); p != _services.rend(); ++p)
+    for(vector<ServiceInfo>::reverse_iterator p = _services.rbegin(); p != _services.rend(); ++p)
     {
         ServiceInfo& info = *p;
 
@@ -778,7 +773,7 @@ IceBox::ServiceManagerI::stopAll()
         }
     }
 
-    for(p = _services.rbegin(); p != _services.rend(); ++p)
+    for(vector<ServiceInfo>::reverse_iterator p = _services.rbegin(); p != _services.rend(); ++p)
     {
         ServiceInfo& info = *p;
 
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp
index 10d0f20d66b..bcc8ee77576 100644
--- a/cpp/src/IceGrid/Activator.cpp
+++ b/cpp/src/IceGrid/Activator.cpp
@@ -453,8 +453,7 @@ Activator::activate(const string& name,
     // Compose command line.
     //
     string cmd;
-    StringSeq::const_iterator p;
-    for(p = args.begin(); p != args.end(); ++p)
+    for(StringSeq::const_iterator p = args.begin(); p != args.end(); ++p)
     {
         if(p != args.begin())
         {
@@ -519,7 +518,7 @@ Activator::activate(const string& name,
             var++; // Skip the '\0' byte
         }
         FreeEnvironmentStringsW(static_cast<wchar_t*>(parentEnv));
-        for(p = envs.begin(); p != envs.end(); ++p)
+        for(StringSeq::const_iterator p = envs.begin(); p != envs.end(); ++p)
         {
             wstring s = IceUtil::stringToWstring(*p);
             wstring::size_type pos = s.find(L'=');
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp
index 960f945e711..601a452eb82 100644
--- a/cpp/src/IceGrid/Database.cpp
+++ b/cpp/src/IceGrid/Database.cpp
@@ -1924,8 +1924,7 @@ Database::reload(const ApplicationHelper& oldApp,
     map<string, ServerInfo> oldServers = oldApp.getServerInfos(uuid, revision);
     map<string, ServerInfo> newServers = newApp.getServerInfos(uuid, revision);
     vector<ServerInfo> load;
-    map<string, ServerInfo>::const_iterator p;
-    for(p = newServers.begin(); p != newServers.end(); ++p)
+    for(map<string, ServerInfo>::const_iterator p = newServers.begin(); p != newServers.end(); ++p)
     {
         map<string, ServerInfo>::const_iterator q = oldServers.find(p->first);
         if(q == oldServers.end())
@@ -1944,7 +1943,7 @@ Database::reload(const ApplicationHelper& oldApp,
             entries.push_back(server);
         }
     }
-    for(p = oldServers.begin(); p != oldServers.end(); ++p)
+    for(map<string, ServerInfo>::const_iterator p = oldServers.begin(); p != oldServers.end(); ++p)
     {
         map<string, ServerInfo>::const_iterator q = newServers.find(p->first);
         if(q == newServers.end())
@@ -1958,8 +1957,7 @@ Database::reload(const ApplicationHelper& oldApp,
     //
     const ReplicaGroupDescriptorSeq& oldAdpts = oldApp.getInstance().replicaGroups;
     const ReplicaGroupDescriptorSeq& newAdpts = newApp.getInstance().replicaGroups;
-    ReplicaGroupDescriptorSeq::const_iterator r;
-    for(r = oldAdpts.begin(); r != oldAdpts.end(); ++r)
+    for(ReplicaGroupDescriptorSeq::const_iterator r = oldAdpts.begin(); r != oldAdpts.end(); ++r)
     {
         ReplicaGroupDescriptorSeq::const_iterator t;
         for(t = newAdpts.begin(); t != newAdpts.end(); ++t)
@@ -1983,8 +1981,8 @@ Database::reload(const ApplicationHelper& oldApp,
     // Remove all the node descriptors.
     //
     const NodeDescriptorDict& oldNodes = oldApp.getInstance().nodes;
-    NodeDescriptorDict::const_iterator n;
-    for(n = oldNodes.begin(); n != oldNodes.end(); ++n)
+    
+    for(NodeDescriptorDict::const_iterator n = oldNodes.begin(); n != oldNodes.end(); ++n)
     {
         _nodeCache.get(n->first)->removeDescriptor(application);
     }
@@ -1993,7 +1991,7 @@ Database::reload(const ApplicationHelper& oldApp,
     // Add back node descriptors.
     //
     const NodeDescriptorDict& newNodes = newApp.getInstance().nodes;
-    for(n = newNodes.begin(); n != newNodes.end(); ++n)
+    for(NodeDescriptorDict::const_iterator n = newNodes.begin(); n != newNodes.end(); ++n)
     {
         _nodeCache.get(n->first, true)->addDescriptor(application, n->second);
     }
@@ -2001,7 +1999,7 @@ Database::reload(const ApplicationHelper& oldApp,
     //
     // Add back replica groups.
     //
-    for(r = newAdpts.begin(); r != newAdpts.end(); ++r)
+    for(ReplicaGroupDescriptorSeq::const_iterator r = newAdpts.begin(); r != newAdpts.end(); ++r)
     {
         try
         {
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index 8c339ae8166..e56b49ecc74 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -284,8 +284,8 @@ Resolver::Resolver(const ApplicationDescriptor& app, const Ice::CommunicatorPtr&
         }
     }
 
-    TemplateDescriptorDict::const_iterator t;
-    for(t = _application->serverTemplates.begin(); t != _application->serverTemplates.end(); ++t)
+    for(TemplateDescriptorDict::const_iterator t = _application->serverTemplates.begin();
+        t != _application->serverTemplates.end(); ++t)
     {
         if(t->first == "")
         {
@@ -308,7 +308,8 @@ Resolver::Resolver(const ApplicationDescriptor& app, const Ice::CommunicatorPtr&
             exception("invalid server template `" + t->first + "': duplicate parameters " + toString(dups));
         }
     }
-    for(t = _application->serviceTemplates.begin(); t != _application->serviceTemplates.end(); ++t)
+    for(TemplateDescriptorDict::const_iterator t = _application->serviceTemplates.begin();
+        t != _application->serviceTemplates.end(); ++t)
     {
         if(t->first == "")
         {
@@ -465,8 +466,7 @@ PropertySetDescriptorDict
 Resolver::operator()(const PropertySetDescriptorDict& propertySets) const
 {
     PropertySetDescriptorDict result;
-    PropertySetDescriptorDict::const_iterator ps;
-    for(ps = propertySets.begin(); ps != propertySets.end(); ++ps)
+    for(PropertySetDescriptorDict::const_iterator ps = propertySets.begin(); ps != propertySets.end(); ++ps)
     {
         PropertySetDescriptor desc;
         desc.references = operator()(ps->second.references, "property set `" + ps->first + "' reference");
@@ -627,8 +627,7 @@ Resolver::addPropertySets(const PropertySetDescriptorDict& propertySets)
 {
     PropertySetDescriptorDict oldPropertySets;
     oldPropertySets.swap(_propertySets);
-    PropertySetDescriptorDict::const_iterator p;
-    for(p = propertySets.begin(); p != propertySets.end(); ++p)
+    for(PropertySetDescriptorDict::const_iterator p = propertySets.begin(); p != propertySets.end(); ++p)
     {
         if(!_propertySets.insert(*p).second)
         {
@@ -640,7 +639,7 @@ Resolver::addPropertySets(const PropertySetDescriptorDict& propertySets)
     //
     // Validate the new property set references.
     //
-    for(p = propertySets.begin(); p != propertySets.end(); ++p)
+    for(PropertySetDescriptorDict::const_iterator p = propertySets.begin(); p != propertySets.end(); ++p)
     {
         getProperties(p->second.references);
     }
@@ -740,8 +739,9 @@ Resolver::hasReplicaGroup(const string& id) const
         //
         return true;
     }
-    ReplicaGroupDescriptorSeq::const_iterator p;
-    for(p = _application->replicaGroups.begin(); p != _application->replicaGroups.end(); ++p)
+    
+    for(ReplicaGroupDescriptorSeq::const_iterator p = _application->replicaGroups.begin(); 
+        p != _application->replicaGroups.end(); ++p)
     {
         if(p->id == id)
         {
@@ -982,13 +982,12 @@ CommunicatorHelper::getIds(multiset<string>& adapterIds, multiset<Ice::Identity>
         }
 
         set<Ice::Identity> ids;
-        ObjectDescriptorSeq::const_iterator q;
-        for(q = p->objects.begin(); q != p->objects.end(); ++q)
+        for(ObjectDescriptorSeq::const_iterator q = p->objects.begin(); q != p->objects.end(); ++q)
         {
             ids.insert(q->id);
             objectIds.insert(q->id);
         }
-        for(q = p->allocatables.begin(); q != p->allocatables.end(); ++q)
+        for(ObjectDescriptorSeq::const_iterator q = p->allocatables.begin(); q != p->allocatables.end(); ++q)
         {
              if(ids.find(q->id) == ids.end())
              {
@@ -1109,8 +1108,9 @@ CommunicatorHelper::print(const Ice::CommunicatorPtr& communicator, Output& out)
         {
             out << nl << "references = " << toString(_desc->propertySet.references);
         }
-        PropertyDescriptorSeq::const_iterator q;
-        for(q = _desc->propertySet.properties.begin(); q != _desc->propertySet.properties.end(); ++q)
+        
+        for(PropertyDescriptorSeq::const_iterator q = _desc->propertySet.properties.begin();
+            q != _desc->propertySet.properties.end(); ++q)
         {
             if(hiddenProperties.find(q->name) == hiddenProperties.end())
             {
@@ -1177,8 +1177,7 @@ CommunicatorHelper::printObjectAdapter(const Ice::CommunicatorPtr& communicator,
     }
     out << nl << "register process = `" << (adapter.registerProcess ? "true" : "false") << "'";
     out << nl << "server lifetime = `" << (adapter.serverLifetime ? "true" : "false") << "'";
-    ObjectDescriptorSeq::const_iterator p;
-    for(p = adapter.objects.begin(); p != adapter.objects.end(); ++p)
+    for(ObjectDescriptorSeq::const_iterator p = adapter.objects.begin(); p != adapter.objects.end(); ++p)
     {
         out << nl << "well-known object";
         out << sb;
@@ -1189,7 +1188,7 @@ CommunicatorHelper::printObjectAdapter(const Ice::CommunicatorPtr& communicator,
         }
         out << eb;
     }
-    for(p = adapter.allocatables.begin(); p != adapter.allocatables.end(); ++p)
+    for(ObjectDescriptorSeq::const_iterator p = adapter.allocatables.begin(); p != adapter.allocatables.end(); ++p)
     {
         out << nl << "allocatable";
         out << sb;
@@ -1998,8 +1997,7 @@ NodeHelper::NodeHelper(const string& name,
         resolve.addPropertySets(_instance.propertySets);
     }
 
-    ServerInstanceDescriptorSeq::const_iterator p;
-    for(p = _def.serverInstances.begin(); p != _def.serverInstances.end(); ++p)
+    for(ServerInstanceDescriptorSeq::const_iterator p = _def.serverInstances.begin(); p != _def.serverInstances.end(); ++p)
     {
         ServerInstanceHelper helper(*p, resolve, instantiate);
         if(!_serverInstances.insert(make_pair(helper.getId(), helper)).second)
@@ -2012,8 +2010,7 @@ NodeHelper::NodeHelper(const string& name,
         }
     }
 
-    ServerDescriptorSeq::const_iterator q;
-    for(q = _def.servers.begin(); q != _def.servers.end(); ++q)
+    for(ServerDescriptorSeq::const_iterator q = _def.servers.begin(); q != _def.servers.end(); ++q)
     {
         ServerInstanceHelper helper(*q, resolve, instantiate);
         if(!_servers.insert(make_pair(helper.getId(), helper)).second)
@@ -2139,13 +2136,11 @@ NodeHelper::update(const NodeUpdateDescriptor& update, const Resolver& appResolv
     //  * then we add the servers from the node which were not updated or removed.
     //
 
-    ServerInstanceHelperDict::const_iterator r;
-
     set<string> added;
     set<string> removed(update.removeServers.begin(), update.removeServers.end());
 
-    ServerInstanceDescriptorSeq::const_iterator q;
-    for(q = update.serverInstances.begin(); q != update.serverInstances.end(); ++q)
+    for(ServerInstanceDescriptorSeq::const_iterator q = update.serverInstances.begin();
+        q != update.serverInstances.end(); ++q)
     {
         ServerInstanceHelper helper(*q, resolve, false);
         if(!added.insert(helper.getId()).second)
@@ -2154,7 +2149,7 @@ NodeHelper::update(const NodeUpdateDescriptor& update, const Resolver& appResolv
         }
         def.serverInstances.push_back(helper.getDefinition());
     }
-    for(r = _serverInstances.begin(); r != _serverInstances.end(); ++r)
+    for(ServerInstanceHelperDict::const_iterator r = _serverInstances.begin(); r != _serverInstances.end(); ++r)
     {
         if(removed.find(r->first) != removed.end() || added.find(r->first) != added.end())
         {
@@ -2185,7 +2180,7 @@ NodeHelper::update(const NodeUpdateDescriptor& update, const Resolver& appResolv
         }
         def.servers.push_back(helper.getServerDefinition());
     }    
-    for(r = _servers.begin(); r != _servers.end(); ++r)
+    for(ServerInstanceHelperDict::const_iterator r = _servers.begin(); r != _servers.end(); ++r)
     {
         if(removed.find(r->first) != removed.end() || added.find(r->first) != added.end())
         {
@@ -2212,13 +2207,12 @@ void
 NodeHelper::getIds(multiset<string>& serverIds, multiset<string>& adapterIds, multiset<Ice::Identity>& objectIds) const
 {
     assert(_instantiated);
-    ServerInstanceHelperDict::const_iterator p;
-    for(p = _serverInstances.begin(); p != _serverInstances.end(); ++p)
+    for(ServerInstanceHelperDict::const_iterator p = _serverInstances.begin(); p != _serverInstances.end(); ++p)
     {
         serverIds.insert(p->first);
         p->second.getIds(adapterIds, objectIds);
     }
-    for(p = _servers.begin(); p != _servers.end(); ++p)
+    for(ServerInstanceHelperDict::const_iterator p = _servers.begin(); p != _servers.end(); ++p)
     {
         serverIds.insert(p->first);
         p->second.getIds(adapterIds, objectIds);
@@ -2229,12 +2223,11 @@ void
 NodeHelper::getReplicaGroups(set<string>& replicaGroups) const
 {
     assert(_instantiated);
-    ServerInstanceHelperDict::const_iterator p;
-    for(p = _serverInstances.begin(); p != _serverInstances.end(); ++p)
+    for(ServerInstanceHelperDict::const_iterator p = _serverInstances.begin(); p != _serverInstances.end(); ++p)
     {
         p->second.getReplicaGroups(replicaGroups);
     }
-    for(p = _servers.begin(); p != _servers.end(); ++p)
+    for(ServerInstanceHelperDict::const_iterator p = _servers.begin(); p != _servers.end(); ++p)
     {
         p->second.getReplicaGroups(replicaGroups);
     }    
@@ -2257,9 +2250,7 @@ void
 NodeHelper::getServerInfos(const string& app, const string& uuid, int revision, map<string, ServerInfo>& servers) const
 {
     assert(_instantiated);
-
-    ServerInstanceHelperDict::const_iterator p;
-    for(p = _serverInstances.begin(); p != _serverInstances.end(); ++p)
+    for(ServerInstanceHelperDict::const_iterator p = _serverInstances.begin(); p != _serverInstances.end(); ++p)
     {
         ServerInfo info;
         info.node = _name;
@@ -2269,7 +2260,7 @@ NodeHelper::getServerInfos(const string& app, const string& uuid, int revision,
         info.descriptor = p->second.getServerInstance();
         servers.insert(make_pair(p->second.getId(), info));
     }
-    for(p = _servers.begin(); p != _servers.end(); ++p)
+    for(ServerInstanceHelperDict::const_iterator p = _servers.begin(); p != _servers.end(); ++p)
     {
         ServerInfo info;
         info.node = _name;
@@ -2291,15 +2282,14 @@ NodeHelper::hasDistributions(const string& server) const
     //
     if(server.empty())
     {
-        ServerInstanceHelperDict::const_iterator p;
-        for(p = _serverInstances.begin(); p != _serverInstances.end(); ++p)
+        for(ServerInstanceHelperDict::const_iterator p = _serverInstances.begin(); p != _serverInstances.end(); ++p)
         {
             if(!p->second.getServerInstance()->distrib.icepatch.empty())
             {
                 return true;
             }
         }
-        for(p = _servers.begin(); p != _servers.end(); ++p)
+        for(ServerInstanceHelperDict::const_iterator p = _servers.begin(); p != _servers.end(); ++p)
         {
             if(!p->second.getServerInstance()->distrib.icepatch.empty())
             {
@@ -2367,8 +2357,7 @@ NodeHelper::print(Output& out) const
     }
     if(!_instance.propertySets.empty())
     {
-        PropertySetDescriptorDict::const_iterator q;
-        for(q = _instance.propertySets.begin(); q != _instance.propertySets.end(); ++q)
+        for(PropertySetDescriptorDict::const_iterator q = _instance.propertySets.begin(); q != _instance.propertySets.end(); ++q)
         {
             out << nl << "properties `" << q->first << "'";
             out << sb;
@@ -2392,12 +2381,11 @@ NodeHelper::print(Output& out) const
     
     out << nl << "servers";
     out << sb;
-    ServerInstanceHelperDict::const_iterator p;
-    for(p = _serverInstances.begin(); p != _serverInstances.end(); ++p)
+    for(ServerInstanceHelperDict::const_iterator p = _serverInstances.begin(); p != _serverInstances.end(); ++p)
     {
         out << nl << p->first;
     }
-    for(p = _servers.begin(); p != _servers.end(); ++p)
+    for(ServerInstanceHelperDict::const_iterator p = _servers.begin(); p != _servers.end(); ++p)
     {
         out << nl << p->first;
     }
@@ -2464,8 +2452,7 @@ NodeHelper::printDiff(Output& out, const NodeHelper& helper) const
     {
         out << nl << "servers";
         out << sb;
-        ServerInstanceHelperDict::const_iterator p;
-        for(p = updated.begin(); p != updated.end(); ++p)
+        for(ServerInstanceHelperDict::const_iterator p = updated.begin(); p != updated.end(); ++p)
         {
             if(helper._serverInstances.find(p->first) == helper._serverInstances.end() &&
                helper._servers.find(p->first) == helper._servers.end())
@@ -2473,7 +2460,7 @@ NodeHelper::printDiff(Output& out, const NodeHelper& helper) const
                 out << nl << "server `" << p->first << "' added";
             }
         }
-        for(p = updated.begin(); p != updated.end(); ++p)
+        for(ServerInstanceHelperDict::const_iterator p = updated.begin(); p != updated.end(); ++p)
         {
             if(helper._serverInstances.find(p->first) != helper._serverInstances.end() ||
                helper._servers.find(p->first) != helper._servers.end())
@@ -2782,8 +2769,7 @@ ApplicationHelper::getIds(set<string>& serverIds, set<string>& adapterIds, set<I
     {
         p->second.getIds(sIds, aIds, oIds);
     }
-    ReplicaGroupDescriptorSeq::const_iterator r;
-    for(r = _def.replicaGroups.begin(); r != _def.replicaGroups.end(); ++r)
+    for(ReplicaGroupDescriptorSeq::const_iterator r = _def.replicaGroups.begin(); r != _def.replicaGroups.end(); ++r)
     {
         aIds.insert(r->id);
         for(ObjectDescriptorSeq::const_iterator o = r->objects.begin(); o != r->objects.end(); ++o)
@@ -2800,8 +2786,7 @@ ApplicationHelper::getIds(set<string>& serverIds, set<string>& adapterIds, set<I
 void
 ApplicationHelper::getReplicaGroups(set<string>& replicaGroups, set<string>& adapterReplicaGroups) const
 {
-    ReplicaGroupDescriptorSeq::const_iterator r;
-    for(r = _def.replicaGroups.begin(); r != _def.replicaGroups.end(); ++r)
+    for(ReplicaGroupDescriptorSeq::const_iterator r = _def.replicaGroups.begin(); r != _def.replicaGroups.end(); ++r)
     {
         replicaGroups.insert(r->id);
     }
@@ -2903,8 +2888,8 @@ ApplicationHelper::print(Output& out, const ApplicationInfo& info) const
     }
     if(!_instance.propertySets.empty())
     {
-        PropertySetDescriptorDict::const_iterator q;
-        for(q = _instance.propertySets.begin(); q != _instance.propertySets.end(); ++q)
+        for(PropertySetDescriptorDict::const_iterator q = _instance.propertySets.begin();
+            q != _instance.propertySets.end(); ++q)
         {
             out << nl << "properties `" << q->first << "'";
             out << sb;
@@ -2912,8 +2897,8 @@ ApplicationHelper::print(Output& out, const ApplicationInfo& info) const
             {
                 out << nl << "references = " << toString(q->second.references);
             }
-            PropertyDescriptorSeq::const_iterator r;
-            for(r = q->second.properties.begin(); r != q->second.properties.end(); ++r)
+            for(PropertyDescriptorSeq::const_iterator r = q->second.properties.begin(); 
+                r != q->second.properties.end(); ++r)
             {
                 out << nl << r->name << " = `" << r->value << "'";
             }
@@ -2935,8 +2920,8 @@ ApplicationHelper::print(Output& out, const ApplicationInfo& info) const
     {
         out << nl << "replica groups";
         out << sb;
-        ReplicaGroupDescriptorSeq::const_iterator p;
-        for(p = _instance.replicaGroups.begin(); p != _instance.replicaGroups.end(); ++p)
+        for(ReplicaGroupDescriptorSeq::const_iterator p = _instance.replicaGroups.begin();
+            p != _instance.replicaGroups.end(); ++p)
         {
             out << nl << "id = `" << p->id << "' load balancing = `";
             if(!p->loadBalancing)
@@ -2967,8 +2952,7 @@ ApplicationHelper::print(Output& out, const ApplicationInfo& info) const
     {
         out << nl << "server templates";
         out << sb;
-        TemplateDescriptorDict::const_iterator p;
-        for(p = _instance.serverTemplates.begin(); p != _instance.serverTemplates.end(); ++p)
+        for(TemplateDescriptorDict::const_iterator p = _instance.serverTemplates.begin(); p != _instance.serverTemplates.end(); ++p)
         {
             out << nl << p->first;
         }
@@ -2978,8 +2962,8 @@ ApplicationHelper::print(Output& out, const ApplicationInfo& info) const
     {
         out << nl << "service templates";
         out << sb;
-        TemplateDescriptorDict::const_iterator p;
-        for(p = _instance.serviceTemplates.begin(); p != _instance.serviceTemplates.end(); ++p)
+        for(TemplateDescriptorDict::const_iterator p = _instance.serviceTemplates.begin();
+            p != _instance.serviceTemplates.end(); ++p)
         {
             out << nl << p->first;
         }
@@ -3035,8 +3019,8 @@ ApplicationHelper::printDiff(Output& out, const ApplicationHelper& helper) const
         {
             out << nl << "replica groups";
             out << sb;
-            ReplicaGroupDescriptorSeq::iterator p = updated.begin();
-            while(p != updated.end())
+           
+            for(ReplicaGroupDescriptorSeq::iterator p = updated.begin(); p != updated.end();)
             {
                 ReplicaGroupDescriptorSeq::const_iterator r;
                 for(r = helper._def.replicaGroups.begin(); r != helper._def.replicaGroups.end(); 
@@ -3054,7 +3038,7 @@ ApplicationHelper::printDiff(Output& out, const ApplicationHelper& helper) const
                     ++p;
                 }
             }
-            for(p = updated.begin(); p != updated.end(); ++p)
+            for(ReplicaGroupDescriptorSeq::iterator p = updated.begin(); p != updated.end(); ++p)
             {
                 out << nl << "replica group `" << p->id << "' added";
             }
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp
index 1c03de9c4fa..c5e54d460d3 100644
--- a/cpp/src/IceGrid/NodeI.cpp
+++ b/cpp/src/IceGrid/NodeI.cpp
@@ -594,9 +594,8 @@ NodeI::patch_async(const AMD_Node_patchPtr& amdCB,
     {
         try
         {
-            set<ServerIPtr>::iterator s = servers.begin(); 
             vector<string> running;
-            while(s != servers.end())
+            for(set<ServerIPtr>::iterator s = servers.begin(); s != servers.end();)
             {
                 try
                 {
@@ -628,7 +627,7 @@ NodeI::patch_async(const AMD_Node_patchPtr& amdCB,
                 }
             }
 
-            for(s = servers.begin(); s != servers.end(); ++s)
+            for(set<ServerIPtr>::iterator s = servers.begin(); s != servers.end(); ++s)
             {
                 (*s)->waitForPatch();
             }
@@ -651,7 +650,7 @@ NodeI::patch_async(const AMD_Node_patchPtr& amdCB,
             //
             // Patch the server(s).
             //
-            for(s = servers.begin(); s != servers.end(); ++s)
+            for(set<ServerIPtr>::iterator s = servers.begin(); s != servers.end(); ++s)
             {
                 InternalDistributionDescriptorPtr dist = (*s)->getDistribution();
                 if(dist && (server.empty() || (*s)->getId() == server))
@@ -1253,8 +1252,7 @@ NodeI::canRemoveServerDirectory(const string& name)
     }
     
     c = readDirectory(_serversDir + "/" + name + "/config");
-    Ice::StringSeq::const_iterator p;
-    for(p = c.begin() ; p != c.end(); ++p)
+    for(Ice::StringSeq::const_iterator p = c.begin() ; p != c.end(); ++p)
     {
         if(p->find("config") != 0)
         {
@@ -1263,7 +1261,7 @@ NodeI::canRemoveServerDirectory(const string& name)
     }
     
     c = readDirectory(_serversDir + "/" + name + "/dbs");
-    for(p = c.begin() ; p != c.end(); ++p)
+    for(Ice::StringSeq::const_iterator p = c.begin() ; p != c.end(); ++p)
     {
         try
         {
diff --git a/cpp/src/IceGrid/NodeSessionManager.cpp b/cpp/src/IceGrid/NodeSessionManager.cpp
index 42e08bc2821..320255bc086 100644
--- a/cpp/src/IceGrid/NodeSessionManager.cpp
+++ b/cpp/src/IceGrid/NodeSessionManager.cpp
@@ -350,8 +350,8 @@ NodeSessionManager::destroy()
     {
         _thread->terminate();
     }
-    NodeSessionMap::const_iterator p;
-    for(p = sessions.begin(); p != sessions.end(); ++p)
+
+    for(NodeSessionMap::const_iterator p = sessions.begin(); p != sessions.end(); ++p)
     {
         p->second->terminate();
     }
@@ -360,7 +360,7 @@ NodeSessionManager::destroy()
     {
         _thread->getThreadControl().join();
     }
-    for(p = sessions.begin(); p != sessions.end(); ++p)
+    for(NodeSessionMap::const_iterator p = sessions.begin(); p != sessions.end(); ++p)
     {
         p->second->getThreadControl().join();
     }
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index 6b3067dc688..d28f8b5b92e 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -349,18 +349,17 @@ RegistryI::startImpl()
     // Get the saved replica/node proxies.
     //
     ObjectProxySeq proxies;
-    ObjectProxySeq::const_iterator p;
 
     NodePrxSeq nodes;
     proxies = _database->getInternalObjectsByType(Node::ice_staticId());
-    for(p = proxies.begin(); p != proxies.end(); ++p)
+    for(ObjectProxySeq::const_iterator p = proxies.begin(); p != proxies.end(); ++p)
     {
         nodes.push_back(NodePrx::uncheckedCast(*p));
     }
 
     InternalRegistryPrxSeq replicas;
     proxies = _database->getObjectsByType(InternalRegistry::ice_staticId());
-    for(p = proxies.begin(); p != proxies.end(); ++p)
+    for(ObjectProxySeq::const_iterator p = proxies.begin(); p != proxies.end(); ++p)
     {
         replicas.push_back(InternalRegistryPrx::uncheckedCast(*p));
     }
diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp
index d9be593a4af..c7b3835eeb0 100644
--- a/cpp/src/IceGrid/ServerCache.cpp
+++ b/cpp/src/IceGrid/ServerCache.cpp
@@ -167,8 +167,7 @@ ServerCache::addCommunicator(const CommunicatorDescriptorPtr& comm,
         assert(!q->id.empty());
         _adapterCache.addServerAdapter(*q, server, application);
 
-        ObjectDescriptorSeq::const_iterator r;
-        for(r = q->objects.begin(); r != q->objects.end(); ++r)
+        for(ObjectDescriptorSeq::const_iterator r = q->objects.begin(); r != q->objects.end(); ++r)
         {
             ObjectInfo info;
             info.type = r->type;
@@ -176,7 +175,7 @@ ServerCache::addCommunicator(const CommunicatorDescriptorPtr& comm,
             _objectCache.add(info, application);
         }
 
-        for(r = q->allocatables.begin(); r != q->allocatables.end(); ++r)
+        for(ObjectDescriptorSeq::const_iterator r = q->allocatables.begin(); r != q->allocatables.end(); ++r)
         {
             ObjectInfo info;
             info.type = r->type;
@@ -191,12 +190,11 @@ ServerCache::removeCommunicator(const CommunicatorDescriptorPtr& comm, const Ser
 {
     for(AdapterDescriptorSeq::const_iterator q = comm->adapters.begin() ; q != comm->adapters.end(); ++q)
     {
-        ObjectDescriptorSeq::const_iterator r;
-        for(r = q->objects.begin(); r != q->objects.end(); ++r)
+        for(ObjectDescriptorSeq::const_iterator r = q->objects.begin(); r != q->objects.end(); ++r)
         {
             _objectCache.remove(r->id);
         }
-        for(r = q->allocatables.begin(); r != q->allocatables.end(); ++r)
+        for(ObjectDescriptorSeq::const_iterator r = q->allocatables.begin(); r != q->allocatables.end(); ++r)
         {
             _allocatableObjectCache.remove(r->id);
         }
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 4db7ef92f78..8c80eb500d3 100755
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -2245,8 +2245,8 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
                     throw "couldn't create configuration file `" + file + "'";
                 }
                 
-                PropertyDescriptorSeq::const_iterator p;
-                for(p = (*q)->properties.begin(); p != (*q)->properties.end(); ++p)
+                for(PropertyDescriptorSeq::const_iterator p = (*q)->properties.begin();
+                    p != (*q)->properties.end(); ++p)
                 {
                     if(!p->name.empty())
                     {
diff --git a/cpp/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp
index 549a07f2659..f94c00a4197 100755
--- a/cpp/src/IcePatch2/Calc.cpp
+++ b/cpp/src/IcePatch2/Calc.cpp
@@ -196,7 +196,6 @@ main(int argc, char* argv[])
 
     try
     {
-        StringSeq::iterator p;
         string absDataDir = dataDir;
     
         string cwd;
@@ -210,7 +209,7 @@ main(int argc, char* argv[])
             absDataDir = simplify(cwd + '/' + absDataDir);
         }
         
-        for(p = fileSeq.begin(); p != fileSeq.end(); ++p)
+        for(StringSeq::iterator p = fileSeq.begin(); p != fileSeq.end(); ++p)
         {
             if(!IceUtilInternal::isAbsolutePath(*p))
             {
@@ -225,7 +224,7 @@ main(int argc, char* argv[])
         //
         string absDataDirWithSlash = simplify(absDataDir + '/');
 
-        for(p = fileSeq.begin(); p != fileSeq.end(); ++p)
+        for(StringSeq::iterator p = fileSeq.begin(); p != fileSeq.end(); ++p)
         {
             if(p->compare(0, absDataDirWithSlash.size(), absDataDirWithSlash) != 0)
             {
@@ -249,7 +248,7 @@ main(int argc, char* argv[])
         {
             loadFileInfoSeq(absDataDir, infoSeq);
 
-            for(p = fileSeq.begin(); p != fileSeq.end(); ++p)
+            for(StringSeq::iterator p = fileSeq.begin(); p != fileSeq.end(); ++p)
             {
                 FileInfoSeq partialInfoSeq;
 
diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp
index 78aa0776d3e..3e829cc3867 100755
--- a/cpp/src/IcePatch2Lib/ClientUtil.cpp
+++ b/cpp/src/IcePatch2Lib/ClientUtil.cpp
@@ -450,10 +450,8 @@ IcePatch2::Patcher::patch(const string& d)
     {
         string dirWithSlash = simplify(dir + '/');
 
-        FileInfoSeq::const_iterator p;
-
         FileInfoSeq remove;
-        for(p = _removeFiles.begin(); p != _removeFiles.end(); ++p)
+        for(FileInfoSeq::const_iterator p = _removeFiles.begin(); p != _removeFiles.end(); ++p)
         {
             if(p->path == dir)
             {
@@ -466,7 +464,7 @@ IcePatch2::Patcher::patch(const string& d)
         }
 
         FileInfoSeq update;
-        for(p = _updateFiles.begin(); p != _updateFiles.end(); ++p)
+        for(FileInfoSeq::const_iterator p = _updateFiles.begin(); p != _updateFiles.end(); ++p)
         {
             if(p->path == dir)
             {
@@ -479,7 +477,7 @@ IcePatch2::Patcher::patch(const string& d)
         }
 
         FileInfoSeq updateFlag;
-        for(p = _updateFlags.begin(); p != _updateFlags.end(); ++p)
+        for(FileInfoSeq::const_iterator p = _updateFlags.begin(); p != _updateFlags.end(); ++p)
         {
             if(p->path == dir)
             {
@@ -674,12 +672,10 @@ IcePatch2::Patcher::updateFiles(const FileInfoSeq& files)
 bool
 IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const DecompressorPtr& decompressor)
 {
-    FileInfoSeq::const_iterator p;
-    
     Long total = 0;
     Long updated = 0;
     
-    for(p = files.begin(); p != files.end(); ++p)
+    for(FileInfoSeq::const_iterator p = files.begin(); p != files.end(); ++p)
     {
         if(p->size > 0) // Regular, non-empty file?
         {
@@ -690,7 +686,7 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre
     AsyncResultPtr curCB;
     AsyncResultPtr nxtCB;
 
-    for(p = files.begin(); p != files.end(); ++p)
+    for(FileInfoSeq::const_iterator p = files.begin(); p != files.end(); ++p)
     {
         if(p->size < 0) // Directory?
         {
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp
index 21ee03196ba..5031718739e 100755
--- a/cpp/src/IcePatch2Lib/Util.cpp
+++ b/cpp/src/IcePatch2Lib/Util.cpp
@@ -1152,9 +1152,7 @@ IcePatch2::getFileTree0(const FileInfoSeq& infoSeq, FileTree0& tree0)
         tree1.files.clear();
         tree1.checksum.resize(20);
         
-        FileInfoSeq::const_iterator p;
-        
-        for(p = infoSeq.begin(); p != infoSeq.end(); ++p)
+        for(FileInfoSeq::const_iterator p = infoSeq.begin(); p != infoSeq.end(); ++p)
         {
             if(i == static_cast<int>(p->checksum[0]))
             {
@@ -1166,7 +1164,7 @@ IcePatch2::getFileTree0(const FileInfoSeq& infoSeq, FileTree0& tree0)
         allChecksums1.resize(tree1.files.size() * 21); // 20 bytes for the checksum + 1 byte for the flag
         ByteSeq::iterator c1 = allChecksums1.begin();
 
-        for(p = tree1.files.begin(); p != tree1.files.end(); ++p, c1 += 21)
+        for(FileInfoSeq::const_iterator p = tree1.files.begin(); p != tree1.files.end(); ++p, c1 += 21)
         {
             copy(p->checksum.begin(), p->checksum.end(), c1);
             *(c1 + 20) = p->executable;
diff --git a/cpp/src/IceSSL/TrustManager.cpp b/cpp/src/IceSSL/TrustManager.cpp
index 1ab0b2deb9c..7d9e575ef30 100644
--- a/cpp/src/IceSSL/TrustManager.cpp
+++ b/cpp/src/IceSSL/TrustManager.cpp
@@ -154,12 +154,10 @@ TrustManager::verify(const NativeConnectionInfoPtr& info)
             }
         }
 
-        list<list<DistinguishedName> >::const_iterator p;
-
         //
         // Fail if we match anything in the reject set.
         //
-        for(p = reject.begin(); p != reject.end(); ++p)
+        for(list<list<DistinguishedName> >::const_iterator p = reject.begin(); p != reject.end(); ++p)
         {
             if(_traceLevel > 1)
             {
@@ -183,7 +181,7 @@ TrustManager::verify(const NativeConnectionInfoPtr& info)
         //
         // Succeed if we match anything in the accept set.
         //
-        for(p = accept.begin(); p != accept.end(); ++p)
+        for(list<list<DistinguishedName> >::const_iterator p = accept.begin(); p != accept.end(); ++p)
         {
             if(_traceLevel > 1)
             {
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp
index a380ec9c43b..f0ddfc86cca 100644
--- a/cpp/src/IceSSL/Util.cpp
+++ b/cpp/src/IceSSL/Util.cpp
@@ -184,8 +184,7 @@ IceSSL::DHParams::DHParams() :
 
 IceSSL::DHParams::~DHParams()
 {
-    ParamList::iterator p;
-    for(p = _params.begin(); p != _params.end(); ++p)
+    for(ParamList::iterator p = _params.begin(); p != _params.end(); ++p)
     {
         DH_free(p->second);
     }
@@ -226,8 +225,7 @@ IceSSL::DHParams::get(int keyLength)
     // First check the set of parameters specified by the user.
     // Return the first set whose key length is at least keyLength.
     //
-    ParamList::iterator p;
-    for(p = _params.begin(); p != _params.end(); ++p)
+    for(ParamList::iterator p = _params.begin(); p != _params.end(); ++p)
     {
         if(p->first >= keyLength)
         {
diff --git a/cpp/src/IceStorm/NodeI.cpp b/cpp/src/IceStorm/NodeI.cpp
index f586edcaa86..20da26fdb6b 100644
--- a/cpp/src/IceStorm/NodeI.cpp
+++ b/cpp/src/IceStorm/NodeI.cpp
@@ -580,8 +580,7 @@ NodeI::mergeContinue()
     // updates.
     int maxid = -1;
     LogUpdate maxllu = { -1, 0 };
-    set<GroupNodeInfo>::const_iterator p;
-    for(p = tmpSet.begin(); p != tmpSet.end(); ++p)
+    for(set<GroupNodeInfo>::const_iterator p = tmpSet.begin(); p != tmpSet.end(); ++p)
     {
         if(_traceLevels->election > 0)
         {
@@ -674,7 +673,7 @@ NodeI::mergeContinue()
     }
 
     // Tell each node to go.
-    for(p = tmpSet.begin(); p != tmpSet.end(); ++p)
+    for(set<GroupNodeInfo>::const_iterator p = tmpSet.begin(); p != tmpSet.end(); ++p)
     {
         try
         {
diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp
index 0be8561f18d..a5fb7a35373 100644
--- a/cpp/src/IceUtil/StringUtil.cpp
+++ b/cpp/src/IceUtil/StringUtil.cpp
@@ -139,8 +139,7 @@ encodeChar(string::value_type b, string& s, const string& special)
 string
 IceUtilInternal::escapeString(const string& s, const string& special)
 {
-    string::size_type i;
-    for(i = 0; i < special.size(); ++i)
+    for(string::size_type i = 0; i < special.size(); ++i)
     {
         if(static_cast<unsigned char>(special[i]) < 32 || static_cast<unsigned char>(special[i]) > 126)
         {
@@ -149,7 +148,7 @@ IceUtilInternal::escapeString(const string& s, const string& special)
     }
     
     string result;
-    for(i = 0; i < s.size(); ++i)
+    for(string::size_type i = 0; i < s.size(); ++i)
     {
         encodeChar(s[i], result, special);
     }
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index c8f1effe0a5..0c75dadedd0 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -1905,7 +1905,6 @@ Slice::JavaGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
 
     string keyS = typeToString(key, TypeModeIn, package);
     string valueS = typeToString(value, TypeModeIn, package);
-    int i;
 
     ostringstream o;
     o << iter;
@@ -1926,7 +1925,7 @@ Slice::JavaGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
         out << nl << "for(java.util.Map.Entry<" << keyObjectS << ", " << valueObjectS << "> __e : " << v
             << ".entrySet())";
         out << sb;
-        for(i = 0; i < 2; i++)
+        for(int i = 0; i < 2; i++)
         {
             string arg;
             TypePtr type;
@@ -1951,7 +1950,7 @@ Slice::JavaGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
         out << nl << "int __sz" << iterS << " = __is.readSize();";
         out << nl << "for(int __i" << iterS << " = 0; __i" << iterS << " < __sz" << iterS << "; __i" << iterS << "++)";
         out << sb;
-        for(i = 0; i < 2; i++)
+        for(int i = 0; i < 2; i++)
         {
             string arg;
             TypePtr type;
@@ -2988,7 +2987,6 @@ Slice::JavaGenerator::writeStreamDictionaryMarshalUnmarshalCode(Output& out,
 
     string keyS = typeToString(key, TypeModeIn, package);
     string valueS = typeToString(value, TypeModeIn, package);
-    int i;
 
     ostringstream o;
     o << iter;
@@ -3009,7 +3007,7 @@ Slice::JavaGenerator::writeStreamDictionaryMarshalUnmarshalCode(Output& out,
         out << nl << "for(java.util.Map.Entry<" << keyObjectS << ", " << valueObjectS << "> __e : " << v
             << ".entrySet())";
         out << sb;
-        for(i = 0; i < 2; i++)
+        for(int i = 0; i < 2; i++)
         {
             string arg;
             TypePtr type;
@@ -3034,7 +3032,7 @@ Slice::JavaGenerator::writeStreamDictionaryMarshalUnmarshalCode(Output& out,
         out << nl << "int __sz" << iterS << " = __inS.readSize();";
         out << nl << "for(int __i" << iterS << " = 0; __i" << iterS << " < __sz" << iterS << "; __i" << iterS << "++)";
         out << sb;
-        for(i = 0; i < 2; i++)
+        for(int i = 0; i < 2; i++)
         {
             string arg;
             TypePtr type;
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 1ac81d36880..5468c381dbc 100755
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -1986,8 +1986,7 @@ Slice::Container::visit(ParserVisitor* visitor, bool all)
 void
 Slice::Container::containerRecDependencies(set<ConstructedPtr>& dependencies)
 {
-    ContainedList::iterator p;
-    for(p = _contents.begin(); p != _contents.end(); ++p)
+    for(ContainedList::iterator p = _contents.begin(); p != _contents.end(); ++p)
     {
         ConstructedPtr constructed = ConstructedPtr::dynamicCast(*p);
         if(constructed && dependencies.find(constructed) != dependencies.end())
@@ -2738,8 +2737,7 @@ Slice::ClassDecl::recDependencies(set<ConstructedPtr>& dependencies)
     {
         _definition->containerRecDependencies(dependencies);
         ClassList bases = _definition->bases();
-        ClassList::iterator p;
-        for(p = bases.begin(); p != bases.end(); ++p)
+        for(ClassList::iterator p = bases.begin(); p != bases.end(); ++p)
         {
             (*p)->declaration()->recDependencies(dependencies);
         }
@@ -4967,9 +4965,7 @@ Slice::Operation::uses(const ContainedPtr& contained) const
         }
     }
 
-    ExceptionList::const_iterator q;
-
-    for(q = _throws.begin(); q != _throws.end(); ++q)
+    for(ExceptionList::const_iterator q = _throws.begin(); q != _throws.end(); ++q)
     {
         ContainedPtr contained2 = ContainedPtr::dynamicCast(*q);
         if(contained2 && contained2 == contained)
@@ -5699,8 +5695,7 @@ Slice::Unit::removeContent(const ContainedPtr& contained)
     string scoped = IceUtilInternal::toLower(contained->scoped());
     map<string, ContainedList>::iterator p = _contentMap.find(scoped);
     assert(p != _contentMap.end());
-    ContainedList::iterator q;
-    for(q = p->second.begin(); q != p->second.end(); ++q)
+    for(ContainedList::iterator q = p->second.begin(); q != p->second.end(); ++q)
     {
         if(q->get() == contained.get())
         {
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 7c4c60f545f..bb1b3c35c94 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -352,8 +352,8 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
     }
 
     vector<string> fullIncludePaths;
-    vector<string>::const_iterator p;
-    for(p = includePaths.begin(); p != includePaths.end(); ++p)
+
+    for(vector<string>::const_iterator p = includePaths.begin(); p != includePaths.end(); ++p)
     {
         fullIncludePaths.push_back(fullPath(*p));
     }
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp
index 45ded5d48bc..5e9e42c7c04 100755
--- a/cpp/src/Slice/PythonUtil.cpp
+++ b/cpp/src/Slice/PythonUtil.cpp
@@ -409,7 +409,6 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
     ClassList bases = p->bases();
     ClassDefPtr base;
     OperationList ops = p->operations();
-    OperationList::iterator oli;
     bool isAbstract = p->isInterface() || p->allOperations().size() > 0; // Don't use isAbstract() - see bug 3739
 
     //
@@ -560,7 +559,7 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
         //
         // Emit a placeholder for each operation.
         //
-        for(oli = ops.begin(); oli != ops.end(); ++oli)
+        for(OperationList::iterator oli = ops.begin(); oli != ops.end(); ++oli)
         {
             string fixedOpName = fixIdent((*oli)->name());
             if(!p->isLocal() && (p->hasMetaData("amd") || (*oli)->hasMetaData("amd")))
@@ -657,7 +656,7 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
         _out << "):";
         _out.inc();
 
-        for(oli = ops.begin(); oli != ops.end(); ++oli)
+        for(OperationList::iterator oli = ops.begin(); oli != ops.end(); ++oli)
         {
             string fixedOpName = fixIdent((*oli)->name());
             if(fixedOpName == "checkedCast" || fixedOpName == "uncheckedCast")
@@ -1056,7 +1055,6 @@ Slice::Python::CodeVisitor::visitExceptionStart(const ExceptionPtr& p)
     }
 
     DataMemberList members = p->dataMembers();
-    DataMemberList::iterator dmli;
 
     //
     // __init__
@@ -1140,7 +1138,7 @@ Slice::Python::CodeVisitor::visitExceptionStart(const ExceptionPtr& p)
     //
     // where MemberType is either a primitive type constant (T_INT, etc.) or the id of a constructed type.
     //
-    for(dmli = members.begin(); dmli != members.end(); ++dmli)
+    for(DataMemberList::iterator dmli = members.begin(); dmli != members.end(); ++dmli)
     {
         if(dmli != members.begin())
         {
@@ -1179,7 +1177,6 @@ Slice::Python::CodeVisitor::visitStructStart(const StructPtr& p)
     string abs = getAbsolute(p);
     string name = fixIdent(p->name());
     MemberInfoList memberList;
-    MemberInfoList::iterator r;
 
     {
         DataMemberList members = p->dataMembers();
@@ -1208,7 +1205,7 @@ Slice::Python::CodeVisitor::visitStructStart(const StructPtr& p)
     writeConstructorParams(memberList);
     _out << "):";
     _out.inc();
-    for(r = memberList.begin(); r != memberList.end(); ++r)
+    for(MemberInfoList::iterator r = memberList.begin(); r != memberList.end(); ++r)
     {
         writeAssign(*r);
     }
@@ -1218,7 +1215,7 @@ Slice::Python::CodeVisitor::visitStructStart(const StructPtr& p)
     _out.inc();
     _out << nl << "_h = 0";
     int iter = 0;
-    for(r = memberList.begin(); r != memberList.end(); ++r)
+    for(MemberInfoList::iterator r = memberList.begin(); r != memberList.end(); ++r)
     {
         string s = "self." + r->fixedName;
         writeHash(s, r->dataMember->type(), iter);
@@ -1249,7 +1246,7 @@ Slice::Python::CodeVisitor::visitStructStart(const StructPtr& p)
         if(!memberList.empty())
         {
             _out << nl << "return ";
-            for(r = memberList.begin(); r != memberList.end(); ++r)
+            for(MemberInfoList::iterator r = memberList.begin(); r != memberList.end(); ++r)
             {
                 if(r != memberList.begin())
                 {
@@ -1314,7 +1311,7 @@ Slice::Python::CodeVisitor::visitStructStart(const StructPtr& p)
         _out.inc();
         _out << nl;
     }
-    for(r = memberList.begin(); r != memberList.end(); ++r)
+    for(MemberInfoList::iterator r = memberList.begin(); r != memberList.end(); ++r)
     {
         if(r != memberList.begin())
         {
diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp
index 3922d6cbbf2..b4aa70e9ac6 100755
--- a/cpp/src/Slice/RubyUtil.cpp
+++ b/cpp/src/Slice/RubyUtil.cpp
@@ -218,7 +218,6 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
     ClassList bases = p->bases();
     ClassDefPtr base;
     OperationList ops = p->operations();
-    OperationList::iterator oli;
 
     //
     // Define a mix-in module for the class.
@@ -296,7 +295,7 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
              << nl << "#"
              << nl << "# Operation signatures."
              << nl << "#";
-        for(oli = ops.begin(); oli != ops.end(); ++oli)
+        for(OperationList::iterator oli = ops.begin(); oli != ops.end(); ++oli)
         {
             string fixedOpName = fixIdent((*oli)->name(), IdentNormal);
 /* If AMI/AMD is ever implemented...
@@ -372,10 +371,9 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
     {
         bool prot = p->hasMetaData("protected");
         DataMemberList protectedMembers;
-        DataMemberList::iterator q;
 
         _out << sp << nl << "attr_accessor ";
-        for(q = members.begin(); q != members.end(); ++q)
+        for(DataMemberList::iterator q = members.begin(); q != members.end(); ++q)
         {
             if(q != members.begin())
             {
@@ -391,7 +389,7 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
         if(!protectedMembers.empty())
         {
             _out << nl << "protected ";
-            for(q = protectedMembers.begin(); q != protectedMembers.end(); ++q)
+            for(DataMemberList::iterator q = protectedMembers.begin(); q != protectedMembers.end(); ++q)
             {
                 if(q != protectedMembers.begin())
                 {
@@ -457,9 +455,8 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
             _out << ')';
             _out.inc();
 
-            MemberInfoList::iterator q;
             bool inheritsMembers = false;
-            for(q = allMembers.begin(); q != allMembers.end(); ++q)
+            for(MemberInfoList::iterator q = allMembers.begin(); q != allMembers.end(); ++q)
             {
                 if(q->inherited)
                 {
@@ -471,7 +468,7 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
             if(inheritsMembers)
             {
                 _out << nl << "super" << spar;
-                for(q = allMembers.begin(); q != allMembers.end(); ++q)
+                for(MemberInfoList::iterator q = allMembers.begin(); q != allMembers.end(); ++q)
                 {
                     if(q->inherited)
                     {
@@ -481,7 +478,7 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
                 _out << epar;
             }
 
-            for(q = allMembers.begin(); q != allMembers.end(); ++q)
+            for(MemberInfoList::iterator q = allMembers.begin(); q != allMembers.end(); ++q)
             {
                 if(!q->inherited)
                 {
@@ -509,7 +506,7 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
         {
             _out << nl << "include " << getAbsolute(*cli, IdentToUpper) << "Prx_mixin";
         }
-        for(oli = ops.begin(); oli != ops.end(); ++oli)
+        for(OperationList::iterator oli = ops.begin(); oli != ops.end(); ++oli)
         {
             string fixedOpName = fixIdent((*oli)->name(), IdentNormal);
             if(fixedOpName == "checkedCast" || fixedOpName == "uncheckedCast")
@@ -846,7 +843,6 @@ Slice::Ruby::CodeVisitor::visitExceptionStart(const ExceptionPtr& p)
     _out.inc();
 
     DataMemberList members = p->dataMembers();
-    DataMemberList::iterator dmli;
 
     //
     // initialize
@@ -909,7 +905,7 @@ Slice::Ruby::CodeVisitor::visitExceptionStart(const ExceptionPtr& p)
     if(!members.empty())
     {
         _out << sp << nl << "attr_accessor ";
-        for(dmli = members.begin(); dmli != members.end(); ++dmli)
+        for(DataMemberList::iterator dmli = members.begin(); dmli != members.end(); ++dmli)
         {
             if(dmli != members.begin())
             {
@@ -949,7 +945,7 @@ Slice::Ruby::CodeVisitor::visitExceptionStart(const ExceptionPtr& p)
     //
     // where MemberType is either a primitive type constant (T_INT, etc.) or the id of a constructed type.
     //
-    for(dmli = members.begin(); dmli != members.end(); ++dmli)
+    for(DataMemberList::iterator dmli = members.begin(); dmli != members.end(); ++dmli)
     {
         if(dmli != members.begin())
         {
@@ -980,7 +976,6 @@ Slice::Ruby::CodeVisitor::visitStructStart(const StructPtr& p)
     string scoped = p->scoped();
     string name = fixIdent(p->name(), IdentToUpper);
     MemberInfoList memberList;
-    MemberInfoList::iterator r;
 
     {
         DataMemberList members = p->dataMembers();
@@ -1004,7 +999,7 @@ Slice::Ruby::CodeVisitor::visitStructStart(const StructPtr& p)
         writeConstructorParams(memberList);
         _out << ")";
         _out.inc();
-        for(r = memberList.begin(); r != memberList.end(); ++r)
+        for(MemberInfoList::iterator r = memberList.begin(); r != memberList.end(); ++r)
         {
             _out << nl << '@' << r->fixedName << " = " << r->lowerName;
         }
@@ -1019,7 +1014,7 @@ Slice::Ruby::CodeVisitor::visitStructStart(const StructPtr& p)
     _out.inc();
     _out << nl << "_h = 0";
     int iter = 0;
-    for(r = memberList.begin(); r != memberList.end(); ++r)
+    for(MemberInfoList::iterator r = memberList.begin(); r != memberList.end(); ++r)
     {
         writeHash("@" + r->fixedName, r->dataMember->type(), iter);
     }
@@ -1034,7 +1029,7 @@ Slice::Ruby::CodeVisitor::visitStructStart(const StructPtr& p)
     _out.inc();
     _out << nl << "return false if";
     _out.inc();
-    for(r = memberList.begin(); r != memberList.end(); ++r)
+    for(MemberInfoList::iterator r = memberList.begin(); r != memberList.end(); ++r)
     {
         if(r != memberList.begin())
         {
@@ -1073,7 +1068,7 @@ Slice::Ruby::CodeVisitor::visitStructStart(const StructPtr& p)
     if(!memberList.empty())
     {
         _out << sp << nl << "attr_accessor ";
-        for(r = memberList.begin(); r != memberList.end(); ++r)
+        for(MemberInfoList::iterator r = memberList.begin(); r != memberList.end(); ++r)
         {
             if(r != memberList.begin())
             {
@@ -1102,7 +1097,7 @@ Slice::Ruby::CodeVisitor::visitStructStart(const StructPtr& p)
         _out.inc();
         _out << nl;
     }
-    for(r = memberList.begin(); r != memberList.end(); ++r)
+    for(MemberInfoList::iterator r = memberList.begin(); r != memberList.end(); ++r)
     {
         if(r != memberList.begin())
         {
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index fd3a269b98b..bf4d9b4c595 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -662,20 +662,18 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
     DataMemberList dataMembers = p->dataMembers();
     DataMemberList allDataMembers = p->allDataMembers();
     bool hasDefaultValues = p->hasDefaultValues();
-    DataMemberList::const_iterator q;
 
     vector<string> params;
     vector<string> allTypes;
     vector<string> allParamDecls;
     vector<string> baseParams;
-    vector<string>::const_iterator pi;
 
-    for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
         params.push_back(fixKwd((*q)->name()));
     }
 
-    for(q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+    for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
     {
         string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring);
         allTypes.push_back(typeName);
@@ -685,7 +683,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
     if(base)
     {
         DataMemberList baseDataMembers = base->allDataMembers();
-        for(q = baseDataMembers.begin(); q != baseDataMembers.end(); ++q)
+        for(DataMemberList::const_iterator q = baseDataMembers.begin(); q != baseDataMembers.end(); ++q)
         {
             baseParams.push_back("__ice_" + fixKwd((*q)->name()));
         }
@@ -786,7 +784,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
                 {
                     upcall += "__file, __line";
                 }
-                for(pi = baseParams.begin(); pi != baseParams.end(); ++pi)
+                for(vector<string>::const_iterator pi = baseParams.begin(); pi != baseParams.end(); ++pi)
                 {
                     if(p->isLocal() || pi != baseParams.begin())
                     {
@@ -802,7 +800,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
             }
             emitUpcall(base, upcall, p->isLocal());
         }
-        for(pi = params.begin(); pi != params.end(); ++pi)
+        for(vector<string>::const_iterator pi = params.begin(); pi != params.end(); ++pi)
         {
             if(pi != params.begin())
             {
@@ -1149,10 +1147,9 @@ Slice::Gen::TypesVisitor::visitStructStart(const StructPtr& p)
     //
     if(!dataMembers.empty() && (findMetaData(p->getMetaData()) == "%class" || p->hasDefaultValues()))
     {
-        DataMemberList::const_iterator q;
         vector<string> paramDecls;
         vector<string> types;
-        for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
             string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring);
             types.push_back(typeName);
@@ -1171,7 +1168,7 @@ Slice::Gen::TypesVisitor::visitStructStart(const StructPtr& p)
         H << fixKwd(p->name()) << spar << paramDecls << epar << " :";
         H.inc();
 
-        for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
             if(q != dataMembers.begin())
             {
@@ -1200,12 +1197,11 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
     string scope = fixKwd(p->scope());
 
     DataMemberList dataMembers = p->dataMembers();
-    DataMemberList::const_iterator q;
 
     vector<string> params;
     vector<string>::const_iterator pi;
 
-    for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
         params.push_back(fixKwd((*q)->name()));
     }
@@ -1222,7 +1218,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
     H << sb;
     H << nl << "return true;";
     H << eb;
-    for(pi = params.begin(); pi != params.end(); ++pi)
+    for(vector<string>::const_iterator pi = params.begin(); pi != params.end(); ++pi)
     {
         H << nl << "if(" << *pi << " != __rhs." << *pi << ')';
         H << sb;
@@ -1237,7 +1233,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
     H << sb;
     H << nl << "return false;";
     H << eb;
-    for(pi = params.begin(); pi != params.end(); ++pi)
+    for(vector<string>::const_iterator pi = params.begin(); pi != params.end(); ++pi)
     {
         H << nl << "if(" << *pi << " < __rhs." << *pi << ')';
         H << sb;
@@ -1284,7 +1280,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
 
         C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::BasicStream* __os) const";
         C << sb;
-        for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
             writeMarshalUnmarshalDataMember(C, *q, true);
         }
@@ -1292,7 +1288,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
 
         C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::BasicStream* __is)";
         C << sb;
-        for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
             writeMarshalUnmarshalDataMember(C, *q, false);
         }
@@ -1302,7 +1298,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         {
             C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(const ::Ice::OutputStreamPtr& __os) const";
             C << sb;
-            for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+            for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
             {
                 C << nl << "__os->write(" << fixKwd((*q)->name()) << ");";
             }
@@ -1310,7 +1306,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
 
             C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(const ::Ice::InputStreamPtr& __is)";
             C << sb;
-            for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+            for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
             {
                 C << nl << "__is->read(" << fixKwd((*q)->name()) << ");";
             }
@@ -3407,14 +3403,13 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
     vector<string> params;
     vector<string> allTypes;
     vector<string> allParamDecls;
-    DataMemberList::const_iterator q;
 
-    for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
         params.push_back(fixKwd((*q)->name()));
     }
 
-    for(q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+    for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
     {
         string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring);
         allTypes.push_back(typeName);
@@ -3635,8 +3630,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
         C << nl << "const ::std::string " << flatName << '[' << ids.size() << "] =";
         C << sb;
 
-        StringList::const_iterator r = ids.begin();
-        while(r != ids.end())
+        for(StringList::const_iterator r = ids.begin(); r != ids.end();)
         {
             C << nl << '"' << *r << '"';
             if(++r != ids.end())
@@ -3724,8 +3718,6 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
             allOpNames.sort();
             allOpNames.unique();
 
-            StringList::const_iterator q;
-
             H << sp;
             H << nl
               << "virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);";
@@ -3735,8 +3727,8 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
             C << nl << "{";
             C << nl << "const ::std::string " << flatName << "[] =";
             C << sb;
-            q = allOpNames.begin();
-            while(q != allOpNames.end())
+
+            for(StringList::const_iterator q = allOpNames.begin(); q != allOpNames.end();)
             {
                 C << nl << '"' << *q << '"';
                 if(++q != allOpNames.end())
@@ -3763,7 +3755,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
             C << nl << "switch(r.first - " << flatName << ')';
             C << sb;
             int i = 0;
-            for(q = allOpNames.begin(); q != allOpNames.end(); ++q)
+            for(StringList::const_iterator q = allOpNames.begin(); q != allOpNames.end(); ++q)
             {
                 C << nl << "case " << i++ << ':';
                 C << sb;
@@ -3803,8 +3795,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
                 C << nl << "const int " << opAttrFlatName << "[] = ";
                 C << sb;
 
-                q = allOpNames.begin();
-                while(q != allOpNames.end())
+                for(StringList::const_iterator q = allOpNames.begin(); q != allOpNames.end();)
                 {
                     int attributes = 0;
                     string opName = *q;
@@ -4058,9 +4049,8 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
     //
     bool inProtected = false;
     DataMemberList dataMembers = p->dataMembers();
-    DataMemberList::const_iterator q;
     bool prot = p->hasMetaData("protected");
-    for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
         if(prot || (*q)->hasMetaData("protected"))
         {
@@ -4806,8 +4796,7 @@ Slice::Gen::ObjectVisitor::emitVirtualBaseInitializers(const ClassDefPtr& p, boo
     }
 
     string upcall = "(";
-    DataMemberList::const_iterator q;
-    for(q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+    for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
     {
         if(q != allDataMembers.begin())
         {
@@ -4830,10 +4819,9 @@ Slice::Gen::ObjectVisitor::emitOneShotConstructor(const ClassDefPtr& p)
 
     if(!allDataMembers.empty())
     {
-        DataMemberList::const_iterator q;
         vector<string> allParamDecls;
 
-        for(q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+        for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
         {
             string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring);
             allParamDecls.push_back(typeName + " __ice_" + (*q)->name());
@@ -4866,7 +4854,7 @@ Slice::Gen::ObjectVisitor::emitOneShotConstructor(const ClassDefPtr& p)
         {
             H << nl;
         }
-        for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
             if(q != dataMembers.begin())
             {
@@ -5481,9 +5469,8 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
     H.inc();
 
     OperationList ops = p->operations();
-    OperationList::const_iterator r;
 
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = (*r);
         string opName = op->name();
@@ -5497,8 +5484,8 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
             H.useCurrentPosAsIndent();
             H << "const " << classScopedAMD << '_' << opName << "Ptr&";
             ParamDeclList paramList = op->parameters();
-            ParamDeclList::const_iterator q;
-            for(q = paramList.begin(); q != paramList.end(); ++q)
+            
+            for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
             {
                 if(!(*q)->isOutParam())
                 {
@@ -5516,7 +5503,7 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
             C << sp << nl << "void" << nl << scope << name << "I::" << opName << "_async(";
             C.useCurrentPosAsIndent();
             C << "const " << classScopedAMD << '_' << opName << "Ptr& " << opName << "CB";
-            for(q = paramList.begin(); q != paramList.end(); ++q)
+            for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
             {
                 if(!(*q)->isOutParam())
                 {
@@ -5530,7 +5517,7 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
             C << sb;
 
             string result = "r";
-            for(q = paramList.begin(); q != paramList.end(); ++q)
+            for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
             {
                 if((*q)->name() == result)
                 {
@@ -5542,7 +5529,7 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
             {
                 writeDecl(C, result, ret, op->getMetaData());
             }
-            for(q = paramList.begin(); q != paramList.end(); ++q)
+            for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
             {
                 if((*q)->isOutParam())
                 {
@@ -5555,7 +5542,7 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
             {
                 C << result;
             }
-            for(q = paramList.begin(); q != paramList.end(); ++q)
+            for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
             {
                 if((*q)->isOutParam())
                 {
@@ -5575,8 +5562,7 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
             H << sp << nl << "virtual " << retS << ' ' << fixKwd(opName) << '(';
             H.useCurrentPosAsIndent();
             ParamDeclList paramList = op->parameters();
-            ParamDeclList::const_iterator q;
-            for(q = paramList.begin(); q != paramList.end(); ++q)
+            for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
             {
                 if(q != paramList.begin())
                 {
@@ -5611,7 +5597,7 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
             C << sp << nl << retS << nl;
             C << scope.substr(2) << name << "I::" << fixKwd(opName) << '(';
             C.useCurrentPosAsIndent();
-            for(q = paramList.begin(); q != paramList.end(); ++q)
+            for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
             {
                 if(q != paramList.begin())
                 {
@@ -6016,8 +6002,7 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p)
         C << sp << nl << "void" << nl << "IceAsync" << classScopedAMD << '_' << name
             << "::ice_exception(const ::std::exception& ex)";
         C << sb;
-        ExceptionList::const_iterator r;
-        for(r = throws.begin(); r != throws.end(); ++r)
+        for(ExceptionList::const_iterator r = throws.begin(); r != throws.end(); ++r)
         {
             C << nl;
             if(r != throws.begin())
diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index e9d8a211d2d..f7c3c0dac99 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -138,23 +138,22 @@ compile(int argc, char* argv[])
 
     vector<string> cppArgs;
     vector<string> optargs = opts.argVec("D");
-    vector<string>::const_iterator i;
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-D" + *i);
     }
 
     optargs = opts.argVec("U");
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-U" + *i);
     }
 
     vector<string> includePaths;
     includePaths = opts.argVec("I");
-    for(i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
     {
-	cppArgs.push_back("-I" + Preprocessor::normalizeIncludePath(*i));
+        cppArgs.push_back("-I" + Preprocessor::normalizeIncludePath(*i));
     }
 
     bool preprocess = opts.isSet("E");
@@ -191,7 +190,7 @@ compile(int argc, char* argv[])
     IceUtil::CtrlCHandler ctrlCHandler;
     ctrlCHandler.setCallback(interruptedCallback);
 
-    for(i = args.begin(); i != args.end(); ++i)
+    for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
     {
         //
         // Ignore duplicates.
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index b1cf301d398..5cc7b404b07 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -130,9 +130,8 @@ void
 Slice::CsVisitor::writeMarshalUnmarshalParams(const ParamDeclList& params, const OperationPtr& op, bool marshal)
 {
     ParamDeclList optionals;
-    ParamDeclList::const_iterator pli;
 
-    for(pli = params.begin(); pli != params.end(); ++pli)
+    for(ParamDeclList::const_iterator pli = params.begin(); pli != params.end(); ++pli)
     {
         string param = fixId((*pli)->name());
         TypePtr type = (*pli)->type();
@@ -209,7 +208,7 @@ Slice::CsVisitor::writeMarshalUnmarshalParams(const ParamDeclList& params, const
     //
     bool checkReturnType = op && op->returnIsOptional();
 
-    for(pli = optionals.begin(); pli != optionals.end(); ++pli)
+    for(ParamDeclList::const_iterator pli = optionals.begin(); pli != optionals.end(); ++pli)
     {
         if(checkReturnType && op->returnTag() < (*pli)->tag())
         {
@@ -797,8 +796,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
         _out << sp << nl << "#region Operation dispatch";
     }
 
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = *r;
         ContainerPtr container = op->container();
@@ -819,11 +817,10 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
         TypePtr ret = op->returnType();
 
         ParamDeclList paramList = op->parameters();
-        ParamDeclList::const_iterator pli;
         ParamDeclList inParams;
         ParamDeclList outParams;
 
-        for(pli = paramList.begin(); pli != paramList.end(); ++pli)
+        for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
         {
             if((*pli)->isOutParam())
             {
@@ -842,7 +839,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
             // Unmarshal 'in' parameters.
             //
             _out << nl << "IceInternal.BasicStream is__ = inS__.startReadParams();";
-            for(pli = inParams.begin(); pli != inParams.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = inParams.begin(); pli != inParams.end(); ++pli)
             {
                 string param = fixId((*pli)->name());
                 string typeS = typeToString((*pli)->type(), (*pli)->optional());
@@ -899,7 +896,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
             throws.sort(Slice::DerivedToBaseCompare());
 #endif
 
-            for(pli = outParams.begin(); pli != outParams.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = outParams.begin(); pli != outParams.end(); ++pli)
             {
                 string typeS = typeToString((*pli)->type(), (*pli)->optional());
                 _out << nl << typeS << ' ' << fixId((*pli)->name()) << ";";
@@ -920,7 +917,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
                 _out << retS << " ret__ = ";
             }
             _out << "obj__." << fixId(opName, DotNet::ICloneable, true) << spar;
-            for(pli = inParams.begin(); pli != inParams.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = inParams.begin(); pli != inParams.end(); ++pli)
             {
                 string arg = fixId((*pli)->name());
                 if(isClassType((*pli)->type()))
@@ -929,7 +926,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
                 }
                 _out << arg;
             }
-            for(pli = outParams.begin(); pli != outParams.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = outParams.begin(); pli != outParams.end(); ++pli)
             {
                 _out << "out " + fixId((*pli)->name());
             }
@@ -957,8 +954,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
             if(!throws.empty())
             {
                 _out << eb;
-                ExceptionList::const_iterator t;
-                for(t = throws.begin(); t != throws.end(); ++t)
+                for(ExceptionList::const_iterator t = throws.begin(); t != throws.end(); ++t)
                 {
                     string exS = fixId((*t)->scoped());
                     _out << nl << "catch(" << exS << " ex__)";
@@ -995,7 +991,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
             {
                 _out << "cb__";
             }
-            for(pli = inParams.begin(); pli != inParams.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = inParams.begin(); pli != inParams.end(); ++pli)
             {
                 string arg = fixId((*pli)->name());
                 if(isClassType((*pli)->type()))
@@ -1035,12 +1031,9 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
         allOpNames.sort();
         allOpNames.unique();
 
-        StringList::const_iterator q;
-
         _out << sp << nl << "private static string[] all__ =";
         _out << sb;
-        q = allOpNames.begin();
-        while(q != allOpNames.end())
+        for(StringList::const_iterator q = allOpNames.begin(); q != allOpNames.end();)
         {
             _out << nl << '"' << *q << '"';
             if(++q != allOpNames.end())
@@ -1066,7 +1059,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
         _out << sp << nl << "switch(pos)";
         _out << sb;
         int i = 0;
-        for(q = allOpNames.begin(); q != allOpNames.end(); ++q)
+        for(StringList::const_iterator q = allOpNames.begin(); q != allOpNames.end(); ++q)
         {
             string opName = *q;
 
@@ -1134,7 +1127,6 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
     // Marshalling support
     //
     DataMemberList allClassMembers = p->allClassDataMembers();
-    DataMemberList::const_iterator d;
     DataMemberList members = p->dataMembers();
     DataMemberList optionalMembers = p->orderedOptionalDataMembers();
     DataMemberList classMembers = p->classDataMembers();
@@ -1177,14 +1169,14 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
     _out << nl << "public override void writeImpl__(IceInternal.BasicStream os__)";
     _out << sb;
     _out << nl << "os__.startWriteSlice(ice_staticId(), " << (!base ? "true" : "false") << ");";
-    for(d = members.begin(); d != members.end(); ++d)
+    for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
     {
         if(!(*d)->optional())
         {
             writeMarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true));
         }
     }
-    for(d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
+    for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
     {
         writeMarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true));
     }
@@ -1233,7 +1225,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
             _out << sb;
         }
         int memberCount = 0;
-        for(d = allClassMembers.begin(); d != allClassMembers.end(); ++d)
+        for(DataMemberList::const_iterator d = allClassMembers.begin(); d != allClassMembers.end(); ++d)
         {
             if(allClassMembers.size() > 1)
             {
@@ -1320,14 +1312,14 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
     _out << nl << "is__.startReadSlice();";
     int classMemberCount = static_cast<int>(allClassMembers.size() - classMembers.size());
     const bool needCustomPatcher = classMembers.size() > 1 || allClassMembers.size() > 1;
-    for(d = members.begin(); d != members.end(); ++d)
+    for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
     {
         if(!(*d)->optional())
         {
             writeUnmarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), needCustomPatcher, classMemberCount);
         }
     }
-    for(d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
+    for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
     {
         writeUnmarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), needCustomPatcher, classMemberCount);
     }
@@ -1370,14 +1362,14 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
         _out << nl << "public " << (base ? "override" : "virtual") << " void writeImpl__(Ice.OutputStream outS__)";
         _out << sb;
         _out << nl << "outS__.startSlice(ice_staticId(), " << (!base ? "true" : "false") << ");";
-        for(d = members.begin(); d != members.end(); ++d)
+        for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
         {
             if(!(*d)->optional())
             {
                 writeStreamMarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true));
             }
         }
-        for(d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
+        for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
         {
             writeStreamMarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true));
         }
@@ -1416,7 +1408,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
         _out << sb;
         _out << nl << "inS__.startSlice();";
         classMemberCount = static_cast<int>(allClassMembers.size() - classMembers.size());
-        for(d = members.begin(); d != members.end(); ++d)
+        for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
         {
             if(!(*d)->optional())
             {
@@ -1424,7 +1416,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
                                                classMemberCount);
             }
         }
-        for(d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
+        for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
         {
             writeStreamUnmarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), needCustomPatcher,
                                            classMemberCount);
@@ -1473,7 +1465,6 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
     }
 
     _out << sp << nl << "#endregion"; // Marshalling support
-
 }
 
 string
@@ -2121,8 +2112,7 @@ Slice::CsVisitor::writeDocComment(const ContainedPtr& p, const string& deprecate
 
     if(!remarksLines.empty())
     {
-        StringList::const_iterator i;
-        for(i = remarksLines.begin(); i != remarksLines.end(); ++i)
+        for(StringList::const_iterator i = remarksLines.begin(); i != remarksLines.end(); ++i)
         {
             //
             // The first param, returns, or exception tag ends the description.
@@ -2187,14 +2177,13 @@ Slice::CsVisitor::writeDocCommentOp(const OperationPtr& p)
     //
     // Output the leading comment block up until the first <param>, <returns>, or <exception> tag.
     //
-    StringList::const_iterator i;
-    for(i = summaryLines.begin(); i != summaryLines.end(); ++i)
+    for(StringList::const_iterator i = summaryLines.begin(); i != summaryLines.end(); ++i)
     {
         _out << nl << "/// " << *i;
     }
 
     bool done = false;
-    for(i = remarksLines.begin(); i != remarksLines.end() && !done; ++i)
+    for(StringList::const_iterator i = remarksLines.begin(); i != remarksLines.end() && !done; ++i)
     {
         if(i->find("<param") != string::npos ||
            i->find("<returns") != string::npos ||
@@ -2295,14 +2284,13 @@ Slice::CsVisitor::writeDocCommentAsync(const OperationPtr& p, ParamDir paramType
         // Output the leading comment block up until the first tag.
         //
         _out << nl << "/// <summary>";
-        StringList::const_iterator i;
-        for(i = summaryLines.begin(); i != summaryLines.end(); ++i)
+        for(StringList::const_iterator i = summaryLines.begin(); i != summaryLines.end(); ++i)
         {
             _out << nl << "/// " << *i;
         }
 
         bool done = false;
-        for(i = remarksLines.begin(); i != remarksLines.end() && !done; ++i)
+        for(StringList::const_iterator i = remarksLines.begin(); i != remarksLines.end() && !done; ++i)
         {
             string::size_type pos = i->find('<');
             done = true;
@@ -2880,7 +2868,6 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
     DataMemberList allDataMembers = p->allDataMembers();
     ClassList bases = p->bases();
     bool hasBaseClass = !bases.empty() && !bases.front()->isInterface();
-    DataMemberList::const_iterator d;
 
     if(!p->isInterface())
     {
@@ -2917,7 +2904,7 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
             emitGeneratedCodeAttribute();
             _out << nl << "public " << name << spar;
             vector<string> paramDecl;
-            for(d = allDataMembers.begin(); d != allDataMembers.end(); ++d)
+            for(DataMemberList::const_iterator d = allDataMembers.begin(); d != allDataMembers.end(); ++d)
             {
                 string memberName = fixId((*d)->name());
                 string memberType = typeToString((*d)->type(), (*d)->optional());
@@ -2929,14 +2916,14 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
                 _out << " : base" << spar;
                 vector<string> baseParamNames;
                 DataMemberList baseDataMembers = bases.front()->allDataMembers();
-                for(d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
+                for(DataMemberList::const_iterator d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
                 {
                     baseParamNames.push_back(fixId((*d)->name()));
                 }
                 _out << baseParamNames << epar;
             }
             _out << sb;
-            for(d = dataMembers.begin(); d != dataMembers.end(); ++d)
+            for(DataMemberList::const_iterator d = dataMembers.begin(); d != dataMembers.end(); ++d)
             {
                 _out << nl << "this.";
                 const string paramName = fixId((*d)->name());
@@ -3246,10 +3233,9 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 
     DataMemberList allDataMembers = p->allDataMembers();
     DataMemberList dataMembers = p->dataMembers();
-    DataMemberList::const_iterator q;
 
     vector<string> allParamDecl;
-    for(q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+    for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
     {
         string memberName = fixId((*q)->name());
         string memberType = typeToString((*q)->type(), (*q)->optional());
@@ -3257,13 +3243,13 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
     }
 
     vector<string> paramNames;
-    for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
         paramNames.push_back(fixId((*q)->name()));
     }
 
     vector<string> paramDecl;
-    for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
         string memberName = fixId((*q)->name());
         string memberType = typeToString((*q)->type(), (*q)->optional());
@@ -3276,7 +3262,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
     if(p->base())
     {
         baseDataMembers = p->base()->allDataMembers();
-        for(q = baseDataMembers.begin(); q != baseDataMembers.end(); ++q)
+        for(DataMemberList::const_iterator q = baseDataMembers.begin(); q != baseDataMembers.end(); ++q)
         {
             baseParamNames.push_back(fixId((*q)->name()));
         }
@@ -3325,7 +3311,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         {
             _out << sp << nl << "private void initDM__" << spar << paramDecl << epar;
             _out << sb;
-            for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+            for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
             {
                 string name = fixId((*q)->name(), DotNet::Exception, false);
                 _out << nl << "this." << name << " = " << fixId((*q)->name()) << ';';
@@ -3474,7 +3460,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         _out << nl << "public override void writeImpl__(IceInternal.BasicStream os__)";
         _out << sb;
         _out << nl << "os__.startWriteSlice(\"" << scoped << "\", " << (!base ? "true" : "false") << ");";
-        for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
             writeMarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception));
         }
@@ -3521,7 +3507,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
                 _out << sb;
             }
             int memberCount = 0;
-            for(q = allClassMembers.begin(); q != allClassMembers.end(); ++q)
+            for(DataMemberList::const_iterator q = allClassMembers.begin(); q != allClassMembers.end(); ++q)
             {
                 if(allClassMembers.size() > 1)
                 {
@@ -3603,7 +3589,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         DataMemberList classMembers = p->classDataMembers();
         int classMemberCount = static_cast<int>(allClassMembers.size() - classMembers.size());
         const bool needCustomPatcher = classMembers.size() > 1 || allClassMembers.size() > 1;
-        for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
             writeUnmarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception), needCustomPatcher, classMemberCount);
         }
@@ -3637,7 +3623,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
             _out << nl << "public " << (base ? "override" : "virtual") << " void writeImpl__(Ice.OutputStream outS__)";
             _out << sb;
             _out << nl << "outS__.startSlice(\"" << scoped << "\", " << (!base ? "true" : "false") << ");";
-            for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+            for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
             {
                 writeStreamMarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception));
             }
@@ -3670,7 +3656,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
             _out << sb;
             _out << nl << "inS__.startSlice();";
             classMemberCount = static_cast<int>(allClassMembers.size() - classMembers.size());
-            for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+            for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
             {
                 writeStreamUnmarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception), needCustomPatcher,
                                                classMemberCount);
@@ -3772,7 +3758,6 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
 
     DataMemberList classMembers = p->classDataMembers();
     DataMemberList dataMembers = p->dataMembers();
-    DataMemberList::const_iterator q;
 
     const bool propertyMapping = p->hasMetaData("clr:property");
 
@@ -3802,7 +3787,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
     emitGeneratedCodeAttribute();
     _out << nl << "public " << name << spar;
     vector<string> paramDecl;
-    for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
         string memberName = fixId((*q)->name(), isClass ? DotNet::ICloneable : 0);
         string memberType = typeToString((*q)->type());
@@ -3810,7 +3795,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
     }
     _out << paramDecl << epar;
     _out << sb;
-    for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
         string paramName = fixId((*q)->name(), isClass ? DotNet::ICloneable : 0);
         _out << nl << "this.";
@@ -3916,7 +3901,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         emitGeneratedCodeAttribute();
         _out << nl << "public void write__(IceInternal.BasicStream os__)";
         _out << sb;
-        for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
             writeMarshalDataMember(*q, fixId(*q, isClass ? DotNet::ICloneable : 0));
         }
@@ -3952,7 +3937,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
                 _out << sb;
             }
             int memberCount = 0;
-            for(q = classMembers.begin(); q != classMembers.end(); ++q)
+            for(DataMemberList::const_iterator q = classMembers.begin(); q != classMembers.end(); ++q)
             {
                 if(classMembers.size() > 1)
                 {
@@ -4002,7 +3987,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         _out << sb;
         int classMemberCount = 0;
         const bool needCustomPatcher = classMembers.size() > 1;
-        for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
             writeUnmarshalDataMember(*q, fixId(*q, isClass ? DotNet::ICloneable : 0), needCustomPatcher,
                                      classMemberCount);
@@ -4015,7 +4000,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
             emitGeneratedCodeAttribute();
             _out << nl << "public void ice_write(Ice.OutputStream outS__)";
             _out << sb;
-            for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+            for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
             {
                 writeStreamMarshalDataMember(*q, fixId(*q, isClass ? DotNet::ICloneable : 0));
             }
@@ -4026,7 +4011,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
             _out << nl << "public void ice_read(Ice.InputStream inS__)";
             _out << sb;
             classMemberCount = 0;
-            for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
+            for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
             {
                 writeStreamUnmarshalDataMember(*q, fixId(*q, isClass ? DotNet::ICloneable : 0), needCustomPatcher,
                                                classMemberCount);
@@ -4694,8 +4679,7 @@ Slice::Gen::OpsVisitor::writeOperations(const ClassDefPtr& p, bool noCurrent)
     _out << sb;
 
     OperationList ops = p->operations();
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = *r;
         bool amd = !p->isLocal() && (p->hasMetaData("amd") || op->hasMetaData("amd"));
@@ -4795,8 +4779,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
         _out << sp << nl << "#region Synchronous operations";
     }
 
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = *r;
         string opName = fixId(op->name(), DotNet::ICloneable, true);
@@ -4895,7 +4878,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
     // New AMI mapping.
     //
     _out << sp << nl << "#region Asynchronous operations";
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = *r;
 
@@ -4906,11 +4889,10 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
         string opName = op->name();
 
         ParamDeclList paramList = op->parameters();
-        ParamDeclList::const_iterator pli;
         ParamDeclList inParams;
         ParamDeclList outParams;
 
-        for(pli = paramList.begin(); pli != paramList.end(); ++pli)
+        for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
         {
             if((*pli)->isOutParam())
             {
@@ -5022,7 +5004,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
                     _out << nl << retS << " ret__;";
                 }
                 _out << nl << "IceInternal.BasicStream is__ = outAsync__.startReadParams__();";
-                for(pli = outParams.begin(); pli != outParams.end(); ++pli)
+                for(ParamDeclList::const_iterator pli = outParams.begin(); pli != outParams.end(); ++pli)
                 {
                     string param = fixId((*pli)->name());
                     string typeS = typeToString((*pli)->type(), (*pli)->optional());
@@ -5142,7 +5124,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
             _out << sp << nl << "private void " << op->name()
                  << "_completed__(Ice.AsyncResult r__, " << delType << " cb__, Ice.ExceptionCallback excb__)";
             _out << sb;
-            for(pli = outParams.begin(); pli != outParams.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = outParams.begin(); pli != outParams.end(); ++pli)
             {
                 _out << nl << typeToString((*pli)->type(), (*pli)->optional()) << ' ' << fixId((*pli)->name()) << ';';
             }
@@ -5158,7 +5140,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
                 _out << "ret__ = ";
             }
             _out << "end_" << op->name() << spar;
-            for(pli = outParams.begin(); pli != outParams.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = outParams.begin(); pli != outParams.end(); ++pli)
             {
                 _out << "out " + fixId((*pli)->name());
             }
@@ -5179,7 +5161,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
             {
                 _out << "ret__";
             }
-            for(pli = outParams.begin(); pli != outParams.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = outParams.begin(); pli != outParams.end(); ++pli)
             {
                 _out << fixId((*pli)->name());
             }
@@ -5880,9 +5862,7 @@ Slice::Gen::DelegateVisitor::visitClassDefStart(const ClassDefPtr& p)
     _out << sb;
 
     OperationList ops = p->operations();
-
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = *r;
         string opName = fixId(op->name(), DotNet::ICloneable, true);
@@ -5945,9 +5925,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
     _out << sb;
 
     OperationList ops = p->allOperations();
-
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = *r;
         string opName = fixId(op->name(), DotNet::ICloneable, true);
@@ -5955,11 +5933,10 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
         string retS = typeToString(ret, op->returnIsOptional());
 
         ParamDeclList paramList = op->parameters();
-        ParamDeclList::const_iterator pli;
         ParamDeclList inParams;
         ParamDeclList outParams;
 
-        for(pli = paramList.begin(); pli != paramList.end(); ++pli)
+        for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
         {
             if((*pli)->isOutParam())
             {
@@ -6047,7 +6024,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
         if(ret || !outParams.empty())
         {
             _out << nl << "IceInternal.BasicStream is__ = og__.startReadParams();";
-            for(pli = outParams.begin(); pli != outParams.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = outParams.begin(); pli != outParams.end(); ++pli)
             {
                 const bool isClass = isClassType((*pli)->type());
 
@@ -6182,8 +6159,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p)
 
     OperationList ops = p->allOperations();
 
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = *r;
         string opName = fixId(op->name(), DotNet::ICloneable, true);
@@ -6574,10 +6550,9 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
         TypePtr ret = p->returnType();
 
         ParamDeclList paramList = p->parameters();
-        ParamDeclList::const_iterator pli;
         ParamDeclList outParams;
 
-        for(pli = paramList.begin(); pli != paramList.end(); ++pli)
+        for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
         {
             if((*pli)->isOutParam())
             {
@@ -6644,8 +6619,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
             _out << sb;
             _out << nl << "throw ex;";
             _out << eb;
-            ExceptionList::const_iterator r;
-            for(r = throws.begin(); r != throws.end(); ++r)
+            for(ExceptionList::const_iterator r = throws.begin(); r != throws.end(); ++r)
             {
                 string exS = fixId((*r)->scoped());
                 _out << nl << "catch(" << exS << " ex__)";
@@ -6759,8 +6733,7 @@ Slice::Gen::TieVisitor::visitClassDefStart(const ClassDefPtr& p)
     _out << eb;
 
     OperationList ops = p->operations();
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
     {
         bool hasAMD = p->hasMetaData("amd") || (*r)->hasMetaData("amd");
         string opName = hasAMD ? (*r)->name() + "_async" : fixId((*r)->name(), DotNet::ICloneable, true);
@@ -6817,8 +6790,7 @@ void
 Slice::Gen::TieVisitor::writeInheritedOperationsWithOpNames(const ClassDefPtr& p, NameSet& opNames)
 {
     OperationList ops = p->operations();
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
     {
         bool hasAMD = p->hasMetaData("amd") || (*r)->hasMetaData("amd");
         string opName = hasAMD ? (*r)->name() + "_async" : fixId((*r)->name(), DotNet::ICloneable, true);
@@ -6888,7 +6860,6 @@ Slice::Gen::BaseImplVisitor::writeOperation(const OperationPtr& op, bool comment
         _out << sp << nl;
     }
 
-    ParamDeclList::const_iterator i;
     if(!cl->isLocal() && (cl->hasMetaData("amd") || op->hasMetaData("amd")))
     {
         ParamDeclList::const_iterator i;
@@ -6912,7 +6883,7 @@ Slice::Gen::BaseImplVisitor::writeOperation(const OperationPtr& op, bool comment
         {
             _out << nl << typeToString(ret) << " ret__ = " << writeValue(ret) << ';';
         }
-        for(i = params.begin(); i != params.end(); ++i)
+        for(ParamDeclList::const_iterator i = params.begin(); i != params.end(); ++i)
         {
             if((*i)->isOutParam())
             {
@@ -6926,7 +6897,7 @@ Slice::Gen::BaseImplVisitor::writeOperation(const OperationPtr& op, bool comment
         {
             _out << "ret__";
         }
-        for(i = params.begin(); i != params.end(); ++i)
+        for(ParamDeclList::const_iterator i = params.begin(); i != params.end(); ++i)
         {
             if((*i)->isOutParam())
             {
@@ -7118,8 +7089,7 @@ Slice::Gen::ImplTieVisitor::visitClassDefStart(const ClassDefPtr& p)
         baseOps.sort();
     }
 
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
     {
         if(inheritImpl && binary_search(baseOps.begin(), baseOps.end(), *r))
         {
diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp
index 8539e303244..051fa4d1539 100644
--- a/cpp/src/slice2cs/Main.cpp
+++ b/cpp/src/slice2cs/Main.cpp
@@ -126,20 +126,19 @@ compile(int argc, char* argv[])
 
     vector<string> cppArgs;
     vector<string> optargs = opts.argVec("D");
-    vector<string>::const_iterator i;
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-D" + *i);
     }
 
     optargs = opts.argVec("U");
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-U" + *i);
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
     {
         cppArgs.push_back("-I" + Preprocessor::normalizeIncludePath(*i));
     }
@@ -185,7 +184,7 @@ compile(int argc, char* argv[])
     IceUtil::CtrlCHandler ctrlCHandler;
     ctrlCHandler.setCallback(interruptedCallback);
 
-    for(i = args.begin(); i != args.end(); ++i)
+    for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
     {
         //
         // Ignore duplicates.
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index bc855817352..6b9877582cc 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -433,8 +433,8 @@ writeDictWithIndicesH(const string& name, const Dict& dict,
         + name + "KeyCodec, " + compare + " >";
 
     vector<string> capitalizedMembers;
-    size_t i;
-    for(i = 0; i < dict.indices.size(); ++i)
+
+    for(size_t i = 0; i < dict.indices.size(); ++i)
     {
         const string& member = dict.indices[i].member;
         if(!member.empty())
@@ -474,7 +474,7 @@ writeDictWithIndicesH(const string& name, const Dict& dict,
     // Nested index classes
     //
 
-    for(i = 0; i < capitalizedMembers.size(); ++i)
+    for(size_t i = 0; i < capitalizedMembers.size(); ++i)
     {
         string className = capitalizedMembers[i] + "Index";
 
@@ -537,7 +537,7 @@ writeDictWithIndicesH(const string& name, const Dict& dict,
     H << nl << "Freeze::KeyCompareBasePtr __keyCompare = "
       << "new Freeze::KeyCompare" << keyCompareParams << "(__compare, this->_communicator, this->_encoding);";
     H << nl << "std::vector<Freeze::MapIndexBasePtr> __indices;";
-    for(i = 0; i < capitalizedMembers.size(); ++i)
+    for(size_t i = 0; i < capitalizedMembers.size(); ++i)
     {
         string indexName = dict.indices[i].member;
         if(indexName.empty())
@@ -568,7 +568,7 @@ writeDictWithIndicesH(const string& name, const Dict& dict,
     //
     // Find, begin, lowerBound, upperBound, equalRange and count functions
     //
-    for(i = 0; i < capitalizedMembers.size(); ++i)
+    for(size_t i = 0; i < capitalizedMembers.size(); ++i)
     {
         H << sp;
         H << nl << "iterator findBy" << capitalizedMembers[i]
@@ -627,8 +627,7 @@ writeDictWithIndicesC(const string& name, const string& absolute, const Dict& di
         + name + "KeyCodec, " + compare + " >";
     
     vector<string> capitalizedMembers;
-    size_t i;
-    for(i = 0; i < dict.indices.size(); ++i)
+    for(size_t i = 0; i < dict.indices.size(); ++i)
     {
         const string& member = dict.indices[i].member;
         if(!member.empty())
@@ -647,7 +646,7 @@ writeDictWithIndicesC(const string& name, const string& absolute, const Dict& di
     //
     // Nested index classes
     //
-    for(i = 0; i < capitalizedMembers.size(); ++i)
+    for(size_t i = 0; i < capitalizedMembers.size(); ++i)
     {
         string className = capitalizedMembers[i] + "Index";
 
@@ -779,7 +778,7 @@ writeDictWithIndicesC(const string& name, const string& absolute, const Dict& di
     C << nl << "Freeze::KeyCompareBasePtr __keyCompare = "
       << "new Freeze::KeyCompare" << keyCompareParams << "(__compare, _communicator, _encoding);";
     C << nl << "std::vector<Freeze::MapIndexBasePtr> __indices;";
-    for(i = 0; i < capitalizedMembers.size(); ++i)
+    for(size_t i = 0; i < capitalizedMembers.size(); ++i)
     {
         string indexName = dict.indices[i].member;
         if(indexName.empty())
@@ -807,7 +806,7 @@ writeDictWithIndicesC(const string& name, const string& absolute, const Dict& di
       << "new Freeze::KeyCompare" << keyCompareParams << "(__compare, __connection->getCommunicator()"
       <<", __connection->getEncoding());";
     C << nl << "std::vector<Freeze::MapIndexBasePtr> __indices;";
-    for(i = 0; i < capitalizedMembers.size(); ++i)
+    for(size_t i = 0; i < capitalizedMembers.size(); ++i)
     {
         string indexName = dict.indices[i].member;
         if(indexName.empty())
@@ -826,7 +825,7 @@ writeDictWithIndicesC(const string& name, const string& absolute, const Dict& di
     //
     // Find and count functions
     //
-    for(i = 0; i < capitalizedMembers.size(); ++i)
+    for(size_t i = 0; i < capitalizedMembers.size(); ++i)
     {   
         string indexClassName = capitalizedMembers[i] + "Index";
         
@@ -997,9 +996,7 @@ writeDict(const string& n, const UnitPtr& u, const Dict& dict, Output& H, Output
     }
     TypePtr valueType = valueTypes.front();
     
-    vector<string>::const_iterator q;
-    
-    for(q = scope.begin(); q != scope.end(); ++q)
+    for(vector<string>::const_iterator q = scope.begin(); q != scope.end(); ++q)
     {
         H << sp;
         H << nl << "namespace " << *q << nl << '{';
@@ -1146,7 +1143,7 @@ writeDict(const string& n, const UnitPtr& u, const Dict& dict, Output& H, Output
     }
 
 
-    for(q = scope.begin(); q != scope.end(); ++q)
+    for(vector<string>::const_iterator q = scope.begin(); q != scope.end(); ++q)
     {
         H << sp;
         H << nl << '}';
@@ -1354,10 +1351,8 @@ writeIndex(const string& n, const UnitPtr& u, const Index& index, Output& H, Out
             throw os.str();
         }
     }
-   
-    vector<string>::const_iterator q;
     
-    for(q = scope.begin(); q != scope.end(); ++q)
+    for(vector<string>::const_iterator q = scope.begin(); q != scope.end(); ++q)
     {
         H << sp;
         H << nl << "namespace " << *q << nl << '{';
@@ -1365,7 +1360,7 @@ writeIndex(const string& n, const UnitPtr& u, const Index& index, Output& H, Out
 
     writeIndexH(inputTypeToString(dataMember->type(), false), name, H, dllExport);
     
-    for(q = scope.begin(); q != scope.end(); ++q)
+    for(vector<string>::const_iterator q = scope.begin(); q != scope.end(); ++q)
     {
         H << sp;
         H << nl << '}';
@@ -1470,11 +1465,9 @@ gen(const string& name, const UnitPtr& u, const vector<string>& includePaths, co
         H << "\n#include <Freeze/Index.h>";
     }
 
+    for(StringList::const_iterator p = includes.begin(); p != includes.end(); ++p)
     {
-        for(StringList::const_iterator p = includes.begin(); p != includes.end(); ++p)
-        {
-            H << "\n#include <" << changeInclude(*p, includePaths) << "." + headerExtension + ">";
-        }
+        H << "\n#include <" << changeInclude(*p, includePaths) << "." + headerExtension + ">";
     }
 
     CPP << "\n#include <Ice/BasicStream.h>";
@@ -1495,16 +1488,14 @@ gen(const string& name, const UnitPtr& u, const vector<string>& includePaths, co
         dllExport += " ";
     }
 
+    for(vector<Dict>::const_iterator p = dicts.begin(); p != dicts.end(); ++p)
     {
-        for(vector<Dict>::const_iterator p = dicts.begin(); p != dicts.end(); ++p)
-        {
-            writeDict(name, u, *p, H, CPP, dllExport);
-        } 
+        writeDict(name, u, *p, H, CPP, dllExport);
+    } 
 
-        for(vector<Index>::const_iterator q = indices.begin(); q != indices.end(); ++q)
-        {
-            writeIndex(name, u, *q, H, CPP, dllExport);
-        }
+    for(vector<Index>::const_iterator q = indices.begin(); q != indices.end(); ++q)
+    {
+        writeIndex(name, u, *q, H, CPP, dllExport);
     }
 
     H << "\n\n#endif\n";
@@ -1567,30 +1558,28 @@ compile(int argc, char* argv[])
     vector<string> cppArgs;
     vector<string> extraHeaders = opts.argVec("add-header");
     vector<string> optargs = opts.argVec("D");
-    vector<string>::const_iterator i;
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-D" + *i);
     }
 
     optargs = opts.argVec("U");
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-U" + *i);
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
     {
         cppArgs.push_back("-I" + Preprocessor::normalizeIncludePath(*i));
     }
 
     // Convert include paths to full paths.
+    for(vector<string>::iterator p = includePaths.begin(); p != includePaths.end(); ++p)
     {
-        for(vector<string>::iterator p = includePaths.begin(); p != includePaths.end(); ++p)
-        {
-            *p = fullPath(*p);
-        }
+        *p = fullPath(*p);
     }
 
     bool preprocess= opts.isSet("E");
@@ -1601,7 +1590,7 @@ compile(int argc, char* argv[])
 
     vector<Dict> dicts;
     optargs = opts.argVec("dict");
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         string s = IceUtilInternal::removeWhitespace(*i);
         
@@ -1733,7 +1722,7 @@ compile(int argc, char* argv[])
     
     vector<Index> indices;
     optargs = opts.argVec("index");
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         string s = IceUtilInternal::removeWhitespace(*i);
         
@@ -1800,7 +1789,7 @@ compile(int argc, char* argv[])
     }
 
     optargs = opts.argVec("dict-index");
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         string s = IceUtilInternal::removeWhitespace(*i);
         
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
index ff267b46e99..bd639993f40 100755
--- a/cpp/src/slice2freezej/Main.cpp
+++ b/cpp/src/slice2freezej/Main.cpp
@@ -302,9 +302,8 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
     vector<string> members;
     vector<string> capitalizedMembers;
     vector<string> indexNames;
-    size_t i;
 
-    for(i = 0; i < dict.indices.size(); ++i)
+    for(size_t i = 0; i < dict.indices.size(); ++i)
     {
         const DictIndex& index = dict.indices[i];
         const string& member = index.member;
@@ -463,13 +462,13 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
         out << sp;
         out << nl << "/**"
             << nl << " * This constructor accepts a comparator for each index key.";
-        for(i = 0; i < dict.indices.size(); ++i)
+        for(size_t i = 0; i < dict.indices.size(); ++i)
         {
             out << nl << " * @param " << members[i] << "Comparator Comparator for <code>" << members[i] << "</code>.";
         }
         out << nl << " */";
         out << nl << "public" << nl << "IndexComparators(";
-        for(i = 0; i < dict.indices.size(); ++i)
+        for(size_t i = 0; i < dict.indices.size(); ++i)
         {
             if(i > 0)
             {
@@ -480,14 +479,14 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
         }
         out << ")";
         out << sb;
-        for(i = 0; i < dict.indices.size(); ++i)
+        for(size_t i = 0; i < dict.indices.size(); ++i)
         {
             out << nl << "this." << members[i] << "Comparator = " << members[i] << "Comparator;";
         }
         out << eb;
 
         out << sp;
-        for(i = 0; i < dict.indices.size(); ++i)
+        for(size_t i = 0; i < dict.indices.size(); ++i)
         {
             out << nl << "/** Comparator for <code>" << members[i] << "</code>. */";
             out << nl << "public java.util.Comparator<" << typeToObjectString(indexTypes[i]) << "> " << members[i]
@@ -513,7 +512,7 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
     if(dict.indices.size() > 0)
     {
         out << nl << "_indices = new Freeze.MapIndex[" << dict.indices.size() << "];";
-        for(i = 0; i < dict.indices.size(); ++i)
+        for(size_t i = 0; i < dict.indices.size(); ++i)
         {
             out << nl << "_" << members[i] << "Index = new " << capitalizedMembers[i] << "Index(\"" << indexNames[i]
                 << "\", __indexComparators == null ? null : __indexComparators." << members[i] << "Comparator);";
@@ -677,7 +676,7 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
     //
     // Index methods
     //
-    for(i = 0; i < capitalizedMembers.size(); ++i)
+    for(size_t i = 0; i < capitalizedMembers.size(); ++i)
     {
         string indexClassName = capitalizedMembers[i] + "Index";
         string indexTypeS = typeToString(indexTypes[i], TypeModeIn);
@@ -870,7 +869,7 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
     //
     // Top-level encode/decode
     //
-    for(i = 0; i < 2; i++)
+    for(size_t i = 0; i < 2; i++)
     {
         string keyValue;
         TypePtr type;
@@ -1035,7 +1034,7 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
     //
     // Inner index classes
     //
-    for(i = 0; i < capitalizedMembers.size(); ++i)
+    for(size_t i = 0; i < capitalizedMembers.size(); ++i)
     {
         string indexClassName = capitalizedMembers[i] + "Index";
         string indexKeyTypeS = typeToObjectString(indexTypes[i]);
@@ -1269,7 +1268,7 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
     {
         out << sp << nl << "private Freeze.MapIndex[] _indices;";
     }
-    for(i = 0; i < dict.indices.size(); ++i)
+    for(size_t i = 0; i < dict.indices.size(); ++i)
     {
         out << nl << "private " << capitalizedMembers[i] << "Index _" << members[i] << "Index;";
     }
@@ -1523,20 +1522,19 @@ compile(int argc, char* argv[])
 
     vector<string> cppArgs;
     vector<string> optargs = opts.argVec("D");
-    vector<string>::const_iterator i;
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-D" + *i);
     }
 
     optargs = opts.argVec("U");
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-U" + *i);
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
     {
         cppArgs.push_back("-I" + Preprocessor::normalizeIncludePath(*i));
     }
@@ -1547,7 +1545,7 @@ compile(int argc, char* argv[])
 
     vector<Dict> dicts;
     optargs = opts.argVec("dict");
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         string s = IceUtilInternal::removeWhitespace(*i);
 
@@ -1594,7 +1592,7 @@ compile(int argc, char* argv[])
 
     vector<Index> indices;
     optargs = opts.argVec("index");
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         string s = IceUtilInternal::removeWhitespace(*i);
 
diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp
index 861cbafb0bb..4d4dba8d0e9 100755
--- a/cpp/src/slice2html/Main.cpp
+++ b/cpp/src/slice2html/Main.cpp
@@ -134,20 +134,19 @@ compile(int argc, char* argv[])
 
     vector<string> cppArgs;
     vector<string> optargs = opts.argVec("D");
-    vector<string>::const_iterator i;
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-D" + *i);
     }
 
     optargs = opts.argVec("U");
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-U" + *i);
     }
 
     optargs = opts.argVec("I");
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-I" + Preprocessor::normalizeIncludePath(*i));
     }
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 6c59d6b218f..33fb8374ec2 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -319,9 +319,7 @@ Slice::JavaVisitor::writeMarshalUnmarshalParams(Output& out, const string& packa
                                                 bool dispatch)
 {
     ParamDeclList optionals;
-    ParamDeclList::const_iterator pli;
-
-    for(pli = params.begin(); pli != params.end(); ++pli)
+    for(ParamDeclList::const_iterator pli = params.begin(); pli != params.end(); ++pli)
     {
         if((*pli)->optional())
         {
@@ -397,7 +395,7 @@ Slice::JavaVisitor::writeMarshalUnmarshalParams(Output& out, const string& packa
     //
     bool checkReturnType = op && op->returnIsOptional();
 
-    for(pli = optionals.begin(); pli != optionals.end(); ++pli)
+    for(ParamDeclList::const_iterator pli = optionals.begin(); pli != optionals.end(); ++pli)
     {
         if(checkReturnType && op->returnTag() < (*pli)->tag())
         {
@@ -429,9 +427,8 @@ Slice::JavaVisitor::writeThrowsClause(const string& package, const ExceptionList
         out.inc();
         out << nl << "throws ";
         out.useCurrentPosAsIndent();
-        ExceptionList::const_iterator r;
         int count = 0;
-        for(r = throws.begin(); r != throws.end(); ++r)
+        for(ExceptionList::const_iterator r = throws.begin(); r != throws.end(); ++r)
         {
             if(count > 0)
             {
@@ -454,8 +451,7 @@ Slice::JavaVisitor::writeDelegateThrowsClause(const string& package, const Excep
     out.useCurrentPosAsIndent();
     out << "IceInternal.LocalExceptionWrapper";
 
-    ExceptionList::const_iterator r;
-    for(r = throws.begin(); r != throws.end(); ++r)
+    for(ExceptionList::const_iterator r = throws.begin(); r != throws.end(); ++r)
     {
         out << "," << nl;
         out << getAbsolute(*r, package);
@@ -730,15 +726,12 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
     out << sp << nl << "public static final String[] __ids =";
     out << sb;
 
+    for(StringList::const_iterator q = ids.begin(); q != ids.end();)
     {
-        StringList::const_iterator q = ids.begin();
-        while(q != ids.end())
+        out << nl << '"' << *q << '"';
+        if(++q != ids.end())
         {
-            out << nl << '"' << *q << '"';
-            if(++q != ids.end())
-            {
-                out << ',';
-            }
+            out << ',';
         }
     }
     out << eb << ';';
@@ -779,12 +772,11 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
     out << eb;
 
     OperationList ops = p->allOperations();
-    OperationList::const_iterator r;
 
     //
     // Write the "no Current" implementation of each operation.
     //
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = *r;
         string opName = op->name();
@@ -907,7 +899,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
     // for inherited operations.
     //
     ops = p->operations();
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = *r;
         StringList opMetaData = op->getMetaData();
@@ -936,8 +928,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
             ParamDeclList inParams;
             ParamDeclList outParams;
             ParamDeclList paramList = op->parameters();
-            ParamDeclList::const_iterator pli;
-            for(pli = paramList.begin(); pli != paramList.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
             {
                 if((*pli)->isOutParam())
                 {
@@ -975,7 +966,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
                 // Unmarshal 'in' parameters.
                 //
                 out << nl << "IceInternal.BasicStream __is = __inS.startReadParams();";
-                for(pli = inParams.begin(); pli != inParams.end(); ++pli)
+                for(ParamDeclList::const_iterator pli = inParams.begin(); pli != inParams.end(); ++pli)
                 {
                     TypePtr paramType = (*pli)->type();
                     string paramName = fixKwd((*pli)->name());
@@ -1010,7 +1001,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
             //
             // Declare 'out' parameters.
             //
-            for(pli = outParams.begin(); pli != outParams.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = outParams.begin(); pli != outParams.end(); ++pli)
             {
                 string typeS = typeToString((*pli)->type(), TypeModeOut, package, (*pli)->getMetaData(), true,
                                             optionalMapping && (*pli)->optional());
@@ -1033,7 +1024,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
                 out << retS << " __ret = ";
             }
             out << "__obj." << fixKwd(opName) << '(';
-            for(pli = inParams.begin(); pli != inParams.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = inParams.begin(); pli != inParams.end(); ++pli)
             {
                 TypePtr paramType = (*pli)->type();
                 out << fixKwd((*pli)->name());
@@ -1047,7 +1038,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
                 }
                 out << ", ";
             }
-            for(pli = outParams.begin(); pli != outParams.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = outParams.begin(); pli != outParams.end(); ++pli)
             {
                 out << fixKwd((*pli)->name()) << ", ";
             }
@@ -1075,8 +1066,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
             if(!throws.empty())
             {
                 out << eb;
-                ExceptionList::const_iterator t;
-                for(t = throws.begin(); t != throws.end(); ++t)
+                for(ExceptionList::const_iterator t = throws.begin(); t != throws.end(); ++t)
                 {
                     string exS = getAbsolute(*t, package);
                     out << nl << "catch(" << exS << " ex)";
@@ -1093,8 +1083,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
         {
             ParamDeclList inParams;
             ParamDeclList paramList = op->parameters();
-            ParamDeclList::const_iterator pli;
-            for(pli = paramList.begin(); pli != paramList.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
             {
                 if(!(*pli)->isOutParam())
                 {
@@ -1113,7 +1102,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
                 //
                 out << nl << "IceInternal.BasicStream __is = __inS.startReadParams();";
                 iter = 0;
-                for(pli = inParams.begin(); pli != inParams.end(); ++pli)
+                for(ParamDeclList::const_iterator pli = inParams.begin(); pli != inParams.end(); ++pli)
                 {
                     TypePtr paramType = (*pli)->type();
                     string paramName = fixKwd((*pli)->name());
@@ -1153,7 +1142,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
             out << nl << "try";
             out << sb;
             out << nl << "__obj." << (amd ? opName + "_async" : fixKwd(opName)) << (amd ? "(__cb, " : "(");
-            for(pli = inParams.begin(); pli != inParams.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = inParams.begin(); pli != inParams.end(); ++pli)
             {
                 TypePtr paramType = (*pli)->type();
                 out << fixKwd((*pli)->name());
@@ -1191,13 +1180,9 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
         allOpNames.sort();
         allOpNames.unique();
 
-        StringList::const_iterator q;
-        OperationList::iterator r;
-
         out << sp << nl << "private final static String[] __all =";
         out << sb;
-        q = allOpNames.begin();
-        while(q != allOpNames.end())
+        for(StringList::const_iterator q = allOpNames.begin(); q != allOpNames.end();)
         {
             out << nl << '"' << *q << '"';
             if(++q != allOpNames.end())
@@ -1208,7 +1193,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
         out << eb << ';';
 
         out << sp;
-        for(r = allOps.begin(); r != allOps.end(); ++r)
+        for(OperationList::iterator r = allOps.begin(); r != allOps.end(); ++r)
         {
             //
             // Suppress deprecation warnings if this method dispatches to a deprecated operation.
@@ -1235,7 +1220,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
         out << sp << nl << "switch(pos)";
         out << sb;
         int i = 0;
-        for(q = allOpNames.begin(); q != allOpNames.end(); ++q)
+        for(StringList::const_iterator q = allOpNames.begin(); q != allOpNames.end(); ++q)
         {
             string opName = *q;
 
@@ -1302,7 +1287,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
         //
 
         map<string, int> attributesMap;
-        for(r = allOps.begin(); r != allOps.end(); ++r)
+        for(OperationList::iterator r = allOps.begin(); r != allOps.end(); ++r)
         {
             int attributes = (*r)->attributes();
             if(attributes != 0)
@@ -1315,9 +1300,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
         {
             out << sp << nl << "private final static int[] __operationAttributes =";
             out << sb;
-
-            q = allOpNames.begin();
-            while(q != allOpNames.end())
+            for(StringList::const_iterator q = allOpNames.begin(); q != allOpNames.end();)
             {
                 int attributes = 0;
                 string opName = *q;
@@ -1353,7 +1336,6 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
     DataMemberList optionalMembers = p->orderedOptionalDataMembers();
     bool basePreserved = p->inheritsMetaData("preserve-slice");
     bool preserved = basePreserved || p->hasMetaData("preserve-slice");
-    DataMemberList::const_iterator d;
 
     out << sp << nl << "public void" << nl << "__write(IceInternal.BasicStream __os)";
     out << sb;
@@ -1373,14 +1355,14 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
     out << sb;
     out << nl << "__os.startWriteSlice(ice_staticId(), " << (!base ? "true" : "false") << ");";
     iter = 0;
-    for(d = members.begin(); d != members.end(); ++d)
+    for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
     {
         if(!(*d)->optional())
         {
             writeMarshalDataMember(out, package, *d, iter);
         }
     }
-    for(d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
+    for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
     {
         writeMarshalDataMember(out, package, *d, iter);
     }
@@ -1418,14 +1400,14 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
     int classMemberCount = static_cast<int>(allClassMembers.size() - classMembers.size());
     const bool needCustomPatcher = classMembers.size() > 1 || allClassMembers.size() > 1;
     iter = 0;
-    for(d = members.begin(); d != members.end(); ++d)
+    for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
     {
         if(!(*d)->optional())
         {
             writeUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, classMemberCount);
         }
     }
-    for(d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
+    for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
     {
         writeUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, classMemberCount);
     }
@@ -1456,14 +1438,14 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
         out << sb;
         out << nl << "__outS.startSlice(ice_staticId(), " << (!base ? "true" : "false") << ");";
         iter = 0;
-        for(d = members.begin(); d != members.end(); ++d)
+        for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
         {
             if(!(*d)->optional())
             {
                 writeStreamMarshalDataMember(out, package, *d, iter);
             }
         }
-        for(d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
+        for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
         {
             writeStreamMarshalDataMember(out, package, *d, iter);
         }
@@ -1493,14 +1475,14 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
         out << nl << "__inS.startSlice();";
         iter = 0;
         classMemberCount = static_cast<int>(allClassMembers.size() - classMembers.size());
-        for(d = members.begin(); d != members.end(); ++d)
+        for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
         {
             if(!(*d)->optional())
             {
                 writeStreamUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, classMemberCount);
             }
         }
-        for(d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
+        for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
         {
             writeStreamUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, classMemberCount);
         }
@@ -1908,7 +1890,6 @@ Slice::JavaVisitor::writeDocCommentAMI(Output& out, const OperationPtr& p, Param
     string deprecateReason = getDeprecateReason(p, contained, "operation");
 
     StringList lines = splitComment(p);
-    StringList::const_iterator i;
     if(lines.empty() && deprecateReason.empty())
     {
         return;
@@ -1920,7 +1901,7 @@ Slice::JavaVisitor::writeDocCommentAMI(Output& out, const OperationPtr& p, Param
     // Output the leading comment block up until the first @tag.
     //
     bool done = false;
-    for(i = lines.begin(); i != lines.end() && !done; ++i)
+    for(StringList::const_iterator i = lines.begin(); i != lines.end() && !done; ++i)
     {
         if((*i)[0] == '@')
         {
@@ -1970,7 +1951,7 @@ Slice::JavaVisitor::writeDocCommentAMI(Output& out, const OperationPtr& p, Param
         const string throwsTag = "@throws";
         const string seeTag = "@see";
         bool found = false;
-        for(i = lines.begin(); i != lines.end(); ++i)
+        for(StringList::const_iterator i = lines.begin(); i != lines.end(); ++i)
         {
             if(!found)
             {
@@ -2240,9 +2221,8 @@ Slice::Gen::OpsVisitor::writeOperations(const ClassDefPtr& p, bool noCurrent)
     {
         out << " extends ";
         out.useCurrentPosAsIndent();
-        ClassList::const_iterator q = bases.begin();
         bool first = true;
-        while(q != bases.end())
+        for(ClassList::const_iterator q = bases.begin(); q != bases.end();)
         {
             if((*q)->isAbstract())
             {
@@ -2263,8 +2243,7 @@ Slice::Gen::OpsVisitor::writeOperations(const ClassDefPtr& p, bool noCurrent)
     out << sb;
 
     OperationList ops = p->operations();
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = *r;
         ContainerPtr container = op->container();
@@ -2434,8 +2413,7 @@ Slice::Gen::TieVisitor::visitClassDefStart(const ClassDefPtr& p)
     }
 
     OperationList ops = p->allOperations();
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::iterator r = ops.begin(); r != ops.end(); ++r)
     {
         ContainerPtr container = (*r)->container();
         ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
@@ -2556,7 +2534,6 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
     string absolute = getAbsolute(p);
     DataMemberList members = p->dataMembers();
     DataMemberList allDataMembers = p->allDataMembers();
-    DataMemberList::const_iterator d;
 
     open(absolute, p->file());
 
@@ -2641,8 +2618,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
         }
         if(!bases.empty())
         {
-            ClassList::const_iterator q = bases.begin();
-            while(q != bases.end())
+            for(ClassList::const_iterator q = bases.begin(); q != bases.end();)
             {
                 implements.push_back(getAbsolute(*q, package));
                 q++;
@@ -2659,8 +2635,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
             out << " implements ";
             out.useCurrentPosAsIndent();
 
-            StringList::const_iterator q = implements.begin();
-            while(q != implements.end())
+            for(StringList::const_iterator q = implements.begin(); q != implements.end();)
             {
                 if(q != implements.begin())
                 {
@@ -2686,8 +2661,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
     if(p->isLocal())
     {
         OperationList ops = p->operations();
-        OperationList::const_iterator r;
-        for(r = ops.begin(); r != ops.end(); ++r)
+        for(OperationList::iterator r = ops.begin(); r != ops.end(); ++r)
         {
             OperationPtr op = *r;
             ContainerPtr container = op->container();
@@ -2777,7 +2751,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
         bool hasOptionalMembers = false;
         bool hasRequiredMembers = false;
 
-        for(d = allDataMembers.begin(); d != allDataMembers.end(); ++d)
+        for(DataMemberList::const_iterator d = allDataMembers.begin(); d != allDataMembers.end(); ++d)
         {
             if((*d)->optional())
             {
@@ -2820,7 +2794,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
                 //
                 out << sp << nl << "public " << fixKwd(name) << spar;
                 vector<string> paramDecl;
-                for(d = allDataMembers.begin(); d != allDataMembers.end(); ++d)
+                for(DataMemberList::const_iterator d = allDataMembers.begin(); d != allDataMembers.end(); ++d)
                 {
                     if(!(*d)->optional())
                     {
@@ -2834,7 +2808,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
                 if(!baseDataMembers.empty())
                 {
                     bool hasBaseRequired = false;
-                    for(d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
+                    for(DataMemberList::const_iterator d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
                     {
                         if(!(*d)->optional())
                         {
@@ -2846,7 +2820,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
                     {
                         out << nl << "super" << spar;
                         vector<string> baseParamNames;
-                        for(d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
+                        for(DataMemberList::const_iterator d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
                         {
                             if(!(*d)->optional())
                             {
@@ -2857,7 +2831,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
                     }
                 }
 
-                for(d = members.begin(); d != members.end(); ++d)
+                for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
                 {
                     if(!(*d)->optional())
                     {
@@ -2874,7 +2848,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
             //
             out << sp << nl << "public " << fixKwd(name) << spar;
             vector<string> paramDecl;
-            for(d = allDataMembers.begin(); d != allDataMembers.end(); ++d)
+            for(DataMemberList::const_iterator d = allDataMembers.begin(); d != allDataMembers.end(); ++d)
             {
                 string memberName = fixKwd((*d)->name());
                 string memberType = typeToString((*d)->type(), TypeModeMember, package, (*d)->getMetaData());
@@ -2886,13 +2860,13 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
             {
                 out << nl << "super" << spar;
                 vector<string> baseParamNames;
-                for(d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
+                for(DataMemberList::const_iterator d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
                 {
                     baseParamNames.push_back(fixKwd((*d)->name()));
                 }
                 out << baseParamNames << epar << ';';
             }
-            for(d = members.begin(); d != members.end(); ++d)
+            for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
             {
                 string paramName = fixKwd((*d)->name());
                 if((*d)->optional())
@@ -2999,7 +2973,6 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
     string absolute = getAbsolute(p);
     DataMemberList members = p->dataMembers();
     DataMemberList allDataMembers = p->allDataMembers();
-    DataMemberList::const_iterator d;
 
     open(absolute, p->file());
 
@@ -3050,7 +3023,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
 
     bool hasOptionalMembers = false;
     bool hasRequiredMembers = false;
-    for(d = allDataMembers.begin(); d != allDataMembers.end(); ++d)
+    for(DataMemberList::const_iterator d = allDataMembers.begin(); d != allDataMembers.end(); ++d)
     {
         if((*d)->optional())
         {
@@ -3078,7 +3051,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
             if(hasRequiredMembers && hasOptionalMembers)
             {
                 bool hasBaseRequired = false;
-                for(d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
+                for(DataMemberList::const_iterator d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
                 {
                     if(!(*d)->optional())
                     {
@@ -3094,7 +3067,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
                 //
                 out << sp << nl << "public " << name << spar;
                 vector<string> paramDecl;
-                for(d = allDataMembers.begin(); d != allDataMembers.end(); ++d)
+                for(DataMemberList::const_iterator d = allDataMembers.begin(); d != allDataMembers.end(); ++d)
                 {
                     if(!(*d)->optional())
                     {
@@ -3111,7 +3084,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
                     {
                         out << nl << "super" << spar;
                         vector<string> baseParamNames;
-                        for(d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
+                        for(DataMemberList::const_iterator d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
                         {
                             if(!(*d)->optional())
                             {
@@ -3122,7 +3095,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
                     }
                 }
 
-                for(d = members.begin(); d != members.end(); ++d)
+                for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
                 {
                     if(!(*d)->optional())
                     {
@@ -3146,7 +3119,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
                     {
                         out << nl << "super" << spar;
                         vector<string> baseParamNames;
-                        for(d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
+                        for(DataMemberList::const_iterator d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
                         {
                             if(!(*d)->optional())
                             {
@@ -3160,7 +3133,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
                     {
                         out << nl << "super(__cause);";
                     }
-                    for(d = members.begin(); d != members.end(); ++d)
+                    for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
                     {
                         if(!(*d)->optional())
                         {
@@ -3175,7 +3148,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
 
             out << sp << nl << "public " << name << spar;
             vector<string> paramDecl;
-            for(d = allDataMembers.begin(); d != allDataMembers.end(); ++d)
+            for(DataMemberList::const_iterator d = allDataMembers.begin(); d != allDataMembers.end(); ++d)
             {
                 string memberName = fixKwd((*d)->name());
                 string memberType = typeToString((*d)->type(), TypeModeMember, package, (*d)->getMetaData());
@@ -3188,14 +3161,14 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
                 out << nl << "super" << spar;
                 vector<string> baseParamNames;
                 DataMemberList baseDataMembers = base->allDataMembers();
-                for(d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
+                for(DataMemberList::const_iterator d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
                 {
                     baseParamNames.push_back(fixKwd((*d)->name()));
                 }
 
                 out << baseParamNames << epar << ';';
             }
-            for(d = members.begin(); d != members.end(); ++d)
+            for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
             {
                 string paramName = fixKwd((*d)->name());
                 if((*d)->optional())
@@ -3229,14 +3202,14 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
                     out << nl << "super" << spar;
                     vector<string> baseParamNames;
                     DataMemberList baseDataMembers = base->allDataMembers();
-                    for(d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
+                    for(DataMemberList::const_iterator d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d)
                     {
                         baseParamNames.push_back(fixKwd((*d)->name()));
                     }
                     baseParamNames.push_back("__cause");
                     out << baseParamNames << epar << ';';
                 }
-                for(d = members.begin(); d != members.end(); ++d)
+                for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
                 {
                     string paramName = fixKwd((*d)->name());
                     if((*d)->optional())
@@ -3279,7 +3252,6 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 
         DataMemberList members = p->dataMembers();
         DataMemberList optionalMembers = p->orderedOptionalDataMembers();
-        DataMemberList::const_iterator d;
         int iter;
 
         out << sp << nl << "public void" << nl << "__write(IceInternal.BasicStream __os)";
@@ -3300,14 +3272,14 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         out << sb;
         out << nl << "__os.startWriteSlice(\"" << scoped << "\", " << (!base ? "true" : "false") << ");";
         iter = 0;
-        for(d = members.begin(); d != members.end(); ++d)
+        for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
         {
             if(!(*d)->optional())
             {
                 writeMarshalDataMember(out, package, *d, iter);
             }
         }
-        for(d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
+        for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
         {
             writeMarshalDataMember(out, package, *d, iter);
         }
@@ -3344,14 +3316,14 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         DataMemberList classMembers = p->classDataMembers();
         int classMemberCount = static_cast<int>(allClassMembers.size() - classMembers.size());
         const bool needCustomPatcher = classMembers.size() > 1 || allClassMembers.size() > 1;
-        for(d = members.begin(); d != members.end(); ++d)
+        for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
         {
             if(!(*d)->optional())
             {
                 writeUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, classMemberCount);
             }
         }
-        for(d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
+        for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
         {
             writeUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, classMemberCount);
         }
@@ -3382,14 +3354,14 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
             out << sb;
             out << nl << "__outS.startSlice(\"" << scoped << "\", " << (!base ? "true" : "false") << ");";
             iter = 0;
-            for(d = members.begin(); d != members.end(); ++d)
+            for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
             {
                 if(!(*d)->optional())
                 {
                     writeStreamMarshalDataMember(out, package, *d, iter);
                 }
             }
-            for(d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
+            for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
             {
                 writeStreamMarshalDataMember(out, package, *d, iter);
             }
@@ -3419,14 +3391,14 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
             out << nl << "__inS.startSlice();";
             iter = 0;
             classMemberCount = static_cast<int>(allClassMembers.size() - classMembers.size());
-            for(d = members.begin(); d != members.end(); ++d)
+            for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
             {
                 if(!(*d)->optional())
                 {
                     writeStreamUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, classMemberCount);
                 }
             }
-            for(d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
+            for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
             {
                 writeStreamUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, classMemberCount);
             }
@@ -3499,7 +3471,6 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
     Output& out = output();
 
     DataMemberList members = p->dataMembers();
-    DataMemberList::const_iterator d;
     int iter;
 
     string name = fixKwd(p->name());
@@ -3520,7 +3491,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
     {
         vector<string> paramDecl;
         vector<string> paramNames;
-        for(d = members.begin(); d != members.end(); ++d)
+        for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
         {
             string memberName = fixKwd((*d)->name());
             string memberType = typeToString((*d)->type(), TypeModeMember, package, (*d)->getMetaData());
@@ -3550,7 +3521,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
     out << eb;
     out << sp << nl << "if(_r != null)";
     out << sb;
-    for(d = members.begin(); d != members.end(); ++d)
+    for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
     {
         string memberName = fixKwd((*d)->name());
         BuiltinPtr b = BuiltinPtr::dynamicCast((*d)->type());
@@ -3648,7 +3619,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
     out << nl << "int __h = 5381;";
     out << nl << "__h = IceInternal.HashUtil.hashAdd(__h, \"" << p->scoped() << "\");";
     iter = 0;
-    for(d = members.begin(); d != members.end(); ++d)
+    for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
     {
         string memberName = fixKwd((*d)->name());
         out << nl << "__h = IceInternal.HashUtil.hashAdd(__h, " << memberName << ");";
@@ -3675,7 +3646,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         out << sp << nl << "public void" << nl << "__write(IceInternal.BasicStream __os)";
         out << sb;
         iter = 0;
-        for(d = members.begin(); d != members.end(); ++d)
+        for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
         {
             writeMarshalDataMember(out, package, *d, iter);
         }
@@ -3693,7 +3664,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         iter = 0;
         int classMemberCount = 0;
         const bool needCustomPatcher = classMembers.size() > 1;
-        for(d = members.begin(); d != members.end(); ++d)
+        for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
         {
             writeUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, classMemberCount);
         }
@@ -3704,7 +3675,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
             out << sp << nl << "public void" << nl << "ice_write(Ice.OutputStream __outS)";
             out << sb;
             iter = 0;
-            for(d = members.begin(); d != members.end(); ++d)
+            for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
             {
                 writeStreamMarshalDataMember(out, package, *d, iter);
             }
@@ -3714,7 +3685,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
             out << sb;
             iter = 0;
             classMemberCount = 0;
-            for(d = members.begin(); d != members.end(); ++d)
+            for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
             {
                 writeStreamUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, classMemberCount);
             }
@@ -3997,7 +3968,6 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
     string name = fixKwd(p->name());
     string absolute = getAbsolute(p);
     EnumeratorList enumerators = p->getEnumerators();
-    EnumeratorList::const_iterator en;
     size_t sz = enumerators.size();
 
     open(absolute, p->file());
@@ -4015,7 +3985,7 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
     }
     out << sb;
 
-    for(en = enumerators.begin(); en != enumerators.end(); ++en)
+    for(EnumeratorList::const_iterator en = enumerators.begin(); en != enumerators.end(); ++en)
     {
         if(en != enumerators.begin())
         {
@@ -4305,9 +4275,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
     string explicitContextParam = "boolean __explicitCtx";
 
     OperationList ops = p->allOperations();
-
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = *r;
         ContainerPtr container = op->container();
@@ -4417,7 +4385,6 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
             string callbackParam = "Ice.Callback __cb";
             int iter;
             ParamDeclList paramList = op->parameters();
-            ParamDeclList::const_iterator pli;
 
             out << sp;
             out << nl << "private static final String __" << op->name() << "_name = \"" << op->name() << "\";";
@@ -4507,7 +4474,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
                 out << nl << "IceInternal.BasicStream __os = __result.__startWriteParams(" 
                     << opFormatTypeToString(op) << ");";
                 ParamDeclList pl;
-                for(pli = paramList.begin(); pli != paramList.end(); ++pli)
+                for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
                 {
                     if(!(*pli)->isOutParam())
                     {
@@ -4580,7 +4547,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
                 {
                     out << nl << "IceInternal.BasicStream __is = __result.__startReadParams();";
                     ParamDeclList pl;
-                    for(pli = paramList.begin(); pli != paramList.end(); ++pli)
+                    for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
                     {
                         if((*pli)->isOutParam())
                         {
@@ -4820,17 +4787,15 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
     out << sp << nl << "public static final String[] __ids =";
     out << sb;
 
+    for(StringList::const_iterator q = ids.begin(); q != ids.end();)
     {
-        StringList::const_iterator q = ids.begin();
-        while(q != ids.end())
+        out << nl << '"' << *q << '"';
+        if(++q != ids.end())
         {
-            out << nl << '"' << *q << '"';
-            if(++q != ids.end())
-            {
-                out << ',';
-            }
+            out << ',';
         }
     }
+
     out << eb << ';';
 
     out << sp << nl << "public static String" << nl << "ice_staticId()";
@@ -5209,8 +5174,7 @@ Slice::Gen::ProxyVisitor::visitClassDefStart(const ClassDefPtr& p)
     else
     {
         out.useCurrentPosAsIndent();
-        ClassList::const_iterator q = bases.begin();
-        while(q != bases.end())
+        for(ClassList::const_iterator q = bases.begin(); q != bases.end();)
         {
             out << getAbsolute(*q, package, "", "Prx");
             if(++q != bases.end())
@@ -5381,8 +5345,7 @@ Slice::Gen::DelegateVisitor::visitClassDefStart(const ClassDefPtr& p)
     else
     {
         out.useCurrentPosAsIndent();
-        ClassList::const_iterator q = bases.begin();
-        while(q != bases.end())
+        for(ClassList::const_iterator q = bases.begin(); q != bases.end();)
         {
             out << getAbsolute(*q, package, "_", "Del");
             if(++q != bases.end())
@@ -5398,9 +5361,7 @@ Slice::Gen::DelegateVisitor::visitClassDefStart(const ClassDefPtr& p)
     string contextParam = "java.util.Map<String, String> __ctx";
 
     OperationList ops = p->operations();
-
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = *r;
         string opName = fixKwd(op->name());
@@ -5452,9 +5413,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
     string contextParam = "java.util.Map<String, String> __ctx";
 
     OperationList ops = p->allOperations();
-
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = *r;
         StringList opMetaData = op->getMetaData();
@@ -5467,8 +5426,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
         ParamDeclList inParams;
         ParamDeclList outParams;
         ParamDeclList paramList = op->parameters();
-        ParamDeclList::const_iterator pli;
-        for(pli = paramList.begin(); pli != paramList.end(); ++pli)
+        for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
         {
             if((*pli)->isOutParam())
             {
@@ -5628,9 +5586,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p)
     string contextParam = "java.util.Map<String, String> __ctx";
 
     OperationList ops = p->allOperations();
-
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = *r;
         ContainerPtr container = op->container();
@@ -5719,8 +5675,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p)
             //
             vector<string> args;
             ParamDeclList paramList = op->parameters();
-            ParamDeclList::const_iterator q;
-            for(q = paramList.begin(); q != paramList.end(); ++q)
+            for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
             {
                 string param = fixKwd((*q)->name());
                 //
@@ -5766,7 +5721,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p)
 
             out << "__servant." << opName << spar << args << "__current" << epar << ';';
 
-            for(q = paramList.begin(); q != paramList.end(); ++q)
+            for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
             {
                 //
                 // For optional parameters, the proxy mapping can differ from the servant
@@ -6111,8 +6066,7 @@ Slice::Gen::BaseImplVisitor::writeOperation(Output& out, const string& package,
 
         string result = "__r";
         ParamDeclList paramList = op->parameters();
-        ParamDeclList::const_iterator q;
-        for(q = paramList.begin(); q != paramList.end(); ++q)
+        for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
         {
             if((*q)->name() == result)
             {
@@ -6124,7 +6078,7 @@ Slice::Gen::BaseImplVisitor::writeOperation(Output& out, const string& package,
         {
             writeDecl(out, package, result, ret, opMetaData, optionalMapping && op->returnIsOptional());
         }
-        for(q = paramList.begin(); q != paramList.end(); ++q)
+        for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
         {
             if((*q)->isOutParam())
             {
@@ -6139,7 +6093,7 @@ Slice::Gen::BaseImplVisitor::writeOperation(Output& out, const string& package,
             out << result;
         }
         bool firstOutParam = true;
-        for(q = paramList.begin(); q != paramList.end(); ++q)
+        for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
         {
             if((*q)->isOutParam())
             {
@@ -6238,9 +6192,7 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
     out << eb;
 
     OperationList ops = p->allOperations();
-
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::iterator r = ops.begin(); r != ops.end(); ++r)
     {
         writeOperation(out, package, *r, p->isLocal());
     }
@@ -6316,8 +6268,7 @@ Slice::Gen::ImplTieVisitor::visitClassDefStart(const ClassDefPtr& p)
         baseOps.sort();
     }
 
-    OperationList::const_iterator r;
-    for(r = ops.begin(); r != ops.end(); ++r)
+    for(OperationList::iterator r = ops.begin(); r != ops.end(); ++r)
     {
         if(inheritImpl && binary_search(baseOps.begin(), baseOps.end(), *r))
         {
@@ -6376,8 +6327,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
 
         ParamDeclList outParams;
         ParamDeclList paramList = p->parameters();
-        ParamDeclList::const_iterator pli;
-        for(pli = paramList.begin(); pli != paramList.end(); ++pli)
+        for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
         {
             if((*pli)->isOutParam())
             {
@@ -6411,7 +6361,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
                 out << nl << typeToString(ret, TypeModeIn, classPkg, p->getMetaData(), true, p->returnIsOptional())
                     << " __ret = " << (p->returnIsOptional() ? "null" : initValue(ret)) << ';';
             }
-            for(pli = outParams.begin(); pli != outParams.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = outParams.begin(); pli != outParams.end(); ++pli)
             {
                 string ts = typeToString((*pli)->type(), TypeModeOut, classPkg, (*pli)->getMetaData(), true,
                                          (*pli)->optional());
@@ -6444,7 +6394,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
             {
                 out << "__ret";
             }
-            for(pli = outParams.begin(); pli != outParams.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = outParams.begin(); pli != outParams.end(); ++pli)
             {
                 if((*pli)->optional())
                 {
@@ -6582,8 +6532,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
 
             ParamDeclList outParams;
             ParamDeclList paramList = p->parameters();
-            ParamDeclList::const_iterator pli;
-            for(pli = paramList.begin(); pli != paramList.end(); ++pli)
+            for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
             {
                 if((*pli)->isOutParam())
                 {
@@ -6653,8 +6602,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
                 out << sb;
                 out << nl << "throw ex;";
                 out << eb;
-                ExceptionList::const_iterator r;
-                for(r = throws.begin(); r != throws.end(); ++r)
+                for(ExceptionList::const_iterator r = throws.begin(); r != throws.end(); ++r)
                 {
                     string exS = getAbsolute(*r, classPkg);
                     out << nl << "catch(" << exS << " __ex)";
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 02e92a9bd6b..030b98d373f 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -133,20 +133,19 @@ compile(int argc, char* argv[])
 
     vector<string> cppArgs;
     vector<string> optargs = opts.argVec("D");
-    vector<string>::const_iterator i;
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-D" + *i);
     }
 
     optargs = opts.argVec("U");
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-U" + *i);
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
     {
         cppArgs.push_back("-I" + Preprocessor::normalizeIncludePath(*i));
     }
@@ -206,7 +205,7 @@ compile(int argc, char* argv[])
         cout << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<dependencies>" << endl;
     }
 
-    for(i = args.begin(); i != args.end(); ++i)
+    for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
     {
         //
         // Ignore duplicates.
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index 4a566ffb7c0..2d9bb5109c4 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -172,7 +172,6 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
     ClassList bases = p->bases();
     ClassDefPtr base;
     OperationList ops = p->operations();
-    OperationList::iterator oli;
     DataMemberList members = p->dataMembers();
     bool isInterface = p->isInterface();
     bool isAbstract = isInterface || p->allOperations().size() > 0; // Don't use isAbstract() - see bug 3739
@@ -200,7 +199,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
             }
         }
         _out << sb;
-        for(oli = ops.begin(); oli != ops.end(); ++oli)
+        for(OperationList::iterator oli = ops.begin(); oli != ops.end(); ++oli)
         {
             _out << nl << "public function " << fixIdent((*oli)->name()) << '(';
             ParamDeclList params = (*oli)->parameters();
@@ -298,7 +297,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
         if(!ops.empty())
         {
             _out << sp;
-            for(oli = ops.begin(); oli != ops.end(); ++oli)
+            for(OperationList::iterator oli = ops.begin(); oli != ops.end(); ++oli)
             {
                 _out << nl << "abstract public function " << fixIdent((*oli)->name()) << '(';
                 ParamDeclList params = (*oli)->parameters();
@@ -468,7 +467,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
         if(!ops.empty())
         {
             _out << sp;
-            for(oli = ops.begin(); oli != ops.end(); ++oli)
+            for(OperationList::iterator oli = ops.begin(); oli != ops.end(); ++oli)
             {
                 ParamDeclList params = (*oli)->parameters();
                 ParamDeclList::iterator t;
@@ -603,7 +602,6 @@ CodeVisitor::visitExceptionStart(const ExceptionPtr& p)
     _out << sb;
 
     DataMemberList members = p->dataMembers();
-    DataMemberList::iterator dmli;
 
     //
     // __construct
@@ -661,7 +659,7 @@ CodeVisitor::visitExceptionStart(const ExceptionPtr& p)
     if(!members.empty())
     {
         _out << sp;
-        for(dmli = members.begin(); dmli != members.end(); ++dmli)
+        for(DataMemberList::iterator dmli = members.begin(); dmli != members.end(); ++dmli)
         {
             _out << nl << "public $" << fixIdent((*dmli)->name()) << ";";
         }
@@ -694,7 +692,7 @@ CodeVisitor::visitExceptionStart(const ExceptionPtr& p)
     if(!members.empty())
     {
         _out << "array(";
-        for(dmli = members.begin(); dmli != members.end(); ++dmli)
+        for(DataMemberList::iterator dmli = members.begin(); dmli != members.end(); ++dmli)
         {
             if(dmli != members.begin())
             {
@@ -729,7 +727,6 @@ CodeVisitor::visitStructStart(const StructPtr& p)
     string type = getTypeVar(p);
     string abs = getAbsolute(p, _ns);
     MemberInfoList memberList;
-    MemberInfoList::iterator r;
 
     {
         DataMemberList members = p->dataMembers();
@@ -753,7 +750,7 @@ CodeVisitor::visitStructStart(const StructPtr& p)
     writeConstructorParams(memberList);
     _out << ")";
     _out << sb;
-    for(r = memberList.begin(); r != memberList.end(); ++r)
+    for(MemberInfoList::iterator r = memberList.begin(); r != memberList.end(); ++r)
     {
         writeAssign(*r);
     }
@@ -771,7 +768,7 @@ CodeVisitor::visitStructStart(const StructPtr& p)
     if(!memberList.empty())
     {
         _out << sp;
-        for(r = memberList.begin(); r != memberList.end(); ++r)
+        for(MemberInfoList::iterator r = memberList.begin(); r != memberList.end(); ++r)
         {
             _out << nl << "public $" << r->fixedName << ';';
         }
@@ -790,7 +787,7 @@ CodeVisitor::visitStructStart(const StructPtr& p)
     //
     // where MemberType is either a primitive type constant (T_INT, etc.) or the id of a constructed type.
     //
-    for(r = memberList.begin(); r != memberList.end(); ++r)
+    for(MemberInfoList::iterator r = memberList.begin(); r != memberList.end(); ++r)
     {
         if(r != memberList.begin())
         {
@@ -897,8 +894,6 @@ CodeVisitor::visitEnum(const EnumPtr& p)
     string type = getTypeVar(p);
     string abs = getAbsolute(p, _ns);
     EnumeratorList enums = p->getEnumerators();
-    EnumeratorList::iterator q;
-    long i;
 
     startNamespace(p);
 
@@ -906,13 +901,16 @@ CodeVisitor::visitEnum(const EnumPtr& p)
     _out << sb;
     _out << nl << "class " << name;
     _out << sb;
-
-    for(q = enums.begin(), i = 0; q != enums.end(); ++q, ++i)
+    
     {
-        string fixedEnum = fixIdent((*q)->name());
-        ostringstream idx;
-        idx << i;
-        _out << nl << "const " << fixedEnum << " = " << idx.str() << ';';
+        long i = 0;
+        for(EnumeratorList::iterator q = enums.begin(); q != enums.end(); ++q, ++i)
+        {
+            string fixedEnum = fixIdent((*q)->name());
+            ostringstream idx;
+            idx << i;
+            _out << nl << "const " << fixedEnum << " = " << idx.str() << ';';
+        }
     }
 
     _out << eb;
@@ -921,7 +919,7 @@ CodeVisitor::visitEnum(const EnumPtr& p)
     // Emit the type information.
     //
     _out << sp << nl << type << " = IcePHP_defineEnum('" << scoped << "', array(";
-    for(q = enums.begin(); q != enums.end(); ++q)
+    for(EnumeratorList::iterator q = enums.begin(); q != enums.end(); ++q)
     {
         if(q != enums.begin())
         {
@@ -1310,8 +1308,7 @@ CodeVisitor::writeConstantValue(const TypePtr& type, const SyntaxTreeBasePtr& va
                 val = val.substr(colon + 1);
             }
             Slice::EnumeratorList l = en->getEnumerators();
-            Slice::EnumeratorList::iterator q;
-            for(q = l.begin(); q != l.end(); ++q)
+            for(Slice::EnumeratorList::iterator q = l.begin(); q != l.end(); ++q)
             {
                 if((*q)->name() == val)
                 {
@@ -1591,20 +1588,19 @@ compile(int argc, char* argv[])
 
     vector<string> cppArgs;
     vector<string> optargs = opts.argVec("D");
-    vector<string>::const_iterator i;
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-D" + *i);
     }
 
     optargs = opts.argVec("U");
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-U" + *i);
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
     {
         cppArgs.push_back("-I" + Preprocessor::normalizeIncludePath(*i));
     }
@@ -1639,7 +1635,7 @@ compile(int argc, char* argv[])
     IceUtil::CtrlCHandler ctrlCHandler;
     ctrlCHandler.setCallback(interruptedCallback);
 
-    for(i = args.begin(); i != args.end(); ++i)
+    for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
     {
         //
         // Ignore duplicates.
diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp
index dee21f342b1..4a4ca29b5b5 100644
--- a/cpp/src/slice2py/Main.cpp
+++ b/cpp/src/slice2py/Main.cpp
@@ -335,8 +335,6 @@ PackageVisitor::writeInit(const string& dir, const string& name, const StringLis
     }
     FileTracker::instance()->addFile(initPath);
 
-    StringList::const_iterator p;
-
     os << "# Generated by slice2py - DO NOT EDIT!" << endl
        << "#" << endl;
     os << endl
@@ -344,14 +342,14 @@ PackageVisitor::writeInit(const string& dir, const string& name, const StringLis
        << "Ice.updateModule(\"" << name << "\")" << endl
        << endl;
     os << _moduleTag << endl;
-    for(p = modules.begin(); p != modules.end(); ++p)
+    for(StringList::const_iterator p = modules.begin(); p != modules.end(); ++p)
     {
         os << "import " << *p << endl;
     }
 
     os << endl;
     os << _submoduleTag << endl;
-    for(p = submodules.begin(); p != submodules.end(); ++p)
+    for(StringList::const_iterator p = submodules.begin(); p != submodules.end(); ++p)
     {
         os << "import " << *p << endl;
     }
@@ -427,20 +425,19 @@ compile(int argc, char* argv[])
 
     vector<string> cppArgs;
     vector<string> optargs = opts.argVec("D");
-    vector<string>::const_iterator i;
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-D" + *i);
     }
 
     optargs = opts.argVec("U");
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-U" + *i);
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
     {
         cppArgs.push_back("-I" + Preprocessor::normalizeIncludePath(*i));
     }
@@ -479,7 +476,7 @@ compile(int argc, char* argv[])
 
     bool keepComments = true;
 
-    for(i = args.begin(); i != args.end(); ++i)
+    for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
     {
         //
         // Ignore duplicates.
diff --git a/cpp/src/slice2rb/Main.cpp b/cpp/src/slice2rb/Main.cpp
index 0f899485d02..feba75e6967 100644
--- a/cpp/src/slice2rb/Main.cpp
+++ b/cpp/src/slice2rb/Main.cpp
@@ -135,20 +135,19 @@ compile(int argc, char* argv[])
 
     vector<string> cppArgs;
     vector<string> optargs = opts.argVec("D");
-    vector<string>::const_iterator i;
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-D" + *i);
     }
 
     optargs = opts.argVec("U");
-    for(i = optargs.begin(); i != optargs.end(); ++i)
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
         cppArgs.push_back("-U" + *i);
     }
 
     vector<string> includePaths = opts.argVec("I");
-    for(i = includePaths.begin(); i != includePaths.end(); ++i)
+    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
     {
         cppArgs.push_back("-I" + Preprocessor::normalizeIncludePath(*i));
     }
@@ -181,7 +180,7 @@ compile(int argc, char* argv[])
     IceUtil::CtrlCHandler ctrlCHandler;
     ctrlCHandler.setCallback(interruptedCallback);
 
-    for(i = args.begin(); i != args.end(); ++i)
+    for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
     {
         //
         // Ignore duplicates.