diff options
| author | 2020-12-06 22:33:00 -0800 | |
|---|---|---|
| committer | 2020-12-06 22:33:00 -0800 | |
| commit | a58d57a60de0301e80bb0fc459bd4aa3ea87bcd9 (patch) | |
| tree | 5b4c28125911163694b184903ff914eb0b34e79a /src | |
| parent | Merge pull request #5154 from comex/xx-ipc (diff) | |
| parent | core: Mark unused fields as [[maybe_unused]] (diff) | |
| download | yuzu-a58d57a60de0301e80bb0fc459bd4aa3ea87bcd9.tar.gz yuzu-a58d57a60de0301e80bb0fc459bd4aa3ea87bcd9.tar.xz yuzu-a58d57a60de0301e80bb0fc459bd4aa3ea87bcd9.zip | |
Merge pull request #5148 from comex/xx-unused-fields
core: Mark unused fields as [[maybe_unused]]
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/memory/memory_block_manager.h | 4 | ||||
| -rw-r--r-- | src/core/hle/service/ncm/ncm.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/memory/memory_block_manager.h b/src/core/hle/kernel/memory/memory_block_manager.h index 6e1d41075..f57d1bbcc 100644 --- a/src/core/hle/kernel/memory/memory_block_manager.h +++ b/src/core/hle/kernel/memory/memory_block_manager.h | |||
| @@ -57,8 +57,8 @@ public: | |||
| 57 | private: | 57 | private: |
| 58 | void MergeAdjacent(iterator it, iterator& next_it); | 58 | void MergeAdjacent(iterator it, iterator& next_it); |
| 59 | 59 | ||
| 60 | const VAddr start_addr; | 60 | [[maybe_unused]] const VAddr start_addr; |
| 61 | const VAddr end_addr; | 61 | [[maybe_unused]] const VAddr end_addr; |
| 62 | 62 | ||
| 63 | MemoryBlockTree memory_block_tree; | 63 | MemoryBlockTree memory_block_tree; |
| 64 | }; | 64 | }; |
diff --git a/src/core/hle/service/ncm/ncm.cpp b/src/core/hle/service/ncm/ncm.cpp index b8d627ca8..2dcda16f6 100644 --- a/src/core/hle/service/ncm/ncm.cpp +++ b/src/core/hle/service/ncm/ncm.cpp | |||
| @@ -45,7 +45,7 @@ public: | |||
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | private: | 47 | private: |
| 48 | FileSys::StorageId storage; | 48 | [[maybe_unused]] FileSys::StorageId storage; |
| 49 | }; | 49 | }; |
| 50 | 50 | ||
| 51 | class IRegisteredLocationResolver final : public ServiceFramework<IRegisteredLocationResolver> { | 51 | class IRegisteredLocationResolver final : public ServiceFramework<IRegisteredLocationResolver> { |