From 5e37f24550e133d985945bb008782df543e1f428 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 20 Jun 2017 03:06:00 +0300 Subject: Fix sdl warning hiding pragmas for old compilers. --- src/resources/atlas/atlasmanager.cpp | 6 +++--- src/resources/dye/dye.cpp | 6 +++--- src/resources/dye/dye_unittest.cc | 6 +++--- src/resources/dye/dyepalette.cpp | 6 +++--- src/resources/dye/dyepalette_replaceacolor.cpp | 6 +++--- src/resources/dye/dyepalette_replaceaoglcolor.cpp | 6 +++--- src/resources/dye/dyepalette_replacescolor.cpp | 6 +++--- src/resources/dye/dyepalette_replacesoglcolor.cpp | 6 +++--- src/resources/dye/dyepalette_unittest.cc | 6 +++--- src/resources/fboinfo.h | 6 +++--- src/resources/image/image.cpp | 6 +++--- src/resources/image/image.h | 12 ++++++------ src/resources/imagehelper.cpp | 6 +++--- src/resources/imagehelper.h | 6 +++--- src/resources/imagewriter.cpp | 6 +++--- src/resources/memorymanager.cpp | 6 +++--- src/resources/openglimagehelper.cpp | 6 +++--- src/resources/openglimagehelper.h | 6 +++--- src/resources/rect/doublerect.h | 6 +++--- src/resources/resourcemanager/resourcemanager.cpp | 6 +++--- src/resources/resourcemanager/resourcemanager_unittest.cc | 6 +++--- src/resources/safeopenglimagehelper.cpp | 6 +++--- src/resources/safeopenglimagehelper.h | 6 +++--- src/resources/screenshothelper.h | 6 +++--- src/resources/sdl2imagehelper.h | 6 +++--- src/resources/sdl2softwarescreenshothelper.cpp | 6 +++--- src/resources/sdlgfxblitfunc.cpp | 6 +++--- src/resources/sdlimagehelper.cpp | 12 ++++++------ src/resources/sdlimagehelper_unittest.cc | 6 +++--- src/resources/sdlmusic.h | 6 +++--- src/resources/sdlscreenshothelper.cpp | 6 +++--- src/resources/soundeffect.h | 6 +++--- src/resources/sprite/animatedsprite_unittest.cc | 6 +++--- 33 files changed, 105 insertions(+), 105 deletions(-) (limited to 'src/resources') 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 #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 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include #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 #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 #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 #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 #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 #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 #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 #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 #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 #include #else // ANDROID -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #if defined(__APPLE__) #include #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 #else // USE_SDL2 #include #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 -#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 #else // USE_SDL2 #include #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include 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 -#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 -#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 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include -#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 -#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 -#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 -#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 -#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 #endif // USE_OPENGL -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include 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 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef USE_SDL2 #include #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 -#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 -#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 -#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 -#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 #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 -#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 -#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 -#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 -#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 -#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 #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 -#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 #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" -- cgit v1.2.3-70-g09d2