diff options
| author |  bunnei | 2016-04-04 21:55:08 -0400 |
|---|---|---|
| committer | bunnei | 2016-04-04 21:55:08 -0400 |
| commit | b39340849631f565cf5c32bfdbab9fdc0bd4db9d (patch) | |
| tree | 8112be75d7f65ced275221040231a0ca1ae4f415 /src/common/string_util.h | |
| parent | Merge pull request #1640 from lioncash/cpp14 (diff) | |
| parent | remove debug code (diff) | |
| download | yuzu-b39340849631f565cf5c32bfdbab9fdc0bd4db9d.tar.gz yuzu-b39340849631f565cf5c32bfdbab9fdc0bd4db9d.tar.xz yuzu-b39340849631f565cf5c32bfdbab9fdc0bd4db9d.zip | |
Merge pull request #1620 from LFsWang/path
Fix filename&path encode problem on Windows
Diffstat (limited to 'src/common/string_util.h')
| -rw-r--r-- | src/common/string_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/string_util.h b/src/common/string_util.h index c5c474c6f..89d9f133e 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h | |||
| @@ -95,7 +95,7 @@ std::string CP1252ToUTF8(const std::string& str); | |||
| 95 | std::string SHIFTJISToUTF8(const std::string& str); | 95 | std::string SHIFTJISToUTF8(const std::string& str); |
| 96 | 96 | ||
| 97 | #ifdef _WIN32 | 97 | #ifdef _WIN32 |
| 98 | 98 | std::string UTF16ToUTF8(const std::wstring& input); | |
| 99 | std::wstring UTF8ToUTF16W(const std::string& str); | 99 | std::wstring UTF8ToUTF16W(const std::string& str); |
| 100 | 100 | ||
| 101 | #ifdef _UNICODE | 101 | #ifdef _UNICODE |