Merge pull request #1948 from suconbu/feature/fix_builderror_mingw

MinGWのビルドエラーを修正する
sakura-editor · May 6, 2024 · db729fb · db729fb
2 parents 2547a04 + c99b200
commit db729fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tests/unittests/test-ccodebase.cpp b/tests/unittests/test-ccodebase.cpp
@@ -815,7 +815,7 @@ TEST(CCodeBase, Utf8ToHex)
 	EXPECT_STREQ(L"F09F9AB9", pCodeBase->CodeToHex(L"\U0001F6B9", sStatusbar).c_str());
 
 	// IVS(Ideographic Variation Sequence) 「葛󠄀」（葛󠄀城市の葛󠄀、下がヒ）
-	EXPECT_STREQ(L"E8919BF3A08480", pCodeBase->CodeToHex(L"葛󠄀", sStatusbar).c_str());
+	EXPECT_STREQ(L"E8919BF3A08480", pCodeBase->CodeToHex(L"\U0000845B\U000E0100"/*葛󠄀*/, sStatusbar).c_str());
 }
 
 /*!
@@ -855,8 +855,8 @@ TEST(CCodeBase, UnicodeToHex)
 	sStatusbar.m_bDispSPCodepoint = false;
 
 	sStatusbar.m_bDispSPCodepoint = true;
-	EXPECT_STREQ(L"845B, U+E0100", pCodeBase->CodeToHex(L"葛󠄀", sStatusbar).c_str());
+	EXPECT_STREQ(L"845B, U+E0100", pCodeBase->CodeToHex(L"\U0000845B\U000E0100"/*葛󠄀*/, sStatusbar).c_str());
 
 	sStatusbar.m_bDispSPCodepoint = false;
-	EXPECT_STREQ(L"845B, DB40DD00", pCodeBase->CodeToHex(L"葛󠄀", sStatusbar).c_str());
+	EXPECT_STREQ(L"845B, DB40DD00", pCodeBase->CodeToHex(L"\U0000845B\U000E0100"/*葛󠄀*/, sStatusbar).c_str());
 }
diff --git a/tests/unittests/test-cwordparse.cpp b/tests/unittests/test-cwordparse.cpp
@@ -143,7 +143,7 @@ TEST(WhatKindOfChar, SurrogatePairs)
 TEST(WhatKindOfChar, IVS)
 {
 //	EXPECT_EQ(CK_ETC, CWordParse::WhatKindOfChar(L"葛󠄀", 3, 0));
-	EXPECT_EQ(CK_ZEN_ETC, CWordParse::WhatKindOfChar(L"葛󠄀", 3, 0));
+	EXPECT_EQ(CK_ZEN_ETC, CWordParse::WhatKindOfChar(L"\U0000845B\U000E0100"/*葛󠄀*/, 3, 0));
 }
 
 TEST(WhatKindOfTwoChars, ReturnsSameKindIfTwoKindsAreIdentical)