diff options
Diffstat (limited to 'src/osd/strconv.h')
-rw-r--r-- | src/osd/strconv.h | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/src/osd/strconv.h b/src/osd/strconv.h index f1eed54a49a..558987a167b 100644 --- a/src/osd/strconv.h +++ b/src/osd/strconv.h @@ -17,31 +17,31 @@ // FUNCTION PROTOTYPES //============================================================ -#if defined(WIN32) +#if defined(_WIN32) + +#include <string_view> #include <windows.h> -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,10 +53,9 @@ typedef std::string tstring; #define from_tstring from_astring #endif // UNICODE - } -} +} // namespace osd::text -#endif // defined(WIN32) +#endif // defined(_WIN32) #endif // MAME_OSD_STRCONV_H |