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/IceGrid/Activator.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/IceGrid/Activator.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Activator.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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'='); |