Browse Source
Merge pull request #3682 from lioncash/uam
gl_query_cache: Resolve use-after-move in CachedQuery move assignment operator
pull/15/merge
bunnei
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
1 deletions
-
src/video_core/renderer_opengl/gl_query_cache.cpp
|
|
@ -94,9 +94,9 @@ CachedQuery::CachedQuery(CachedQuery&& rhs) noexcept |
|
|
: VideoCommon::CachedQueryBase<HostCounter>(std::move(rhs)), cache{rhs.cache}, type{rhs.type} {} |
|
|
: VideoCommon::CachedQueryBase<HostCounter>(std::move(rhs)), cache{rhs.cache}, type{rhs.type} {} |
|
|
|
|
|
|
|
|
CachedQuery& CachedQuery::operator=(CachedQuery&& rhs) noexcept { |
|
|
CachedQuery& CachedQuery::operator=(CachedQuery&& rhs) noexcept { |
|
|
VideoCommon::CachedQueryBase<HostCounter>::operator=(std::move(rhs)); |
|
|
|
|
|
cache = rhs.cache; |
|
|
cache = rhs.cache; |
|
|
type = rhs.type; |
|
|
type = rhs.type; |
|
|
|
|
|
CachedQueryBase<HostCounter>::operator=(std::move(rhs)); |
|
|
return *this; |
|
|
return *this; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
