mirror of
https://github.com/yuzu-emu/yuzu-mainline
synced 2024-11-26 07:57:53 +00:00
Merge pull request #12417 from liamwhite/arm64-gcc-fix
nce: hide shadowing warnings from dynarmic headers
This commit is contained in:
commit
f1cb14eb54
2 changed files with 6 additions and 2 deletions
|
@ -5,8 +5,6 @@
|
||||||
#include "common/bit_cast.h"
|
#include "common/bit_cast.h"
|
||||||
#include "core/arm/nce/interpreter_visitor.h"
|
#include "core/arm/nce/interpreter_visitor.h"
|
||||||
|
|
||||||
#include <dynarmic/frontend/A64/decoder/a64.h>
|
|
||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
|
|
||||||
template <u32 BitSize>
|
template <u32 BitSize>
|
||||||
|
|
|
@ -4,9 +4,15 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wshadow"
|
||||||
|
|
||||||
#include <dynarmic/frontend/A64/a64_types.h>
|
#include <dynarmic/frontend/A64/a64_types.h>
|
||||||
|
#include <dynarmic/frontend/A64/decoder/a64.h>
|
||||||
#include <dynarmic/frontend/imm.h>
|
#include <dynarmic/frontend/imm.h>
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
|
|
||||||
class VisitorBase {
|
class VisitorBase {
|
||||||
|
|
Loading…
Reference in a new issue