organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-14 09:21:03 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-13346 avoid range-based for loop

Browse source 
X-SVN-Rev: 40464
This commit is contained in:
Markus Scherer 2017-09-26 23:27:06 +00:00
parent 3bfe134a86
commit 496df21bdf
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
icu4c/source/test/intltest/testutil.cpp
View file

@ -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),