diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-06-20 01:02:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-06-20 01:02:22 +0300 |
| commit | 132ee3146d10b6e6a860bfd7e03b5a8667f2a44b (patch) | |
| tree | 0ef5bab643e4571ca77f4b4fa53276410edc0af2 /src/input | |
| parent | 5d8285ae8d16b40cf842f2bafd41978e316ac9b8 (diff) | |
| download | manaplus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.gz manaplus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.bz2 manaplus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.xz manaplus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.zip | |
Prevent Wshadow varnings in SDL code.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/inputmanager.h | 3 | ||||
| -rw-r--r-- | src/input/joystick.cpp | 3 | ||||
| -rw-r--r-- | src/input/joystick.h | 3 | ||||
| -rw-r--r-- | src/input/keyboardconfig.h | 3 |
4 files changed, 12 insertions, 0 deletions
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 <list> +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #include <SDL_events.h> +#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 <SDL.h> +#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 <SDL_events.h> +#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 <SDL_events.h> +#pragma GCC diagnostic pop #include "sdlshared.h" |