diff options
Diffstat (limited to 'common/strutils.h')
| -rw-r--r-- | common/strutils.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common/strutils.h b/common/strutils.h index 0c7a0e22..7eee0c1d 100644 --- a/common/strutils.h +++ b/common/strutils.h @@ -1,22 +1,22 @@ #ifndef AL_STRUTILS_H #define AL_STRUTILS_H +#include <optional> #include <string> -#include "aloptional.h" - #ifdef _WIN32 +#include <string_view> #include <wchar.h> -std::string wstr_to_utf8(const wchar_t *wstr); -std::wstring utf8_to_wstr(const char *str); +std::string wstr_to_utf8(std::wstring_view wstr); +std::wstring utf8_to_wstr(std::string_view str); #endif namespace al { -al::optional<std::string> getenv(const char *envname); +std::optional<std::string> getenv(const char *envname); #ifdef _WIN32 -al::optional<std::wstring> getenv(const wchar_t *envname); +std::optional<std::wstring> getenv(const wchar_t *envname); #endif } // namespace al |