From 132ee3146d10b6e6a860bfd7e03b5a8667f2a44b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 20 Jun 2017 01:02:22 +0300 Subject: Prevent Wshadow varnings in SDL code. --- src/input/inputmanager.h | 3 +++ src/input/joystick.cpp | 3 +++ src/input/joystick.h | 3 +++ src/input/keyboardconfig.h | 3 +++ 4 files changed, 12 insertions(+) (limited to 'src/input') diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h index 8455ef9b0..f6627884e 100644 --- a/src/input/inputmanager.h +++ b/src/input/inputmanager.h @@ -29,7 +29,10 @@ #include +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #include +#pragma GCC diagnostic pop class Setup_Input; diff --git a/src/input/joystick.cpp b/src/input/joystick.cpp index 3ec317c8d..65f967838 100644 --- a/src/input/joystick.cpp +++ b/src/input/joystick.cpp @@ -31,7 +31,10 @@ #include "utils/timer.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #include +#pragma GCC diagnostic pop #include "debug.h" diff --git a/src/input/joystick.h b/src/input/joystick.h index 4088cc84c..19f028491 100644 --- a/src/input/joystick.h +++ b/src/input/joystick.h @@ -25,7 +25,10 @@ #include "events/inputevent.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #include +#pragma GCC diagnostic pop class Joystick final { diff --git a/src/input/keyboardconfig.h b/src/input/keyboardconfig.h index 789f8b4ef..c4fce5d17 100644 --- a/src/input/keyboardconfig.h +++ b/src/input/keyboardconfig.h @@ -25,7 +25,10 @@ #include "localconsts.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #include +#pragma GCC diagnostic pop #include "sdlshared.h" -- cgit v1.2.3-70-g09d2