diff options
| author |  bunnei | 2018-10-03 18:44:51 -0400 |
|---|---|---|
| committer |  GitHub | 2018-10-03 18:44:51 -0400 |
| commit | 137d43fa2f8060ee9052f7541a34b900ecbc7ff0 (patch) | |
| tree | 3927c204eda84d63db274f615b7c69137f12dc9c /src/common/file_util.h | |
| parent | Merge pull request #1435 from lioncash/xci (diff) | |
| parent | string_util: unify UTF8<->UTF16 conversion to codecvt (diff) | |
| download | yuzu-137d43fa2f8060ee9052f7541a34b900ecbc7ff0.tar.gz yuzu-137d43fa2f8060ee9052f7541a34b900ecbc7ff0.tar.xz yuzu-137d43fa2f8060ee9052f7541a34b900ecbc7ff0.zip | |
Merge pull request #1426 from FearlessTobi/port-4253
Port citra-emu/citra#4253: "common/string_util cleanup"
Diffstat (limited to 'src/common/file_util.h')
| -rw-r--r-- | src/common/file_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/file_util.h b/src/common/file_util.h index 3d8fe6264..571503d2a 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h | |||
| @@ -285,7 +285,7 @@ private: | |||
| 285 | template <typename T> | 285 | template <typename T> |
| 286 | void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmode openmode) { | 286 | void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmode openmode) { |
| 287 | #ifdef _MSC_VER | 287 | #ifdef _MSC_VER |
| 288 | fstream.open(Common::UTF8ToTStr(filename).c_str(), openmode); | 288 | fstream.open(Common::UTF8ToUTF16W(filename).c_str(), openmode); |
| 289 | #else | 289 | #else |
| 290 | fstream.open(filename.c_str(), openmode); | 290 | fstream.open(filename.c_str(), openmode); |
| 291 | #endif | 291 | #endif |