diff options
| author | 2014-12-19 22:16:34 -0500 | |
|---|---|---|
| committer | 2014-12-20 10:03:36 -0500 | |
| commit | e7956926147d2d2ac6741aee8a150466a5438ca3 (patch) | |
| tree | 8a06a500c34248c12fff47998131742c4ca72390 /src/core/file_sys | |
| parent | Merge pull request #309 from chinhodado/patch-1 (diff) | |
| download | yuzu-e7956926147d2d2ac6741aee8a150466a5438ca3.tar.gz yuzu-e7956926147d2d2ac6741aee8a150466a5438ca3.tar.xz yuzu-e7956926147d2d2ac6741aee8a150466a5438ca3.zip | |
Clean up some warnings
Diffstat (limited to 'src/core/file_sys')
| -rw-r--r-- | src/core/file_sys/archive_backend.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/core/file_sys/archive_backend.h b/src/core/file_sys/archive_backend.h index 18c314884..d7959b2ca 100644 --- a/src/core/file_sys/archive_backend.h +++ b/src/core/file_sys/archive_backend.h | |||
| @@ -143,7 +143,16 @@ public: | |||
| 143 | case Char: | 143 | case Char: |
| 144 | return std::vector<u8>(string.begin(), string.end()); | 144 | return std::vector<u8>(string.begin(), string.end()); |
| 145 | case Wchar: | 145 | case Wchar: |
| 146 | return std::vector<u8>(u16str.begin(), u16str.end()); | 146 | { |
| 147 | // use two u8 for each character of u16str | ||
| 148 | std::vector<u8> to_return(u16str.size() * 2); | ||
| 149 | for (size_t i = 0; i < u16str.size(); ++i) { | ||
| 150 | u16 tmp_char = u16str.at(i); | ||
| 151 | to_return[i*2] = (tmp_char & 0xFF00) >> 8; | ||
| 152 | to_return[i*2 + 1] = (tmp_char & 0x00FF); | ||
| 153 | } | ||
| 154 | return to_return; | ||
| 155 | } | ||
| 147 | case Empty: | 156 | case Empty: |
| 148 | return {}; | 157 | return {}; |
| 149 | default: | 158 | default: |