diff options
| author | 2014-11-28 23:08:18 -0500 | |
|---|---|---|
| committer | 2014-11-28 23:08:18 -0500 | |
| commit | 83c3d37cd01e6f8f63b5bc27ba5754fa6ed70360 (patch) | |
| tree | eb02a8d87c8b4ee109e23efa4f9e1ab92cfdb13c /src/core/mem_map_funcs.cpp | |
| parent | Merge pull request #223 from linkmauve/remove-thread (diff) | |
| parent | Fixed formatting and switch statement warnings (diff) | |
| download | yuzu-83c3d37cd01e6f8f63b5bc27ba5754fa6ed70360.tar.gz yuzu-83c3d37cd01e6f8f63b5bc27ba5754fa6ed70360.tar.xz yuzu-83c3d37cd01e6f8f63b5bc27ba5754fa6ed70360.zip | |
Merge pull request #227 from vaguilar/fix-warnings
Fixed formatting and switch statement warnings
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
| -rw-r--r-- | src/core/mem_map_funcs.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index 443d5ad7e..e8747840c 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp | |||
| @@ -92,7 +92,7 @@ inline void Read(T &var, const VAddr vaddr) { | |||
| 92 | var = *((const T*)&g_vram[vaddr & VRAM_MASK]); | 92 | var = *((const T*)&g_vram[vaddr & VRAM_MASK]); |
| 93 | 93 | ||
| 94 | } else { | 94 | } else { |
| 95 | ERROR_LOG(MEMMAP, "unknown Read%d @ 0x%08X", sizeof(var) * 8, vaddr); | 95 | ERROR_LOG(MEMMAP, "unknown Read%lu @ 0x%08X", sizeof(var) * 8, vaddr); |
| 96 | } | 96 | } |
| 97 | } | 97 | } |
| 98 | 98 | ||
| @@ -141,7 +141,7 @@ inline void Write(const VAddr vaddr, const T data) { | |||
| 141 | 141 | ||
| 142 | // Error out... | 142 | // Error out... |
| 143 | } else { | 143 | } else { |
| 144 | ERROR_LOG(MEMMAP, "unknown Write%d 0x%08X @ 0x%08X", sizeof(data) * 8, data, vaddr); | 144 | ERROR_LOG(MEMMAP, "unknown Write%lu 0x%08X @ 0x%08X", sizeof(data) * 8, (u32)data, vaddr); |
| 145 | } | 145 | } |
| 146 | } | 146 | } |
| 147 | 147 | ||