diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-06-20 03:06:00 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-06-20 04:04:40 +0300 |
| commit | 5e37f24550e133d985945bb008782df543e1f428 (patch) | |
| tree | d32657fab845823be6a75bc743bdf6e8a357bcaa /src/input | |
| parent | d3c69c839b180e1d22d5a89625322dfc6ae72785 (diff) | |
| download | manaverse-5e37f24550e133d985945bb008782df543e1f428.tar.gz manaverse-5e37f24550e133d985945bb008782df543e1f428.tar.bz2 manaverse-5e37f24550e133d985945bb008782df543e1f428.tar.xz manaverse-5e37f24550e133d985945bb008782df543e1f428.zip | |
Fix sdl warning hiding pragmas for old compilers.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/inputmanager.h | 6 | ||||
| -rw-r--r-- | src/input/joystick.cpp | 6 | ||||
| -rw-r--r-- | src/input/joystick.h | 6 | ||||
| -rw-r--r-- | src/input/keyboardconfig.h | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h index f6627884e..db61053b0 100644 --- a/src/input/inputmanager.h +++ b/src/input/inputmanager.h @@ -29,10 +29,10 @@ #include <list> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_events.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) class Setup_Input; diff --git a/src/input/joystick.cpp b/src/input/joystick.cpp index 65f967838..4ad887461 100644 --- a/src/input/joystick.cpp +++ b/src/input/joystick.cpp @@ -31,10 +31,10 @@ #include "utils/timer.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/input/joystick.h b/src/input/joystick.h index 19f028491..11e54f632 100644 --- a/src/input/joystick.h +++ b/src/input/joystick.h @@ -25,10 +25,10 @@ #include "events/inputevent.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_events.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) class Joystick final { diff --git a/src/input/keyboardconfig.h b/src/input/keyboardconfig.h index c4fce5d17..8691571ae 100644 --- a/src/input/keyboardconfig.h +++ b/src/input/keyboardconfig.h @@ -25,10 +25,10 @@ #include "localconsts.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_events.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "sdlshared.h" |