From 54a00ee4cfdc9f9cd0985d10c4f3a822a284d997 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Thu, 13 Feb 2020 15:31:37 -0300 Subject: query_cache: Fix ambiguity in CacheAddr getter --- src/video_core/query_cache.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.h index 86f5aade1..a040858e8 100644 --- a/src/video_core/query_cache.h +++ b/src/video_core/query_cache.h @@ -172,7 +172,7 @@ private: const u64 addr_begin = static_cast(addr); const u64 addr_end = addr_begin + static_cast(size); const auto in_range = [addr_begin, addr_end](CachedQuery& query) { - const u64 cache_begin = query.CacheAddr(); + const u64 cache_begin = query.GetCacheAddr(); const u64 cache_end = cache_begin + query.SizeInBytes(); return cache_begin < addr_end && addr_begin < cache_end; }; @@ -212,8 +212,9 @@ private: return nullptr; } auto& contents = it->second; - const auto found = std::find_if(std::begin(contents), std::end(contents), - [addr](auto& query) { return query.CacheAddr() == addr; }); + const auto found = + std::find_if(std::begin(contents), std::end(contents), + [addr](auto& query) { return query.GetCacheAddr() == addr; }); return found != std::end(contents) ? &*found : nullptr; } @@ -326,7 +327,7 @@ public: return cpu_addr; } - CacheAddr CacheAddr() const noexcept { + CacheAddr GetCacheAddr() const noexcept { return ToCacheAddr(host_ptr); } -- cgit v1.2.3