organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 06:25:30 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-20975 BRS66rc Fix warnings found when building ICU4C samples.

Browse source
This commit is contained in:
Jeff Genovy 2020-02-26 10:59:16 -08:00
parent 62bd8ac914
commit e1aa9119ad
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/ucnv.cpp
View file

@ -234,7 +234,7 @@ ucnv_safeClone(const UConverter* cnv, void *stackBuffer, int32_t *pBufferSize, U
ptrdiff_t pointerAdjustment = aligned_p - p;
if (bufferSizeNeeded + pointerAdjustment <= stackBufferSize) {
stackBuffer = reinterpret_cast<void *>(aligned_p);
stackBufferSize -= pointerAdjustment;
stackBufferSize -= static_cast<int32_t>(pointerAdjustment);
} else {
/* prevent using the stack buffer but keep the size > 0 so that we do not just preflight */
stackBufferSize = 1;

6
icu4c/source/tools/toolutil/pkg_genc.cpp
View file

@ -418,9 +418,9 @@ writeCCode(
filename,
destdir,
buffer,
sizeof(buffer),
static_cast<int32_t>(sizeof(buffer)),
entry + uprv_strlen(entry),
sizeof(entry) - uprv_strlen(entry),
static_cast<int32_t>(sizeof(entry) - uprv_strlen(entry)),
".c",
optFilename);
@ -679,7 +679,7 @@ getOutFilename(
outFilenameBuilder.append(destdir, status);
outFilenameBuilder.ensureEndsWithFileSeparator(status);
} else {
outFilenameBuilder.append(inFilename, basename - inFilename, status);
outFilenameBuilder.append(inFilename, static_cast<int32_t>(basename - inFilename), status);
}
inFilename=basename;