OrcLib: Fmt: std_error_code: remove dependency to Iconv.h

fabienfl-orc · fabienfl-orc · commit 3f9012bf25e4 · 2025-03-25T16:13:33.000+01:00
diff --git a/src/OrcLib/Text/Fmt/std_error_code.h b/src/OrcLib/Text/Fmt/std_error_code.h
@@ -13,8 +13,6 @@
 #include <fmt/format.h>
 #include <fmt/xchar.h>
 
-#include "Text/Iconv.h"
-
 template <>
 struct fmt::formatter<std::error_code> : public fmt::formatter<std::string_view>
 {
@@ -74,7 +72,9 @@ struct fmt::formatter<std::error_code, wchar_t> : public fmt::formatter<std::wst
                 message = message.substr(0, pos);
             }
 
-            const auto utf16 = Orc::ToUtf16(message);
+            // It is expected that ec.message() only return ansi character set
+            std::wstring utf16;
+            std::copy(std::cbegin(message), std::cend(message), std::back_inserter(utf16));
             fmt::format_to(std::back_inserter(s), L": {}", utf16);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@`
`13`	`13`	`#include <fmt/format.h>`
`14`	`14`	`#include <fmt/xchar.h>`
`15`	`15`
`16`		`-#include "Text/Iconv.h"`
`17`		`-`
`18`	`16`	`template <>`
`19`	`17`	`struct fmt::formatter<std::error_code> : public fmt::formatter<std::string_view>`
`20`	`18`	`{`
`@@ -74,7 +72,9 @@ struct fmt::formatter<std::error_code, wchar_t> : public fmt::formatter<std::wst`
`74`	`72`	`message = message.substr(0, pos);`
`75`	`73`	`}`
`76`	`74`
`77`		`- const auto utf16 = Orc::ToUtf16(message);`
	`75`	`+ // It is expected that ec.message() only return ansi character set`
	`76`	`+ std::wstring utf16;`
	`77`	`+ std::copy(std::cbegin(message), std::cend(message), std::back_inserter(utf16));`
`78`	`78`	`fmt::format_to(std::back_inserter(s), L": {}", utf16);`
`79`	`79`	`}`
`80`	`80`