From: Markus Scherer <markus.icu@gmail.com>
Date: Tue, 26 Sep 2017 23:27:06 +0000 (+0000)
Subject: ICU-13346 avoid range-based for loop
X-Git-Tag: release-60-rc~109
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=496df21bdf8f8ffd04b70053064f2cdbb396d2fc;p=icu

ICU-13346 avoid range-based for loop

X-SVN-Rev: 40464
---

diff --git a/icu4c/source/test/intltest/testutil.cpp b/icu4c/source/test/intltest/testutil.cpp
index f58c57a3e56..31eaf202c36 100644
--- a/icu4c/source/test/intltest/testutil.cpp
+++ b/icu4c/source/test/intltest/testutil.cpp
@@ -16,6 +16,7 @@
 #include "unicode/edits.h"
 #include "unicode/unistr.h"
 #include "unicode/utf16.h"
+#include "cmemory.h"
 #include "testutil.h"
 #include "intltest.h"
 
@@ -276,9 +277,11 @@ void TestUtility::checkEditsIter(
     destIndexes.push_back(destLength + 1);
     std::reverse(destIndexes.begin(), destIndexes.end());
     // Zig-zag across the indexes to stress next() <-> previous().
-    for (std::vector<int32_t>::size_type i = 0; i < srcIndexes.size(); ++i) {
-        for (int32_t j : { 0, 1, 2, 3, 2, 1 }) {
-            if ((i + j) < srcIndexes.size()) {
+    static const int32_t ZIG_ZAG[] = { 0, 1, 2, 3, 2, 1 };
+    for (auto i = 0; i < (int32_t)srcIndexes.size(); ++i) {
+        for (int32_t ij = 0; ij < UPRV_LENGTHOF(ZIG_ZAG); ++ij) {
+            int32_t j = ZIG_ZAG[ij];
+            if ((i + j) < (int32_t)srcIndexes.size()) {
                 int32_t si = srcIndexes[i + j];
                 test.assertEquals(name + u" destIndexFromSrc(" + si + u"):" + __LINE__,
                                   destIndexFromSrc(expected, expLength, srcLength, destLength, si),
@@ -286,9 +289,10 @@ void TestUtility::checkEditsIter(
             }
         }
     }
-    for (std::vector<int32_t>::size_type i = 0; i < destIndexes.size(); ++i) {
-        for (int32_t j : { 0, 1, 2, 3, 2, 1 }) {
-            if ((i + j) < destIndexes.size()) {
+    for (auto i = 0; i < (int32_t)destIndexes.size(); ++i) {
+        for (int32_t ij = 0; ij < UPRV_LENGTHOF(ZIG_ZAG); ++ij) {
+            int32_t j = ZIG_ZAG[ij];
+            if ((i + j) < (int32_t)destIndexes.size()) {
                 int32_t di = destIndexes[i + j];
                 test.assertEquals(name + u" srcIndexFromDest(" + di + u"):" + __LINE__,
                                   srcIndexFromDest(expected, expLength, srcLength, destLength, di),