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 | |
| parent | d3c69c839b180e1d22d5a89625322dfc6ae72785 (diff) | |
| download | manaplus-5e37f24550e133d985945bb008782df543e1f428.tar.gz manaplus-5e37f24550e133d985945bb008782df543e1f428.tar.bz2 manaplus-5e37f24550e133d985945bb008782df543e1f428.tar.xz manaplus-5e37f24550e133d985945bb008782df543e1f428.zip | |
Fix sdl warning hiding pragmas for old compilers.
Diffstat (limited to 'src')
97 files changed, 334 insertions, 327 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index 7aa42d6eb..f122a5c39 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -108,14 +108,14 @@ #include "utils/parameters.h" #include "utils/timer.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifdef ANDROID #ifndef USE_SDL2 #include <SDL_screenkeyboard.h> #endif // USE_OPENGL #endif // ANDROID -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include <sstream> diff --git a/src/actions/statusbar.cpp b/src/actions/statusbar.cpp index 5511876ad..0d5ba68cd 100644 --- a/src/actions/statusbar.cpp +++ b/src/actions/statusbar.cpp @@ -39,14 +39,14 @@ #include "utils/gettext.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifdef ANDROID #ifndef USE_SDL2 #include <SDL_screenkeyboard.h> #endif // USE_SDL2 #endif // ANDROID -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/being/compoundsprite.cpp b/src/being/compoundsprite.cpp index 594c5ff2a..f8738b44e 100644 --- a/src/being/compoundsprite.cpp +++ b/src/being/compoundsprite.cpp @@ -47,12 +47,12 @@ #include "utils/timer.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #endif // USE_SDL2 #include "debug.h" diff --git a/src/client.cpp b/src/client.cpp index 68fdeaca9..ed7efa69c 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -168,20 +168,20 @@ #endif // USE_OPENGL #ifdef WIN32 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_syswm.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "fs/specialfolder.h" #undef ERROR #endif // WIN32 #ifdef ANDROID #ifndef USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_screenkeyboard.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include <fstream> #endif // USE_SDL2 #endif // ANDROID @@ -192,14 +192,14 @@ #include "mumblemanager.h" #endif // USE_MUMBLE -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifdef USE_SDL2 #include <SDL2_framerate.h> #else // USE_SDL2 #include <SDL_framerate.h> #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/defaults.cpp b/src/defaults.cpp index 9d18e4bcf..a7c1365a9 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -39,10 +39,10 @@ #include "const/net/net.h" #ifndef USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_keyboard.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #endif // USE_SDL2 #include "debug.h" diff --git a/src/dirs.cpp b/src/dirs.cpp index 6b6fe4a8c..80ad3242f 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -53,10 +53,10 @@ #endif // __APPLE__ #ifdef WIN32 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_syswm.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "fs/specialfolder.h" #undef ERROR #endif // WIN32 diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp index 912494b99..0a03c4c68 100644 --- a/src/dyetool/client.cpp +++ b/src/dyetool/client.cpp @@ -78,10 +78,10 @@ #include "net/ipc.h" #ifdef WIN32 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_syswm.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include <sys/time.h> #include "fs/specialfolder.h" #undef ERROR @@ -89,22 +89,22 @@ #ifdef ANDROID #ifndef USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_screenkeyboard.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include <fstream> #endif // USE_SDL2 #endif // ANDROID -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifdef USE_SDL2 #include <SDL2_framerate.h> #else // USE_SDL2 #include <SDL_framerate.h> #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/dyetool/dyemain.cpp b/src/dyetool/dyemain.cpp index f23019bef..4caf4b94d 100644 --- a/src/dyetool/dyemain.cpp +++ b/src/dyetool/dyemain.cpp @@ -44,10 +44,10 @@ #include "resources/sdlimagehelper.h" #endif // USE_SDL2 -#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/eventsmanager.h b/src/eventsmanager.h index 63347e44f..02a118448 100644 --- a/src/eventsmanager.h +++ b/src/eventsmanager.h @@ -23,10 +23,10 @@ #include "listeners/configlistener.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 "localconsts.h" diff --git a/src/fs/paths.cpp b/src/fs/paths.cpp index db16d5475..22f227650 100644 --- a/src/fs/paths.cpp +++ b/src/fs/paths.cpp @@ -55,14 +55,14 @@ #include <pwd.h> #endif // WIN32 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifdef ANDROID #ifdef USE_SDL2 #include <SDL_system.h> #endif // USE_SDL2 #endif // ANDROID -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/fs/virtfs/fsdirrwops.cpp b/src/fs/virtfs/fsdirrwops.cpp index 14c6015f5..9527aaf5b 100644 --- a/src/fs/virtfs/fsdirrwops.cpp +++ b/src/fs/virtfs/fsdirrwops.cpp @@ -24,10 +24,10 @@ #include "fs/virtfs/file.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_rwops.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/fs/virtfs/fsziprwops.cpp b/src/fs/virtfs/fsziprwops.cpp index d744bdc73..3dbe7ece7 100644 --- a/src/fs/virtfs/fsziprwops.cpp +++ b/src/fs/virtfs/fsziprwops.cpp @@ -25,10 +25,10 @@ #include "fs/virtfs/file.h" #include "fs/virtfs/fsfuncs.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_rwops.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/fs/virtfs/rwops.cpp b/src/fs/virtfs/rwops.cpp index 03131e1db..e6a7a5914 100644 --- a/src/fs/virtfs/rwops.cpp +++ b/src/fs/virtfs/rwops.cpp @@ -52,10 +52,10 @@ #include "utils/fuzzer.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_rwops.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/fs/virtfs/virtfs1_unittest.cc b/src/fs/virtfs/virtfs1_unittest.cc index c5ca2736e..d098d5765 100644 --- a/src/fs/virtfs/virtfs1_unittest.cc +++ b/src/fs/virtfs/virtfs1_unittest.cc @@ -31,10 +31,10 @@ #include "utils/delete2.h" #include "utils/stringutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_rwops.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #ifndef UNITTESTS_CATCH #include <algorithm> diff --git a/src/fs/virtfs/zipreader.cpp b/src/fs/virtfs/zipreader.cpp index 4e81d24eb..4bbdd6af7 100644 --- a/src/fs/virtfs/zipreader.cpp +++ b/src/fs/virtfs/zipreader.cpp @@ -29,10 +29,10 @@ #include "utils/stringutils.h" #include <zlib.h> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_endian.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #if SDL_BYTEORDER == SDL_BIG_ENDIAN #include <byteswap.h> diff --git a/src/game.h b/src/game.h index 5ce913ac5..53b417a5d 100644 --- a/src/game.h +++ b/src/game.h @@ -29,10 +29,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) static const int MAX_LASTKEYS = 10; diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index c49b97c59..0cf99019e 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -29,10 +29,10 @@ #include <EGL/egl.h> #ifndef USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_android.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #endif // USE_SDL2 #elif defined(__native_client__) #include <GL/Regal.h> @@ -93,10 +93,10 @@ #include "render/renderers.h" #endif // USE_OPENGL -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_syswm.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h index 82ccfe193..495bd3fca 100644 --- a/src/graphicsmanager.h +++ b/src/graphicsmanager.h @@ -23,16 +23,18 @@ #ifdef USE_OPENGL +#include "localconsts.h" + #ifdef ANDROID #include <GLES/gl.h> #else // ANDROID #ifndef USE_SDL2 #define GL_GLEXT_PROTOTYPES 1 #endif // USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_opengl.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) // hack to hide warnings #undef GL_GLEXT_VERSION #undef GL_GLEXT_PROTOTYPES @@ -46,8 +48,6 @@ #include <set> -#include "localconsts.h" - class TestMain; struct FBOInfo; diff --git a/src/gui/fonts/font.h b/src/gui/fonts/font.h index 053167158..f4f30a8be 100644 --- a/src/gui/fonts/font.h +++ b/src/gui/fonts/font.h @@ -69,10 +69,10 @@ #include "gui/fonts/textchunklist.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_ttf.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "localconsts.h" diff --git a/src/gui/fonts/textchunk.h b/src/gui/fonts/textchunk.h index 2fe8c7adc..bbd50fdff 100644 --- a/src/gui/fonts/textchunk.h +++ b/src/gui/fonts/textchunk.h @@ -28,10 +28,10 @@ #include <string> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_ttf.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "localconsts.h" diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp index e74db48ca..6fc15dcbf 100644 --- a/src/gui/sdlinput.cpp +++ b/src/gui/sdlinput.cpp @@ -84,10 +84,10 @@ #include "render/graphics.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_timer.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h index 4ec2ee9bb..79a30758b 100644 --- a/src/gui/sdlinput.h +++ b/src/gui/sdlinput.h @@ -82,10 +82,10 @@ #include "input/keyinput.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) #ifdef USE_SDL2 #include "sdlshared.h" diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp index c0336b7e3..3a95dd712 100644 --- a/src/gui/windowmanager.cpp +++ b/src/gui/windowmanager.cpp @@ -65,8 +65,8 @@ #include "utils/naclmessages.h" #endif // __native_client__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifdef ANDROID #ifndef USE_SDL2 #include <SDL_screenkeyboard.h> @@ -84,7 +84,7 @@ #ifdef WIN32 #include <SDL_syswm.h> #endif // WIN32 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" 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" diff --git a/src/integrity_unittest.cc b/src/integrity_unittest.cc index 198fc8c48..a4cbc7c48 100644 --- a/src/integrity_unittest.cc +++ b/src/integrity_unittest.cc @@ -49,10 +49,10 @@ #include "utils/env.h" #include "utils/delete2.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_image.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #ifndef UNITTESTS_CATCH #include <algorithm> diff --git a/src/localconsts.h b/src/localconsts.h index 539989371..ef667dfd9 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -210,6 +210,12 @@ #define A_FALLTHROUGH #endif // ADVGCC +#if GCC_VERSION >= 48000 +#define PRAGMA48(str) _Pragma(#str) +#else // GCC_VERSION > 48000 +#define PRAGMA48(str) +#endif // GCC_VERSION > 48000 + #if GCC_VERSION >= 49000 #define PRAGMA49(str) _Pragma(#str) #else // GCC_VERSION > 49000 @@ -326,10 +332,10 @@ PRAGMA45(GCC diagnostic push) PRAGMA45(GCC diagnostic ignored "-Wswitch-default") #endif // USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_version.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #ifdef USE_SDL2 PRAGMA45(GCC diagnostic pop) #endif // USE_SDL2 diff --git a/src/logger.h b/src/logger.h index a05105b01..15b955795 100644 --- a/src/logger.h +++ b/src/logger.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_mutex.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include <fstream> #include <vector> diff --git a/src/main.cpp b/src/main.cpp index 951e6caac..1ec5bb586 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -23,10 +23,10 @@ #include "maingui.h" #ifdef WIN32 -#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) #endif // WIN32 #include "debug.h" diff --git a/src/maingui.cpp b/src/maingui.cpp index b2b8dd685..235d34df8 100644 --- a/src/maingui.cpp +++ b/src/maingui.cpp @@ -41,11 +41,11 @@ #include <iostream> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_image.h> #include <SDL_mixer.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #ifndef SDL_VERSIONNUM #error missing <SDL_version.h> diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp index d003cfbbb..5aa4f79f2 100644 --- a/src/mumblemanager.cpp +++ b/src/mumblemanager.cpp @@ -26,10 +26,10 @@ #include <unistd.h> #include <sys/types.h> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_syswm.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #ifndef WIN32 #include <sys/mman.h> diff --git a/src/net/eathena/messagein.cpp b/src/net/eathena/messagein.cpp index d472f8d92..a53748be0 100644 --- a/src/net/eathena/messagein.cpp +++ b/src/net/eathena/messagein.cpp @@ -29,12 +29,12 @@ #include "utils/stringutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/net/sdltcpnet.h b/src/net/sdltcpnet.h index 65433d0d4..daedb2b73 100644 --- a/src/net/sdltcpnet.h +++ b/src/net/sdltcpnet.h @@ -23,10 +23,10 @@ #include "localconsts.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_net.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) namespace TcpNet { diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp index a689046fb..845df01e3 100644 --- a/src/net/tmwa/messagein.cpp +++ b/src/net/tmwa/messagein.cpp @@ -29,12 +29,12 @@ #include "utils/stringutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/render/graphics.h b/src/render/graphics.h index 5311c7bc6..36f3ed721 100644 --- a/src/render/graphics.h +++ b/src/render/graphics.h @@ -75,14 +75,14 @@ #include "resources/mstack.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifdef USE_SDL2 #include <SDL_render.h> #else // USE_SDL2 #include <SDL_video.h> #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "localconsts.h" diff --git a/src/render/mobileopengl2graphics.h b/src/render/mobileopengl2graphics.h index b5490df84..3148c5fd7 100644 --- a/src/render/mobileopengl2graphics.h +++ b/src/render/mobileopengl2graphics.h @@ -39,10 +39,10 @@ #ifndef USE_SDL2 #define GL_GLEXT_PROTOTYPES 1 #endif // USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_opengl.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #if defined(__APPLE__) #include <OpenGL/glext.h> #elif !defined(__native_client__) diff --git a/src/render/mobileopenglgraphics.h b/src/render/mobileopenglgraphics.h index cdec3a0a5..7f4da86da 100644 --- a/src/render/mobileopenglgraphics.h +++ b/src/render/mobileopenglgraphics.h @@ -39,10 +39,10 @@ #ifndef USE_SDL2 #define GL_GLEXT_PROTOTYPES 1 #endif // USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_opengl.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #if defined(__APPLE__) #include <OpenGL/glext.h> #elif !defined(__native_client__) diff --git a/src/render/modernopenglgraphics.h b/src/render/modernopenglgraphics.h index e13925234..f20acab1b 100644 --- a/src/render/modernopenglgraphics.h +++ b/src/render/modernopenglgraphics.h @@ -39,10 +39,10 @@ #ifndef USE_SDL2 #define GL_GLEXT_PROTOTYPES 1 #endif // USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_opengl.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #if defined(__APPLE__) #include <OpenGL/glext.h> #elif !defined(__native_client__) diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h index 92422590f..ee7ecd9ce 100644 --- a/src/render/normalopenglgraphics.h +++ b/src/render/normalopenglgraphics.h @@ -39,10 +39,10 @@ #ifndef USE_SDL2 #define GL_GLEXT_PROTOTYPES 1 #endif // USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_opengl.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #if defined(__APPLE__) #include <OpenGL/glext.h> #elif !defined(__native_client__) diff --git a/src/render/nullopenglgraphics.h b/src/render/nullopenglgraphics.h index e968b1a4e..f496c0a35 100644 --- a/src/render/nullopenglgraphics.h +++ b/src/render/nullopenglgraphics.h @@ -39,10 +39,10 @@ #ifndef USE_SDL2 #define GL_GLEXT_PROTOTYPES 1 #endif // USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_opengl.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #if defined(__APPLE__) #include <OpenGL/glext.h> #elif !defined(__native_client__) diff --git a/src/render/opengl/mgltypes.h b/src/render/opengl/mgltypes.h index 84cea09d3..2e76451f8 100644 --- a/src/render/opengl/mgltypes.h +++ b/src/render/opengl/mgltypes.h @@ -28,13 +28,14 @@ #include <GLES/glext.h> #define APIENTRY GL_APIENTRY #else // ANDROID +#include "localconsts.h" #ifndef USE_SDL2 #define GL_GLEXT_PROTOTYPES 1 #endif // USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_opengl.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #ifdef __native_client__ #include <GL/Regal.h> #else // __native_client__ diff --git a/src/render/safeopenglgraphics.h b/src/render/safeopenglgraphics.h index 692b39600..5c85ee058 100644 --- a/src/render/safeopenglgraphics.h +++ b/src/render/safeopenglgraphics.h @@ -36,10 +36,10 @@ #ifndef USE_SDL2 #define GL_GLEXT_PROTOTYPES 1 #endif // USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_opengl.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #if defined(__APPLE__) #include <OpenGL/glext.h> #elif !defined(__native_client__) diff --git a/src/render/vertexes/openglgraphicsvertexes.h b/src/render/vertexes/openglgraphicsvertexes.h index 197b33584..5cd4bf098 100644 --- a/src/render/vertexes/openglgraphicsvertexes.h +++ b/src/render/vertexes/openglgraphicsvertexes.h @@ -23,22 +23,22 @@ #ifdef USE_OPENGL +#include "localconsts.h" + #ifdef ANDROID #include <GLES/gl.h> #else // ANDROID #ifndef USE_SDL2 #define GL_GLEXT_PROTOTYPES 1 #endif // USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_opengl.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #endif // ANDROID #include <vector> -#include "localconsts.h" - class OpenGLGraphicsVertexes final { public: diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index ea5126590..c7d237115 100644 --- a/src/resources/atlas/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -42,12 +42,12 @@ #include "resources/resourcemanager/resourcemanager.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "utils/checkutils.h" diff --git a/src/resources/dye/dye.cpp b/src/resources/dye/dye.cpp index cc597f9d5..65755bb87 100644 --- a/src/resources/dye/dye.cpp +++ b/src/resources/dye/dye.cpp @@ -30,12 +30,12 @@ #include <sstream> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/resources/dye/dye_unittest.cc b/src/resources/dye/dye_unittest.cc index 8f6e75614..87ac73fbf 100644 --- a/src/resources/dye/dye_unittest.cc +++ b/src/resources/dye/dye_unittest.cc @@ -47,12 +47,12 @@ #include "utils/delete2.h" #include "utils/env.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef USE_SDL2 #include <SDL.h> #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/resources/dye/dyepalette.cpp b/src/resources/dye/dyepalette.cpp index cf563d4e4..255175ee1 100644 --- a/src/resources/dye/dyepalette.cpp +++ b/src/resources/dye/dyepalette.cpp @@ -34,12 +34,12 @@ #include <cmath> #endif // USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #ifdef SIMD_SUPPORTED #include "utils/cpu.h" diff --git a/src/resources/dye/dyepalette_replaceacolor.cpp b/src/resources/dye/dyepalette_replaceacolor.cpp index 259bc6a71..27c0567cf 100644 --- a/src/resources/dye/dyepalette_replaceacolor.cpp +++ b/src/resources/dye/dyepalette_replaceacolor.cpp @@ -22,12 +22,12 @@ #include "resources/dye/dyepalette.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #ifdef SIMD_SUPPORTED // avx2 diff --git a/src/resources/dye/dyepalette_replaceaoglcolor.cpp b/src/resources/dye/dyepalette_replaceaoglcolor.cpp index b0b2f5943..69c3370a4 100644 --- a/src/resources/dye/dyepalette_replaceaoglcolor.cpp +++ b/src/resources/dye/dyepalette_replaceaoglcolor.cpp @@ -24,12 +24,12 @@ #include "resources/dye/dyepalette.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #ifdef SIMD_SUPPORTED // avx2 diff --git a/src/resources/dye/dyepalette_replacescolor.cpp b/src/resources/dye/dyepalette_replacescolor.cpp index 4a8acdb5b..469d5507c 100644 --- a/src/resources/dye/dyepalette_replacescolor.cpp +++ b/src/resources/dye/dyepalette_replacescolor.cpp @@ -22,12 +22,12 @@ #include "resources/dye/dyepalette.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #ifdef SIMD_SUPPORTED // avx2 diff --git a/src/resources/dye/dyepalette_replacesoglcolor.cpp b/src/resources/dye/dyepalette_replacesoglcolor.cpp index 7aec79cdb..aaf05a66e 100644 --- a/src/resources/dye/dyepalette_replacesoglcolor.cpp +++ b/src/resources/dye/dyepalette_replacesoglcolor.cpp @@ -24,12 +24,12 @@ #include "resources/dye/dyepalette.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #ifdef SIMD_SUPPORTED // avx2 diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc index db82c4297..c7d64d918 100644 --- a/src/resources/dye/dyepalette_unittest.cc +++ b/src/resources/dye/dyepalette_unittest.cc @@ -46,12 +46,12 @@ #include "utils/delete2.h" #include "utils/env.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef USE_SDL2 #include <SDL.h> #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/resources/fboinfo.h b/src/resources/fboinfo.h index 452ea73ce..ebeecf4e8 100644 --- a/src/resources/fboinfo.h +++ b/src/resources/fboinfo.h @@ -27,10 +27,10 @@ #include <GLES/gl.h> #include <GLES/glext.h> #else // ANDROID -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_opengl.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #if defined(__APPLE__) #include <OpenGL/glext.h> #elif !defined(__native_client__) diff --git a/src/resources/image/image.cpp b/src/resources/image/image.cpp index 747609095..353f09fec 100644 --- a/src/resources/image/image.cpp +++ b/src/resources/image/image.cpp @@ -37,14 +37,14 @@ #include "utils/sdlcheckutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifdef USE_SDL2 #include <SDL2_rotozoom.h> #else // USE_SDL2 #include <SDL_rotozoom.h> #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/resources/image/image.h b/src/resources/image/image.h index 8657eee2c..1da834bb1 100644 --- a/src/resources/image/image.h +++ b/src/resources/image/image.h @@ -37,21 +37,21 @@ #ifndef USE_SDL2 #define GL_GLEXT_PROTOTYPES 1 #endif // USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_opengl.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #endif // ANDROID #endif // USE_OPENGL -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifdef USE_SDL2 #include <SDL_render.h> #else // USE_SDL2 #include <SDL_video.h> #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include <map> diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp index bc5c36849..fc1f3e0de 100644 --- a/src/resources/imagehelper.cpp +++ b/src/resources/imagehelper.cpp @@ -29,10 +29,10 @@ #include "utils/sdlcheckutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_image.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h index 2af418704..facd29d18 100644 --- a/src/resources/imagehelper.h +++ b/src/resources/imagehelper.h @@ -27,10 +27,10 @@ #include "enums/render/rendertype.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_video.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) class Dye; class Image; diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp index 7347b98bf..b1d5baf7d 100644 --- a/src/resources/imagewriter.cpp +++ b/src/resources/imagewriter.cpp @@ -25,10 +25,10 @@ #include "utils/checkutils.h" #include <png.h> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_video.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/resources/memorymanager.cpp b/src/resources/memorymanager.cpp index 85f76df20..466a14d61 100644 --- a/src/resources/memorymanager.cpp +++ b/src/resources/memorymanager.cpp @@ -27,10 +27,10 @@ #include "utils/gettext.h" #include "utils/stringutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_video.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index 468dbdfd8..87972f5c3 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -46,10 +46,10 @@ #include "utils/checkutils.h" #include "utils/sdlcheckutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_image.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h index 013c29866..24662686d 100644 --- a/src/resources/openglimagehelper.h +++ b/src/resources/openglimagehelper.h @@ -41,10 +41,10 @@ #ifndef USE_SDL2 #define GL_GLEXT_PROTOTYPES 1 #endif // USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_opengl.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #endif // ANDROID class Dye; diff --git a/src/resources/rect/doublerect.h b/src/resources/rect/doublerect.h index d3baafa61..0d37e9f30 100644 --- a/src/resources/rect/doublerect.h +++ b/src/resources/rect/doublerect.h @@ -23,10 +23,10 @@ #include "localconsts.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_video.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) struct DoubleRect final { diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index 1343f3619..d90448e7b 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -40,12 +40,12 @@ #include "resources/resourcetypes.h" #endif // defined(DEBUG_DUMP_LEAKS) || defined(UNITTESTS) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef USE_OPENGL #include <SDL_image.h> #endif // USE_OPENGL -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include <sstream> diff --git a/src/resources/resourcemanager/resourcemanager_unittest.cc b/src/resources/resourcemanager/resourcemanager_unittest.cc index eaa7c3797..2efbc2ab1 100644 --- a/src/resources/resourcemanager/resourcemanager_unittest.cc +++ b/src/resources/resourcemanager/resourcemanager_unittest.cc @@ -40,12 +40,12 @@ #include <unistd.h> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef USE_SDL2 #include <SDL.h> #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/resources/safeopenglimagehelper.cpp b/src/resources/safeopenglimagehelper.cpp index 513b94427..118dea49d 100644 --- a/src/resources/safeopenglimagehelper.cpp +++ b/src/resources/safeopenglimagehelper.cpp @@ -42,10 +42,10 @@ #include "utils/sdlcheckutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_image.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/resources/safeopenglimagehelper.h b/src/resources/safeopenglimagehelper.h index 426279dcf..7d551cc36 100644 --- a/src/resources/safeopenglimagehelper.h +++ b/src/resources/safeopenglimagehelper.h @@ -41,10 +41,10 @@ #ifndef USE_SDL2 #define GL_GLEXT_PROTOTYPES 1 #endif // USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_opengl.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #endif // ANDROID class Dye; diff --git a/src/resources/screenshothelper.h b/src/resources/screenshothelper.h index 51c881dd8..25a8443d9 100644 --- a/src/resources/screenshothelper.h +++ b/src/resources/screenshothelper.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_video.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) class ScreenshotHelper notfinal { diff --git a/src/resources/sdl2imagehelper.h b/src/resources/sdl2imagehelper.h index fd25151a0..dab36e038 100644 --- a/src/resources/sdl2imagehelper.h +++ b/src/resources/sdl2imagehelper.h @@ -29,10 +29,10 @@ #include "resources/imagehelper.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) class Dye; class Image; diff --git a/src/resources/sdl2softwarescreenshothelper.cpp b/src/resources/sdl2softwarescreenshothelper.cpp index e510fa70e..58f19cde1 100644 --- a/src/resources/sdl2softwarescreenshothelper.cpp +++ b/src/resources/sdl2softwarescreenshothelper.cpp @@ -28,12 +28,12 @@ #include "utils/sdlcheckutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/resources/sdlgfxblitfunc.cpp b/src/resources/sdlgfxblitfunc.cpp index 8b0500ec6..d7bc956f2 100644 --- a/src/resources/sdlgfxblitfunc.cpp +++ b/src/resources/sdlgfxblitfunc.cpp @@ -31,10 +31,10 @@ LGPL (c) A. Schiffler #include "utils/checkutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_video.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp index ca7b5b838..d3b6bdb83 100644 --- a/src/resources/sdlimagehelper.cpp +++ b/src/resources/sdlimagehelper.cpp @@ -32,20 +32,20 @@ #include "utils/checkutils.h" #include "utils/sdlcheckutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_image.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "localconsts.h" #if SDL_BYTEORDER == SDL_LIL_ENDIAN #include "resources/sdlgfxblitfunc.h" #else // SDL_BYTEORDER == SDL_LIL_ENDIAN -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_gfxBlitFunc.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #endif // SDL_BYTEORDER == SDL_LIL_ENDIAN #ifndef SDL_BIG_ENDIAN diff --git a/src/resources/sdlimagehelper_unittest.cc b/src/resources/sdlimagehelper_unittest.cc index ae796e90a..a71c6a21f 100644 --- a/src/resources/sdlimagehelper_unittest.cc +++ b/src/resources/sdlimagehelper_unittest.cc @@ -19,10 +19,10 @@ */ #ifndef USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_endian.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #if SDL_BYTEORDER == SDL_LIL_ENDIAN #include "test/unittests.h" diff --git a/src/resources/sdlmusic.h b/src/resources/sdlmusic.h index b90773d56..44262b840 100644 --- a/src/resources/sdlmusic.h +++ b/src/resources/sdlmusic.h @@ -25,10 +25,10 @@ #include "resources/resource.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_mixer.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "localconsts.h" diff --git a/src/resources/sdlscreenshothelper.cpp b/src/resources/sdlscreenshothelper.cpp index 6cdb28878..d707b7dc7 100644 --- a/src/resources/sdlscreenshothelper.cpp +++ b/src/resources/sdlscreenshothelper.cpp @@ -26,12 +26,12 @@ #include "utils/sdlcheckutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index 5623959a9..2797ce00e 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -25,10 +25,10 @@ #include "resources/resource.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_mixer.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "localconsts.h" diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc index 43e3e0614..b04d585fd 100644 --- a/src/resources/sprite/animatedsprite_unittest.cc +++ b/src/resources/sprite/animatedsprite_unittest.cc @@ -49,12 +49,12 @@ #include "utils/delete2.h" #include "utils/mrand.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef USE_SDL2 #include <SDL.h> #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/sdl2gfx/SDL2_framerate.h b/src/sdl2gfx/SDL2_framerate.h index d39bd4bb3..271c4b986 100644 --- a/src/sdl2gfx/SDL2_framerate.h +++ b/src/sdl2gfx/SDL2_framerate.h @@ -38,10 +38,10 @@ extern "C" /* --- */ -#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) /* --------- Definitions */ diff --git a/src/sdl2gfx/SDL2_rotozoom.h b/src/sdl2gfx/SDL2_rotozoom.h index 14cd90162..07587c58c 100644 --- a/src/sdl2gfx/SDL2_rotozoom.h +++ b/src/sdl2gfx/SDL2_rotozoom.h @@ -42,10 +42,10 @@ extern "C" #define M_PI 3.1415926535897932384626433832795 #endif -#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) /* ---- Defines */ diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp index 6f587d755..4e8a90770 100644 --- a/src/soundmanager.cpp +++ b/src/soundmanager.cpp @@ -38,10 +38,10 @@ #include "utils/checkutils.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/soundmanager.h b/src/soundmanager.h index 2e039a3ed..01c2d5627 100644 --- a/src/soundmanager.h +++ b/src/soundmanager.h @@ -29,10 +29,10 @@ #include "localconsts.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_mixer.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) class SDLMusic; diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index 8d0cfa3a1..356ddabaa 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -54,12 +54,12 @@ #include "resources/image/image.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef USE_SDL2 #include <SDL_gfxBlitFunc.h> #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include <unistd.h> diff --git a/src/utils/buildhex.h b/src/utils/buildhex.h index cf9ab4591..0a4349bac 100644 --- a/src/utils/buildhex.h +++ b/src/utils/buildhex.h @@ -23,12 +23,12 @@ #include "localconsts.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #if SDL_BYTEORDER == SDL_BIG_ENDIAN #define buildHex(a, b, c, d) \ diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc index b6e735d75..b63bf87ad 100644 --- a/src/utils/chatutils_unittest.cc +++ b/src/utils/chatutils_unittest.cc @@ -46,12 +46,12 @@ #include "resources/resourcemanager/resourcemanager.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef USE_SDL2 #include <SDL.h> #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp index 0fdbf0652..58c191a3d 100644 --- a/src/utils/copynpaste.cpp +++ b/src/utils/copynpaste.cpp @@ -38,10 +38,10 @@ #include "debug.h" #ifdef USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_clipboard.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #else // USE_SDL2 @@ -55,18 +55,18 @@ #include "utils/sdlhelper.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_syswm.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include <unistd.h> #elif defined __native_client__ #include "utils/naclmessages.h" #elif defined WIN32 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_syswm.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #endif // defined(__APPLE__) #endif // USE_SDL2 diff --git a/src/utils/dumplibs.cpp b/src/utils/dumplibs.cpp index d1f87f987..420ef62ce 100644 --- a/src/utils/dumplibs.cpp +++ b/src/utils/dumplibs.cpp @@ -25,8 +25,8 @@ #include "utils/stringutils.h" #include <png.h> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_image.h> #include <SDL_mixer.h> PRAGMACLANG6GCC(GCC diagnostic push) @@ -34,7 +34,7 @@ PRAGMACLANG6GCC(GCC diagnostic ignored "-Wold-style-cast") #include <SDL_net.h> PRAGMACLANG6GCC(GCC diagnostic pop) #include <SDL_ttf.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include <zlib.h> diff --git a/src/utils/dumplibs_unittest.cc b/src/utils/dumplibs_unittest.cc index eb163aa7b..7c64911e3 100644 --- a/src/utils/dumplibs_unittest.cc +++ b/src/utils/dumplibs_unittest.cc @@ -25,8 +25,8 @@ #include "utils/delete2.h" #include "utils/stringutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_image.h> #include <SDL_mixer.h> PRAGMACLANG6GCC(GCC diagnostic push) @@ -34,7 +34,7 @@ PRAGMACLANG6GCC(GCC diagnostic ignored "-Wold-style-cast") #include <SDL_net.h> PRAGMACLANG6GCC(GCC diagnostic pop) #include <SDL_ttf.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include <zlib.h> diff --git a/src/utils/process.cpp b/src/utils/process.cpp index e79b8e3b7..c4639e4db 100644 --- a/src/utils/process.cpp +++ b/src/utils/process.cpp @@ -24,14 +24,14 @@ #include "localconsts.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifdef USE_SDL2 #ifdef ANDROID #include <SDL_system.h> #endif // ANDROID #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" @@ -261,10 +261,10 @@ bool openBrowser(std::string url) #elif defined ANDROID #include "utils/stringutils.h" #ifndef USE_SDL2 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_screenkeyboard.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #endif // USE_SDL2 bool openBrowser(std::string url) diff --git a/src/utils/sdl2helper.cpp b/src/utils/sdl2helper.cpp index 97ff70f3a..239f2636b 100644 --- a/src/utils/sdl2helper.cpp +++ b/src/utils/sdl2helper.cpp @@ -26,10 +26,10 @@ #include "utils/stringutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_syswm.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/utils/sdl2helper.h b/src/utils/sdl2helper.h index 1d809a781..70d3ffa90 100644 --- a/src/utils/sdl2helper.h +++ b/src/utils/sdl2helper.h @@ -26,10 +26,10 @@ #include "localconsts.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_thread.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) struct SDL_Surface; struct SDL_SysWMinfo; diff --git a/src/utils/sdlcheckutils.cpp b/src/utils/sdlcheckutils.cpp index 86e5363b0..4ce07f2e5 100644 --- a/src/utils/sdlcheckutils.cpp +++ b/src/utils/sdlcheckutils.cpp @@ -29,11 +29,11 @@ #include <map> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_image.h> #include <SDL_ttf.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/utils/sdlhelper.cpp b/src/utils/sdlhelper.cpp index 58fa7f59b..ccffdea22 100644 --- a/src/utils/sdlhelper.cpp +++ b/src/utils/sdlhelper.cpp @@ -30,11 +30,11 @@ #include "utils/glxhelper.h" #endif // defined(USE_X11) && defined(USE_OPENGL) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_syswm.h> #include <SDL_video.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/utils/sdlhelper.h b/src/utils/sdlhelper.h index 2e9f2930d..0ba99df10 100644 --- a/src/utils/sdlhelper.h +++ b/src/utils/sdlhelper.h @@ -28,13 +28,13 @@ UTILS_SDL2HELPER_H #else #include "utils/stringvector.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") -#include <SDL_thread.h> -#pragma GCC diagnostic pop - #include "localconsts.h" +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") +#include <SDL_thread.h> +PRAGMA48(GCC diagnostic pop) + struct SDL_Surface; struct SDL_SysWMinfo; diff --git a/src/utils/sdlpixel.h b/src/utils/sdlpixel.h index e2d3d3083..920ad4164 100644 --- a/src/utils/sdlpixel.h +++ b/src/utils/sdlpixel.h @@ -66,10 +66,10 @@ #include "gui/color.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) #ifndef SDL_BYTEORDER #error missing SDL_endian.h diff --git a/src/utils/sdlsharedhelper.cpp b/src/utils/sdlsharedhelper.cpp index a030c7a61..1f2f04a85 100644 --- a/src/utils/sdlsharedhelper.cpp +++ b/src/utils/sdlsharedhelper.cpp @@ -27,10 +27,10 @@ #include <ppapi_simple/ps.h> #endif // __native_client__ -#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 "debug.h" diff --git a/src/utils/timer.cpp b/src/utils/timer.cpp index 14c17adbc..cb224e8e5 100644 --- a/src/utils/timer.cpp +++ b/src/utils/timer.cpp @@ -22,10 +22,10 @@ #include "const/utils/timer.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_timer.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include <climits> |