Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5136 from lioncash/video-shadow3

Browse source 
video_core: Resolve more variable shadowing scenarios pt.3
This commit is contained in:
LC 2020-12-07 00:06:53 -05:00 • committed by GitHub
commit 69af6ada2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
49 changed files with 303 additions and 290 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/scope_exit.h
View file

@ -10,7 +10,7 @@
namespace detail {
template <typename Func>
struct ScopeExitHelper {
explicit ScopeExitHelper(Func&& func) : func(std::move(func)) {}
explicit ScopeExitHelper(Func&& func_) : func(std::move(func_)) {}
~ScopeExitHelper() {
if (active) {
func();

4
src/common/telemetry.h
View file

@ -52,8 +52,8 @@ public:
template <typename T>
class Field : public FieldInterface {
public:
Field(FieldType type, std::string name, T value)
: name(std::move(name)), type(type), value(std::move(value)) {}
Field(FieldType type_, std::string name_, T value_)
: name(std::move(name_)), type(type_), value(std::move(value_)) {}
Field(const Field&) = default;
Field& operator=(const Field&) = default;