diff options
| author | 2020-12-05 11:40:14 -0500 | |
|---|---|---|
| committer | 2020-12-05 16:02:23 -0500 | |
| commit | f95602f15207851b849c57e2a2dd313a087b2493 (patch) | |
| tree | ed6122ab0a30de177acb2a59dffc8109232870ec /src/video_core/query_cache.h | |
| parent | Merge pull request #5133 from lioncash/video-shadow2 (diff) | |
| download | yuzu-f95602f15207851b849c57e2a2dd313a087b2493.tar.gz yuzu-f95602f15207851b849c57e2a2dd313a087b2493.tar.xz yuzu-f95602f15207851b849c57e2a2dd313a087b2493.zip | |
video_core: Resolve more variable shadowing scenarios pt.3
Cleans out the rest of the occurrences of variable shadowing and makes
any further occurrences of shadowing compiler errors.
Diffstat (limited to 'src/video_core/query_cache.h')
| -rw-r--r-- | src/video_core/query_cache.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.h index fc54ca0ef..203f2af05 100644 --- a/src/video_core/query_cache.h +++ b/src/video_core/query_cache.h | |||
| @@ -28,8 +28,8 @@ namespace VideoCommon { | |||
| 28 | template <class QueryCache, class HostCounter> | 28 | template <class QueryCache, class HostCounter> |
| 29 | class CounterStreamBase { | 29 | class CounterStreamBase { |
| 30 | public: | 30 | public: |
| 31 | explicit CounterStreamBase(QueryCache& cache, VideoCore::QueryType type) | 31 | explicit CounterStreamBase(QueryCache& cache_, VideoCore::QueryType type_) |
| 32 | : cache{cache}, type{type} {} | 32 | : cache{cache_}, type{type_} {} |
| 33 | 33 | ||
| 34 | /// Updates the state of the stream, enabling or disabling as needed. | 34 | /// Updates the state of the stream, enabling or disabling as needed. |
| 35 | void Update(bool enabled) { | 35 | void Update(bool enabled) { |
| @@ -334,8 +334,8 @@ private: | |||
| 334 | template <class HostCounter> | 334 | template <class HostCounter> |
| 335 | class CachedQueryBase { | 335 | class CachedQueryBase { |
| 336 | public: | 336 | public: |
| 337 | explicit CachedQueryBase(VAddr cpu_addr, u8* host_ptr) | 337 | explicit CachedQueryBase(VAddr cpu_addr_, u8* host_ptr_) |
| 338 | : cpu_addr{cpu_addr}, host_ptr{host_ptr} {} | 338 | : cpu_addr{cpu_addr_}, host_ptr{host_ptr_} {} |
| 339 | virtual ~CachedQueryBase() = default; | 339 | virtual ~CachedQueryBase() = default; |
| 340 | 340 | ||
| 341 | CachedQueryBase(CachedQueryBase&&) noexcept = default; | 341 | CachedQueryBase(CachedQueryBase&&) noexcept = default; |