diff options
| author |   Elliott Hughes <enh@google.com> | 2024-06-17 18:22:40 +0000 |
|---|---|---|
| committer |   Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-06-17 18:22:40 +0000 |
| commit | 625cc6599807aa1e3e369334de3bd27ba4c70a29 (patch) | |
| tree | 053ac7f242e7bb4a97f64a1b88b8b3fd18247f59 | |
| parent | 1464c7a30d6addbcbc4088992c8e60395502e804 (diff) | |
| parent | 675512ab0c19a0a70c6073e54d0289eea03c2673 (diff) | |
| download | latinime-625cc6599807aa1e3e369334de3bd27ba4c70a29.tar.gz latinime-625cc6599807aa1e3e369334de3bd27ba4c70a29.tar.xz latinime-625cc6599807aa1e3e369334de3bd27ba4c70a29.zip | |
Merge "Use the global default cpp_std." into main am: 675512ab0c
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/3112039
Change-Id: Icdcebcb8224236953d871fd135e7f96ea506c4b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | native/dicttoolkit/Android.bp | 1 | ||||
| -rw-r--r-- | native/dicttoolkit/tests/utils/utf8_utils_test.cpp | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/native/dicttoolkit/Android.bp b/native/dicttoolkit/Android.bp index 6560d654a..4ae250fa2 100644 --- a/native/dicttoolkit/Android.bp +++ b/native/dicttoolkit/Android.bp @@ -24,7 +24,6 @@ package { cc_defaults { name: "dicttoolkit_defaults", - cpp_std: "gnu++17", cflags: [ "-Werror", "-Wall", diff --git a/native/dicttoolkit/tests/utils/utf8_utils_test.cpp b/native/dicttoolkit/tests/utils/utf8_utils_test.cpp index 9c59a8b05..18fa2f4bf 100644 --- a/native/dicttoolkit/tests/utils/utf8_utils_test.cpp +++ b/native/dicttoolkit/tests/utils/utf8_utils_test.cpp @@ -40,7 +40,7 @@ TEST(Utf8UtilsTests, TestGetCodePoints) { EXPECT_EQ('t', codePoints[3]); } { - const std::vector<int> codePoints = Utf8Utils::getCodePoints(u8"\u3042a\u03C2\u0410"); + const std::vector<int> codePoints = Utf8Utils::getCodePoints("\u3042a\u03C2\u0410"); EXPECT_EQ(4u, codePoints.size()); EXPECT_EQ(0x3042, codePoints[0]); // HIRAGANA LETTER A EXPECT_EQ('a', codePoints[1]); @@ -48,7 +48,7 @@ TEST(Utf8UtilsTests, TestGetCodePoints) { EXPECT_EQ(0x0410, codePoints[3]); // GREEK SMALL LETTER FINAL SIGMA } { - const std::vector<int> codePoints = Utf8Utils::getCodePoints(u8"\U0001F36A?\U0001F752"); + const std::vector<int> codePoints = Utf8Utils::getCodePoints("\U0001F36A?\U0001F752"); EXPECT_EQ(3u, codePoints.size()); EXPECT_EQ(0x1F36A, codePoints[0]); // COOKIE EXPECT_EQ('?', codePoints[1]); @@ -75,7 +75,7 @@ TEST(Utf8UtilsTests, TestGetUtf8String) { 0x1F36A /* COOKIE */, 0x1F752 /* ALCHEMICAL SYMBOL FOR STARRED TRIDENT */ }; - EXPECT_EQ(u8"\u00E0\u03C2\u0430\u3042\U0001F36A\U0001F752", + EXPECT_EQ("\u00E0\u03C2\u0430\u3042\U0001F36A\U0001F752", Utf8Utils::getUtf8String(CodePointArrayView(codePoints))); } } |