diff options
| author | 2020-04-17 01:24:08 -0400 | |
|---|---|---|
| committer | 2020-04-17 01:24:08 -0400 | |
| commit | ca3af2961c5fcda9d3ef4938505bd148856e8176 (patch) | |
| tree | 9a741f6e7aa76b45e0acb6b8f7095f8dad4b3d93 /src | |
| parent | Merge pull request #3671 from lioncash/switch (diff) | |
| parent | gl_query_cache: Resolve use-after-move in CachedQuery move assignment operator (diff) | |
| download | yuzu-ca3af2961c5fcda9d3ef4938505bd148856e8176.tar.gz yuzu-ca3af2961c5fcda9d3ef4938505bd148856e8176.tar.xz yuzu-ca3af2961c5fcda9d3ef4938505bd148856e8176.zip | |
Merge pull request #3682 from lioncash/uam
gl_query_cache: Resolve use-after-move in CachedQuery move assignment operator
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_query_cache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/renderer_opengl/gl_query_cache.cpp b/src/video_core/renderer_opengl/gl_query_cache.cpp index f12e9f55f..d7ba57aca 100644 --- a/src/video_core/renderer_opengl/gl_query_cache.cpp +++ b/src/video_core/renderer_opengl/gl_query_cache.cpp | |||
| @@ -94,9 +94,9 @@ CachedQuery::CachedQuery(CachedQuery&& rhs) noexcept | |||
| 94 | : VideoCommon::CachedQueryBase<HostCounter>(std::move(rhs)), cache{rhs.cache}, type{rhs.type} {} | 94 | : VideoCommon::CachedQueryBase<HostCounter>(std::move(rhs)), cache{rhs.cache}, type{rhs.type} {} |
| 95 | 95 | ||
| 96 | CachedQuery& CachedQuery::operator=(CachedQuery&& rhs) noexcept { | 96 | CachedQuery& CachedQuery::operator=(CachedQuery&& rhs) noexcept { |
| 97 | VideoCommon::CachedQueryBase<HostCounter>::operator=(std::move(rhs)); | ||
| 98 | cache = rhs.cache; | 97 | cache = rhs.cache; |
| 99 | type = rhs.type; | 98 | type = rhs.type; |
| 99 | CachedQueryBase<HostCounter>::operator=(std::move(rhs)); | ||
| 100 | return *this; | 100 | return *this; |
| 101 | } | 101 | } |
| 102 | 102 | ||