Skip to content

Commit 6565106

Browse files
committed
Use the global default cpp_std.
Bug: http://b/344590580 Change-Id: Icf1f9f5559596097e156aa9f1673a438741379b3
1 parent 974aaeb commit 6565106

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

native/dicttoolkit/Android.bp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ package {
2424
cc_defaults {
2525
name: "dicttoolkit_defaults",
2626

27-
cpp_std: "gnu++17",
2827
cflags: [
2928
"-Werror",
3029
"-Wall",

native/dicttoolkit/tests/utils/utf8_utils_test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ TEST(Utf8UtilsTests, TestGetCodePoints) {
4040
EXPECT_EQ('t', codePoints[3]);
4141
}
4242
{
43-
const std::vector<int> codePoints = Utf8Utils::getCodePoints(u8"\u3042a\u03C2\u0410");
43+
const std::vector<int> codePoints = Utf8Utils::getCodePoints("\u3042a\u03C2\u0410");
4444
EXPECT_EQ(4u, codePoints.size());
4545
EXPECT_EQ(0x3042, codePoints[0]); // HIRAGANA LETTER A
4646
EXPECT_EQ('a', codePoints[1]);
4747
EXPECT_EQ(0x03C2, codePoints[2]); // CYRILLIC CAPITAL LETTER A
4848
EXPECT_EQ(0x0410, codePoints[3]); // GREEK SMALL LETTER FINAL SIGMA
4949
}
5050
{
51-
const std::vector<int> codePoints = Utf8Utils::getCodePoints(u8"\U0001F36A?\U0001F752");
51+
const std::vector<int> codePoints = Utf8Utils::getCodePoints("\U0001F36A?\U0001F752");
5252
EXPECT_EQ(3u, codePoints.size());
5353
EXPECT_EQ(0x1F36A, codePoints[0]); // COOKIE
5454
EXPECT_EQ('?', codePoints[1]);
@@ -75,7 +75,7 @@ TEST(Utf8UtilsTests, TestGetUtf8String) {
7575
0x1F36A /* COOKIE */,
7676
0x1F752 /* ALCHEMICAL SYMBOL FOR STARRED TRIDENT */
7777
};
78-
EXPECT_EQ(u8"\u00E0\u03C2\u0430\u3042\U0001F36A\U0001F752",
78+
EXPECT_EQ("\u00E0\u03C2\u0430\u3042\U0001F36A\U0001F752",
7979
Utf8Utils::getUtf8String(CodePointArrayView(codePoints)));
8080
}
8181
}

0 commit comments

Comments
 (0)