From: Andy Heninger Date: Sat, 21 May 2016 01:13:04 +0000 (+0000) Subject: ICU-10175 swat compiler warnings in layout. X-Git-Tag: milestone-59-0-1~421 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c651697448623251f3e23e4773b85312c9912725;p=icu ICU-10175 swat compiler warnings in layout. X-SVN-Rev: 38759 --- diff --git a/icu4c/source/layout/IndicRearrangementProcessor.cpp b/icu4c/source/layout/IndicRearrangementProcessor.cpp index dd1ff5266bd..070367008a3 100644 --- a/icu4c/source/layout/IndicRearrangementProcessor.cpp +++ b/icu4c/source/layout/IndicRearrangementProcessor.cpp @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. 1998-2015 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2016 - All Rights Reserved * */ @@ -94,7 +94,7 @@ void IndicRearrangementProcessor::doRearrangementAction(LEGlyphStorage &glyphSto ia = glyphStorage.getCharIndex(firstGlyph, success); x = firstGlyph + 1; - while (x <= lastGlyph) { + while (x <= (int32_t)lastGlyph) { glyphStorage[x - 1] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x - 1, ix, success); @@ -115,7 +115,7 @@ void IndicRearrangementProcessor::doRearrangementAction(LEGlyphStorage &glyphSto id = glyphStorage.getCharIndex(lastGlyph, success); x = lastGlyph - 1; - while (x >= firstGlyph) { + while (x >= (int32_t)firstGlyph) { glyphStorage[x + 1] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x + 1, ix, success); @@ -150,7 +150,7 @@ void IndicRearrangementProcessor::doRearrangementAction(LEGlyphStorage &glyphSto ib = glyphStorage.getCharIndex(firstGlyph + 1, success); x = firstGlyph + 2; - while (x <= lastGlyph) { + while (x <= (int32_t)lastGlyph) { glyphStorage[x - 2] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x - 2, ix, success); @@ -176,7 +176,7 @@ void IndicRearrangementProcessor::doRearrangementAction(LEGlyphStorage &glyphSto ib = glyphStorage.getCharIndex(firstGlyph + 1, success); x = firstGlyph + 2; - while (x <= lastGlyph) { + while (x <= (int32_t)lastGlyph) { glyphStorage[x - 2] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x - 2, ix, success); @@ -202,7 +202,7 @@ void IndicRearrangementProcessor::doRearrangementAction(LEGlyphStorage &glyphSto id = glyphStorage.getCharIndex(lastGlyph, success); x = lastGlyph - 2; - while (x >= firstGlyph) { + while (x >= (int32_t)firstGlyph) { glyphStorage[x + 2] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x + 2, ix, success); @@ -228,7 +228,7 @@ void IndicRearrangementProcessor::doRearrangementAction(LEGlyphStorage &glyphSto id = glyphStorage.getCharIndex(lastGlyph, success); x = lastGlyph - 2; - while (x >= firstGlyph) { + while (x >= (int32_t)firstGlyph) { glyphStorage[x + 2] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x + 2, ix, success); @@ -256,7 +256,7 @@ void IndicRearrangementProcessor::doRearrangementAction(LEGlyphStorage &glyphSto id = glyphStorage.getCharIndex(lastGlyph, success); x = lastGlyph - 2; - while (x > firstGlyph) { + while (x > (int32_t)firstGlyph) { glyphStorage[x + 1] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x + 1, ix, success); @@ -286,7 +286,7 @@ void IndicRearrangementProcessor::doRearrangementAction(LEGlyphStorage &glyphSto id = glyphStorage.getCharIndex(lastGlyph, success); x = lastGlyph - 2; - while (x > firstGlyph) { + while (x > (int32_t)firstGlyph) { glyphStorage[x + 1] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x + 1, ix, success); @@ -316,7 +316,7 @@ void IndicRearrangementProcessor::doRearrangementAction(LEGlyphStorage &glyphSto id = glyphStorage.getCharIndex(lastGlyph, success); x = firstGlyph + 2; - while (x < lastGlyph) { + while (x < (int32_t)lastGlyph) { glyphStorage[x - 2] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x - 2, ix, success); @@ -346,7 +346,7 @@ void IndicRearrangementProcessor::doRearrangementAction(LEGlyphStorage &glyphSto id = glyphStorage.getCharIndex(lastGlyph, success); x = firstGlyph + 2; - while (x < lastGlyph) { + while (x < (int32_t)lastGlyph) { glyphStorage[x - 2] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x - 2, ix, success); diff --git a/icu4c/source/layout/IndicRearrangementProcessor2.cpp b/icu4c/source/layout/IndicRearrangementProcessor2.cpp index b54e20c8ef3..75b3b00a3c5 100644 --- a/icu4c/source/layout/IndicRearrangementProcessor2.cpp +++ b/icu4c/source/layout/IndicRearrangementProcessor2.cpp @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. and others 1998-2015 - All Rights Reserved + * (C) Copyright IBM Corp. and others 1998-2016 - All Rights Reserved * */ @@ -91,7 +91,7 @@ void IndicRearrangementProcessor2::doRearrangementAction(LEGlyphStorage &glyphSt ia = glyphStorage.getCharIndex(firstGlyph, success); x = firstGlyph + 1; - while (x <= lastGlyph) { + while (x <= (int32_t)lastGlyph) { glyphStorage[x - 1] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x - 1, ix, success); @@ -112,7 +112,7 @@ void IndicRearrangementProcessor2::doRearrangementAction(LEGlyphStorage &glyphSt id = glyphStorage.getCharIndex(lastGlyph, success); x = lastGlyph - 1; - while (x >= firstGlyph) { + while (x >= (int32_t)firstGlyph) { glyphStorage[x + 1] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x + 1, ix, success); @@ -147,7 +147,7 @@ void IndicRearrangementProcessor2::doRearrangementAction(LEGlyphStorage &glyphSt ib = glyphStorage.getCharIndex(firstGlyph + 1, success); x = firstGlyph + 2; - while (x <= lastGlyph) { + while (x <= (int32_t)lastGlyph) { glyphStorage[x - 2] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x - 2, ix, success); @@ -173,7 +173,7 @@ void IndicRearrangementProcessor2::doRearrangementAction(LEGlyphStorage &glyphSt ib = glyphStorage.getCharIndex(firstGlyph + 1, success); x = firstGlyph + 2; - while (x <= lastGlyph) { + while (x <= (int32_t)lastGlyph) { glyphStorage[x - 2] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x - 2, ix, success); @@ -199,7 +199,7 @@ void IndicRearrangementProcessor2::doRearrangementAction(LEGlyphStorage &glyphSt id = glyphStorage.getCharIndex(lastGlyph, success); x = lastGlyph - 2; - while (x >= firstGlyph) { + while (x >= (int32_t)firstGlyph) { glyphStorage[x + 2] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x + 2, ix, success); @@ -225,7 +225,7 @@ void IndicRearrangementProcessor2::doRearrangementAction(LEGlyphStorage &glyphSt id = glyphStorage.getCharIndex(lastGlyph, success); x = lastGlyph - 2; - while (x >= firstGlyph) { + while (x >= (int32_t)firstGlyph) { glyphStorage[x + 2] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x + 2, ix, success); @@ -253,7 +253,7 @@ void IndicRearrangementProcessor2::doRearrangementAction(LEGlyphStorage &glyphSt id = glyphStorage.getCharIndex(lastGlyph, success); x = lastGlyph - 2; - while (x > firstGlyph) { + while (x > (int32_t)firstGlyph) { glyphStorage[x + 1] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x + 1, ix, success); @@ -283,7 +283,7 @@ void IndicRearrangementProcessor2::doRearrangementAction(LEGlyphStorage &glyphSt id = glyphStorage.getCharIndex(lastGlyph, success); x = lastGlyph - 2; - while (x > firstGlyph) { + while (x > (int32_t)firstGlyph) { glyphStorage[x + 1] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x + 1, ix, success); @@ -313,7 +313,7 @@ void IndicRearrangementProcessor2::doRearrangementAction(LEGlyphStorage &glyphSt id = glyphStorage.getCharIndex(lastGlyph, success); x = firstGlyph + 2; - while (x < lastGlyph) { + while (x < (int32_t)lastGlyph) { glyphStorage[x - 2] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x - 2, ix, success); @@ -343,7 +343,7 @@ void IndicRearrangementProcessor2::doRearrangementAction(LEGlyphStorage &glyphSt id = glyphStorage.getCharIndex(lastGlyph, success); x = firstGlyph + 2; - while (x < lastGlyph) { + while (x < (int32_t)lastGlyph) { glyphStorage[x - 2] = glyphStorage[x]; ix = glyphStorage.getCharIndex(x, success); glyphStorage.setCharIndex(x - 2, ix, success);