diff options
| author | 2014-09-28 11:30:29 -0400 | |
|---|---|---|
| committer | 2014-09-28 11:44:14 -0400 | |
| commit | ca2f0de08abaffea419e674274113b27acdf6ece (patch) | |
| tree | 30bcdb7a6178ec37b97eac7929b8e92c0e9b0a1b /src/core | |
| parent | Merge pull request #118 from lioncash/chunk-file (diff) | |
| download | yuzu-ca2f0de08abaffea419e674274113b27acdf6ece.tar.gz yuzu-ca2f0de08abaffea419e674274113b27acdf6ece.tar.xz yuzu-ca2f0de08abaffea419e674274113b27acdf6ece.zip | |
Fix warnings in core and common
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/file_sys/file_sdmc.cpp | 2 | ||||
| -rw-r--r-- | src/core/mem_map_funcs.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/file_sys/file_sdmc.cpp b/src/core/file_sys/file_sdmc.cpp index 76adc6403..07951c9f1 100644 --- a/src/core/file_sys/file_sdmc.cpp +++ b/src/core/file_sys/file_sdmc.cpp | |||
| @@ -53,7 +53,7 @@ size_t File_SDMC::Write(const u64 offset, const u32 length, const u32 flush, con | |||
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | size_t File_SDMC::GetSize() const { | 55 | size_t File_SDMC::GetSize() const { |
| 56 | return file->GetSize(); | 56 | return static_cast<size_t>(file->GetSize()); |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | bool File_SDMC::Close() const { | 59 | bool File_SDMC::Close() const { |
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index f510df835..90951812b 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp | |||
| @@ -287,7 +287,7 @@ void Write64(const VAddr addr, const u64 data) { | |||
| 287 | } | 287 | } |
| 288 | 288 | ||
| 289 | void WriteBlock(const VAddr addr, const u8* data, const size_t size) { | 289 | void WriteBlock(const VAddr addr, const u8* data, const size_t size) { |
| 290 | int offset = 0; | 290 | u32 offset = 0; |
| 291 | while (offset < (size & ~3)) { | 291 | while (offset < (size & ~3)) { |
| 292 | Write32(addr + offset, *(u32*)&data[offset]); | 292 | Write32(addr + offset, *(u32*)&data[offset]); |
| 293 | offset += 4; | 293 | offset += 4; |