ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use 0 instead of NULL for comparison to char16_t

Browse source 
musl libc defines NULL as nullptr, which is explicitly allowed by
C++11.  nullptr_t cannot be implicitly cast to an integral type.
Use 0 instead.

Bug: 190084016
Test: m USE_HOST_MUSL=true host-native
Change-Id: I0c3b6c94cd69262f574414bf52494333f2f2645a
This commit is contained in:
Colin Cross 2022-01-13 13:39:06 -08:00
parent e060580c31
commit 02a3f958db
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libutils/Unicode_test.cpp
View file

@ -100,7 +100,7 @@ TEST_F(UnicodeTest, UTF8toUTF16Normal) {
0xF0, 0x90, 0x80, 0x80, // U+10000, 2 UTF-16 character
};
char16_t output[1 + 1 + 1 + 2 + 1]; // Room for NULL
char16_t output[1 + 1 + 1 + 2 + 1]; // Room for null
utf8_to_utf16(str, sizeof(str), output, sizeof(output) / sizeof(output[0]));
@ -114,8 +114,7 @@ TEST_F(UnicodeTest, UTF8toUTF16Normal) {
<< "should be first half of surrogate U+10000";
EXPECT_EQ(0xDC00, output[4])
<< "should be second half of surrogate U+10000";
EXPECT_EQ(NULL, output[5])
<< "should be NULL terminated";
EXPECT_EQ(0, output[5]) << "should be null terminated";
}
TEST_F(UnicodeTest, strstr16EmptyTarget) {