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/JavaUtil.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/JavaUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
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; |