From 30dad180dd95191770e5ef1e29b096044b024c4f Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 9 Oct 2021 14:19:35 +1100 Subject: frontend: Fixed clone sorting; osd/strconv.cpp: The string_view treatment, and fixed a bug with to/from ANSI codepage. --- src/osd/strconv.h | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'src/osd/strconv.h') diff --git a/src/osd/strconv.h b/src/osd/strconv.h index 3843ee00f98..558987a167b 100644 --- a/src/osd/strconv.h +++ b/src/osd/strconv.h @@ -19,29 +19,29 @@ #if defined(_WIN32) +#include + #include -namespace osd -{ - namespace text - { - std::string to_astring(const std::string &s); - std::string to_astring(const char *s); - std::string &to_astring(std::string &dst, const std::string &s); - std::string &to_astring(std::string &dst, const char *s); - std::string from_astring(const std::string &s); - std::string from_astring(const CHAR *s); - std::string &from_astring(std::string &dst, const std::string &s); - std::string &from_astring(std::string &dst, const CHAR *s); - - std::wstring to_wstring(const std::string &s); - std::wstring to_wstring(const char *s); - std::wstring &to_wstring(std::wstring &dst, const std::string &s); - std::wstring &to_wstring(std::wstring &dst, const char *s); - std::string from_wstring(const std::wstring &s); - std::string from_wstring(const WCHAR *s); - std::string &from_wstring(std::string &dst, const std::wstring &s); - std::string &from_wstring(std::string &dst, const WCHAR *s); +namespace osd::text { + +std::string to_astring(std::string_view s); +std::string to_astring(const char *s); +std::string &to_astring(std::string &dst, std::string_view s); +std::string &to_astring(std::string &dst, const char *s); +std::string from_astring(const std::string_view s); +std::string from_astring(const CHAR *s); +std::string &from_astring(std::string &dst, std::string_view s); +std::string &from_astring(std::string &dst, const CHAR *s); + +std::wstring to_wstring(std::string_view s); +std::wstring to_wstring(const char *s); +std::wstring &to_wstring(std::wstring &dst, std::string_view s); +std::wstring &to_wstring(std::wstring &dst, const char *s); +std::string from_wstring(const std::wstring_view s); +std::string from_wstring(const WCHAR *s); +std::string &from_wstring(std::string &dst, std::wstring_view s); +std::string &from_wstring(std::string &dst, const WCHAR *s); #ifdef UNICODE typedef std::wstring tstring; @@ -53,8 +53,7 @@ typedef std::string tstring; #define from_tstring from_astring #endif // UNICODE - } -} +} // namespace osd::text #endif // defined(_WIN32) -- cgit v1.2.3-70-g09d2