Merge pull request #12417 from liamwhite/arm64-gcc-fix

nce: hide shadowing warnings from dynarmic headers
2023-12-20 18:46:08 +01:00
parent f4f4a469a9 4b60aec190
commit f1cb14eb54
2 changed files with 6 additions and 2 deletions
--- 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>
--- 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 {