diff options
| author | Fernando S <[email protected]> | 2023-12-20 18:46:08 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-12-20 18:46:08 +0100 |
| commit | f1cb14eb54949ead773b5bf0ed532349b34ae98a (patch) | |
| tree | 02b95a02176962773bdc607c412b1a6da15f3270 /src/core/arm | |
| parent | f4f4a469a9c3c68de91972dbec671edd1ef10e8e (diff) | |
| parent | 4b60aec190696c568383b35aa26a7c5cf88195b6 (diff) | |
| download | yuzu-android-f1cb14eb54949ead773b5bf0ed532349b34ae98a.tar.gz yuzu-android-f1cb14eb54949ead773b5bf0ed532349b34ae98a.zip | |
Merge pull request #12417 from liamwhite/arm64-gcc-fix
nce: hide shadowing warnings from dynarmic headers
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/nce/interpreter_visitor.cpp | 2 | ||||
| -rw-r--r-- | src/core/arm/nce/visitor_base.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/arm/nce/interpreter_visitor.cpp b/src/core/arm/nce/interpreter_visitor.cpp index ec373fdf2..def888d15 100644 --- a/src/core/arm/nce/interpreter_visitor.cpp +++ b/src/core/arm/nce/interpreter_visitor.cpp @@ -5,8 +5,6 @@ #include "common/bit_cast.h" #include "core/arm/nce/interpreter_visitor.h" -#include <dynarmic/frontend/A64/decoder/a64.h> - namespace Core { template <u32 BitSize> diff --git a/src/core/arm/nce/visitor_base.h b/src/core/arm/nce/visitor_base.h index 8fb032912..6a2be3d9b 100644 --- a/src/core/arm/nce/visitor_base.h +++ b/src/core/arm/nce/visitor_base.h @@ -4,9 +4,15 @@ #pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow" + #include <dynarmic/frontend/A64/a64_types.h> +#include <dynarmic/frontend/A64/decoder/a64.h> #include <dynarmic/frontend/imm.h> +#pragma GCC diagnostic pop + namespace Core { class VisitorBase { |