utils [fix] MSVC build

bigunclemax · bigunclemax · commit 4841b85e4dc1 · 2021-06-28T16:59:30.000+03:00
diff --git a/utils/utils.h b/utils/utils.h
@@ -86,7 +86,7 @@ namespace FTUtils {
         const wchar_t* from_next;
         char* to_next;
         const converter_type::result result = converter.out(state, ws.data(), ws.data() + ws.length(), from_next, &to[0], &to[0] + to.size(), to_next);
-        if (result == converter_type::ok or result == converter_type::noconv) {
+        if (result == converter_type::ok || result == converter_type::noconv) {
             return std::string (&to[0], to_next);
         }
         throw std::runtime_error("WString converting error");

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ namespace FTUtils {`
`86`	`86`	`const wchar_t* from_next;`
`87`	`87`	`char* to_next;`
`88`	`88`	`const converter_type::result result = converter.out(state, ws.data(), ws.data() + ws.length(), from_next, &to[0], &to[0] + to.size(), to_next);`
`89`		`- if (result == converter_type::ok or result == converter_type::noconv) {`
	`89`	`+ if (result == converter_type::ok \|\| result == converter_type::noconv) {`
`90`	`90`	`return std::string (&to[0], to_next);`
`91`	`91`	`}`
`92`	`92`	`throw std::runtime_error("WString converting error");`