summaryrefslogtreecommitdiff
path: root/src/core/hle
diff options
context:
space:
mode:
authorGravatar LC2020-12-07 00:06:53 -0500
committerGravatar GitHub2020-12-07 00:06:53 -0500
commit69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41 (patch)
tree9cc837fa8d085c5c483fd84239925870e44ba478 /src/core/hle
parentMerge pull request #5155 from comex/xx-default (diff)
parentvideo_core: Resolve more variable shadowing scenarios pt.3 (diff)
downloadyuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.gz
yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.xz
yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.zip
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.h6
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:
222 222
223public: 223public:
224 constexpr MemoryBlock() = default; 224 constexpr MemoryBlock() = default;
225 constexpr MemoryBlock(VAddr addr, std::size_t num_pages, MemoryState state, 225 constexpr MemoryBlock(VAddr addr_, std::size_t num_pages_, MemoryState state_,
226 MemoryPermission perm, MemoryAttribute attribute) 226 MemoryPermission perm_, MemoryAttribute attribute_)
227 : addr{addr}, num_pages(num_pages), state{state}, perm{perm}, attribute{attribute} {} 227 : addr{addr_}, num_pages(num_pages_), state{state_}, perm{perm_}, attribute{attribute_} {}
228 228
229 constexpr VAddr GetAddress() const { 229 constexpr VAddr GetAddress() const {
230 return addr; 230 return addr;