Skip to content
Snippets Groups Projects
Commit 6565106e authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Use the global default cpp_std.

Bug: http://b/344590580
Change-Id: Icf1f9f5559596097e156aa9f1673a438741379b3
parent 974aaeb8
No related branches found
No related tags found
No related merge requests found
...@@ -24,7 +24,6 @@ package { ...@@ -24,7 +24,6 @@ package {
cc_defaults { cc_defaults {
name: "dicttoolkit_defaults", name: "dicttoolkit_defaults",
cpp_std: "gnu++17",
cflags: [ cflags: [
"-Werror", "-Werror",
"-Wall", "-Wall",
......
...@@ -40,7 +40,7 @@ TEST(Utf8UtilsTests, TestGetCodePoints) { ...@@ -40,7 +40,7 @@ TEST(Utf8UtilsTests, TestGetCodePoints) {
EXPECT_EQ('t', codePoints[3]); 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(4u, codePoints.size());
EXPECT_EQ(0x3042, codePoints[0]); // HIRAGANA LETTER A EXPECT_EQ(0x3042, codePoints[0]); // HIRAGANA LETTER A
EXPECT_EQ('a', codePoints[1]); EXPECT_EQ('a', codePoints[1]);
...@@ -48,7 +48,7 @@ TEST(Utf8UtilsTests, TestGetCodePoints) { ...@@ -48,7 +48,7 @@ TEST(Utf8UtilsTests, TestGetCodePoints) {
EXPECT_EQ(0x0410, codePoints[3]); // GREEK SMALL LETTER FINAL SIGMA 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(3u, codePoints.size());
EXPECT_EQ(0x1F36A, codePoints[0]); // COOKIE EXPECT_EQ(0x1F36A, codePoints[0]); // COOKIE
EXPECT_EQ('?', codePoints[1]); EXPECT_EQ('?', codePoints[1]);
...@@ -75,7 +75,7 @@ TEST(Utf8UtilsTests, TestGetUtf8String) { ...@@ -75,7 +75,7 @@ TEST(Utf8UtilsTests, TestGetUtf8String) {
0x1F36A /* COOKIE */, 0x1F36A /* COOKIE */,
0x1F752 /* ALCHEMICAL SYMBOL FOR STARRED TRIDENT */ 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))); Utf8Utils::getUtf8String(CodePointArrayView(codePoints)));
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment