diff options
| author |   Elliott Hughes <enh@google.com> | 2024-06-03 19:14:14 +0000 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2024-06-03 19:14:14 +0000 |
| commit | 6565106eab92b08ca1cf23c6173afff7dd7861f2 (patch) | |
| tree | 1b80220e58ad98c3955882ade3dde28519ada6f8 | |
| parent | 974aaeb80e6dd5df6717865bbe85376e00921c85 (diff) | |
| download | latinime-6565106eab92b08ca1cf23c6173afff7dd7861f2.tar.gz latinime-6565106eab92b08ca1cf23c6173afff7dd7861f2.tar.xz latinime-6565106eab92b08ca1cf23c6173afff7dd7861f2.zip | |
Use the global default cpp_std.
Bug: http://b/344590580
Change-Id: Icf1f9f5559596097e156aa9f1673a438741379b3
Diffstat (limited to '')
| -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))); } } |