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

ICU-22356 Use ConstChar16Ptr to safely cast from UChar* to char16_t*.

Browse source 
This is necessary for this header file to be usable by clients that
define UCHAR_TYPE as a type not compatible with char16_t, eg. uint16_t.
This commit is contained in:
Fredrik Roubert 2023-04-18 23:39:28 +02:00 • committed by Fredrik Roubert
parent ec3aef8fec
commit 4fd9d6ce9a
5 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
icu4c/source/common/unicode/ures.h
View file

@ -25,6 +25,7 @@
#ifndef URES_H
#define URES_H
#include "unicode/char16ptr.h"
#include "unicode/utypes.h"
#include "unicode/uloc.h"
@ -812,7 +813,7 @@ inline UnicodeString
ures_getUnicodeString(const UResourceBundle *resB, UErrorCode* status) {
UnicodeString result;
int32_t len = 0;
const char16_t *r = ures_getString(resB, &len, status);
const char16_t *r = ConstChar16Ptr(ures_getString(resB, &len, status));
if(U_SUCCESS(*status)) {
result.setTo(true, r, len);
} else {
@ -837,7 +838,7 @@ inline UnicodeString
ures_getNextUnicodeString(UResourceBundle *resB, const char ** key, UErrorCode* status) {
UnicodeString result;
int32_t len = 0;
const char16_t* r = ures_getNextString(resB, &len, key, status);
const char16_t* r = ConstChar16Ptr(ures_getNextString(resB, &len, key, status));
if(U_SUCCESS(*status)) {
result.setTo(true, r, len);
} else {
@ -859,7 +860,7 @@ inline UnicodeString
ures_getUnicodeStringByIndex(const UResourceBundle *resB, int32_t indexS, UErrorCode* status) {
UnicodeString result;
int32_t len = 0;
const char16_t* r = ures_getStringByIndex(resB, indexS, &len, status);
const char16_t* r = ConstChar16Ptr(ures_getStringByIndex(resB, indexS, &len, status));
if(U_SUCCESS(*status)) {
result.setTo(true, r, len);
} else {
@ -882,7 +883,7 @@ inline UnicodeString
ures_getUnicodeStringByKey(const UResourceBundle *resB, const char* key, UErrorCode* status) {
UnicodeString result;
int32_t len = 0;
const char16_t* r = ures_getStringByKey(resB, key, &len, status);
const char16_t* r = ConstChar16Ptr(ures_getStringByKey(resB, key, &len, status));
if(U_SUCCESS(*status)) {
result.setTo(true, r, len);
} else {

2
icu4c/source/test/intltest/Makefile.in
View file

@ -70,7 +70,7 @@ numbertest_parse.o numbertest_doubleconversion.o numbertest_skeletons.o \
static_unisets_test.o numfmtdatadriventest.o numbertest_range.o erarulestest.o \
formattedvaluetest.o formatted_string_builder_test.o numbertest_permutation.o \
units_data_test.o units_router_test.o units_test.o displayoptions_test.o \
numbertest_simple.o
numbertest_simple.o uchar_type_build_test.o
DEPS = $(OBJECTS:.o=.d)

1
icu4c/source/test/intltest/intltest.vcxproj
View file

@ -291,6 +291,7 @@
<ClCompile Include="units_data_test.cpp" />
<ClCompile Include="units_router_test.cpp" />
<ClCompile Include="units_test.cpp" />
<ClCompile Include="uchar_type_build_test.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="colldata.h" />

3
icu4c/source/test/intltest/intltest.vcxproj.filters
View file

@ -568,6 +568,9 @@
<ClCompile Include="units_test.cpp">
<Filter>formatting</Filter>
</ClCompile>
<ClCompile Include="uchar_type_build_test.cpp">
<Filter>configuration</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="itrbbi.h">

7
icu4c/source/test/intltest/uchar_type_build_test.cpp Normal file
View file

@ -0,0 +1,7 @@
// © 2023 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
// ICU-22356 Test that client code can be built with UCHAR_TYPE redefined.
#undef UCHAR_TYPE
#define UCHAR_TYPE uint16_t
#include "unicode/ures.h"