summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorFernando S <fsahmkow27@gmail.com>2023-12-20 18:46:08 +0100
committerGitHub <noreply@github.com>2023-12-20 18:46:08 +0100
commitf1cb14eb54949ead773b5bf0ed532349b34ae98a (patch)
tree02b95a02176962773bdc607c412b1a6da15f3270 /src/core
parentMerge pull request #12409 from liamwhite/bits-and-bytes (diff)
parentnce: hide shadowing warnings from dynarmic headers (diff)
downloadyuzu-f1cb14eb54949ead773b5bf0ed532349b34ae98a.tar
yuzu-f1cb14eb54949ead773b5bf0ed532349b34ae98a.tar.gz
yuzu-f1cb14eb54949ead773b5bf0ed532349b34ae98a.tar.bz2
yuzu-f1cb14eb54949ead773b5bf0ed532349b34ae98a.tar.lz
yuzu-f1cb14eb54949ead773b5bf0ed532349b34ae98a.tar.xz
yuzu-f1cb14eb54949ead773b5bf0ed532349b34ae98a.tar.zst
yuzu-f1cb14eb54949ead773b5bf0ed532349b34ae98a.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/arm/nce/interpreter_visitor.cpp2
-rw-r--r--src/core/arm/nce/visitor_base.h6
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 {