diff options
| author | Mai <mathew1800@gmail.com> | 2022-06-14 21:08:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-14 21:08:58 -0400 |
| commit | 103997ee56ebec3f417e93ed42e3047d8005125b (patch) | |
| tree | 18b81c112665f830371408599ae157fc83936a70 /externals/microprofile/microprofile.h | |
| parent | c9de5474bfb7543a01337b73c33c4bf3b76e276e (diff) | |
| parent | 7620e1a631781b234b17cbbf7c5f7bd14d3115f9 (diff) | |
Merge pull request #8383 from Morph1984/shadow-of-the-past
yuzu: Make variable shadowing a compile-time error
Diffstat (limited to 'externals/microprofile/microprofile.h')
| -rw-r--r-- | externals/microprofile/microprofile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h index a06f6457d..639f3618c 100644 --- a/externals/microprofile/microprofile.h +++ b/externals/microprofile/microprofile.h @@ -1246,7 +1246,7 @@ struct MicroProfileScopeLock { bool bUseLock; std::recursive_mutex& m; - MicroProfileScopeLock(std::recursive_mutex& m) : bUseLock(g_bUseLock), m(m) + MicroProfileScopeLock(std::recursive_mutex& m_) : bUseLock(g_bUseLock), m(m_) { if(bUseLock) m.lock(); |