summaryrefslogtreecommitdiff
path: root/cpp/src/IcePatch2Lib/Util.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-10-03 14:51:45 +0200
committerJose <jose@zeroc.com>2012-10-03 14:51:45 +0200
commit319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd (patch)
tree6cf6d939c3621633056403ff1d1106949a00b5f0 /cpp/src/IcePatch2Lib/Util.cpp
parentMinor C++ fixes (diff)
downloadice-319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd.tar.bz2
ice-319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd.tar.xz
ice-319a8a2f04aa3dec1eb41f9aa29690bf68bdcfbd.zip
ICE-4824 - Fixed VC6 style loops
Diffstat (limited to 'cpp/src/IcePatch2Lib/Util.cpp')
-rwxr-xr-xcpp/src/IcePatch2Lib/Util.cpp6
1 files changed, 2 insertions, 4 deletions
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;