diff options
| author | Jose <jose@zeroc.com> | 2012-10-03 14:51:45 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-10-03 14:51:45 +0200 |
| commit | 319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd (patch) | |
| tree | 6cf6d939c3621633056403ff1d1106949a00b5f0 /cpp/src/Slice/Parser.cpp | |
| parent | Minor C++ fixes (diff) | |
| download | ice-319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd.tar.bz2 ice-319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd.tar.xz ice-319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd.zip | |
ICE-4824 - Fixed VC6 style loops
Diffstat (limited to 'cpp/src/Slice/Parser.cpp')
| -rwxr-xr-x | cpp/src/Slice/Parser.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
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()) { |