diff options
| author | LC <mathew1800@gmail.com> | 2020-12-07 00:06:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 00:06:53 -0500 |
| commit | 69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41 (patch) | |
| tree | 9cc837fa8d085c5c483fd84239925870e44ba478 /src/core/hle | |
| parent | 5933667cb83b690d029b9d5b646dc93f1ef4fda8 (diff) | |
| parent | f95602f15207851b849c57e2a2dd313a087b2493 (diff) | |
Merge pull request #5136 from lioncash/video-shadow3
video_core: Resolve more variable shadowing scenarios pt.3
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/kernel/memory/memory_block.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/memory/memory_block.h b/src/core/hle/kernel/memory/memory_block.h index 9d7839d08..37fe19916 100644 --- a/src/core/hle/kernel/memory/memory_block.h +++ b/src/core/hle/kernel/memory/memory_block.h @@ -222,9 +222,9 @@ public: public: constexpr MemoryBlock() = default; - constexpr MemoryBlock(VAddr addr, std::size_t num_pages, MemoryState state, - MemoryPermission perm, MemoryAttribute attribute) - : addr{addr}, num_pages(num_pages), state{state}, perm{perm}, attribute{attribute} {} + constexpr MemoryBlock(VAddr addr_, std::size_t num_pages_, MemoryState state_, + MemoryPermission perm_, MemoryAttribute attribute_) + : addr{addr_}, num_pages(num_pages_), state{state_}, perm{perm_}, attribute{attribute_} {} constexpr VAddr GetAddress() const { return addr; |