summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorLC <mathew1800@gmail.com>2020-12-07 06:06:53 +0100
committerGitHub <noreply@github.com>2020-12-07 06:06:53 +0100
commit69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41 (patch)
tree9cc837fa8d085c5c483fd84239925870e44ba478 /src/core
parentMerge pull request #5155 from comex/xx-default (diff)
parentvideo_core: Resolve more variable shadowing scenarios pt.3 (diff)
downloadyuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar
yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.gz
yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.bz2
yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.lz
yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.xz
yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.zst
yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.zip
Diffstat (limited to '')
-rw-r--r--src/core/file_sys/vfs_vector.h12
-rw-r--r--src/core/hle/kernel/memory/memory_block.h6
2 files changed, 9 insertions, 9 deletions
diff --git a/src/core/file_sys/vfs_vector.h b/src/core/file_sys/vfs_vector.h
index 95d3da2f2..c214db422 100644
--- a/src/core/file_sys/vfs_vector.h
+++ b/src/core/file_sys/vfs_vector.h
@@ -17,9 +17,9 @@ namespace FileSys {
template <std::size_t size>
class ArrayVfsFile : public VfsFile {
public:
- explicit ArrayVfsFile(const std::array<u8, size>& data, std::string name = "",
- VirtualDir parent = nullptr)
- : data(data), name(std::move(name)), parent(std::move(parent)) {}
+ explicit ArrayVfsFile(const std::array<u8, size>& data_, std::string name_ = "",
+ VirtualDir parent_ = nullptr)
+ : data(data_), name(std::move(name_)), parent(std::move(parent_)) {}
std::string GetName() const override {
return name;
@@ -51,12 +51,12 @@ public:
return read;
}
- std::size_t Write(const u8* data, std::size_t length, std::size_t offset) override {
+ std::size_t Write(const u8* data_, std::size_t length, std::size_t offset) override {
return 0;
}
- bool Rename(std::string_view name) override {
- this->name = name;
+ bool Rename(std::string_view new_name) override {
+ name = new_name;
return true;
}
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;