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/resources/dye | |
| parent | d3c69c839b180e1d22d5a89625322dfc6ae72785 (diff) | |
| download | plus-5e37f24550e133d985945bb008782df543e1f428.tar.gz plus-5e37f24550e133d985945bb008782df543e1f428.tar.bz2 plus-5e37f24550e133d985945bb008782df543e1f428.tar.xz plus-5e37f24550e133d985945bb008782df543e1f428.zip | |
Fix sdl warning hiding pragmas for old compilers.
Diffstat (limited to 'src/resources/dye')
| -rw-r--r-- | src/resources/dye/dye.cpp | 6 | ||||
| -rw-r--r-- | src/resources/dye/dye_unittest.cc | 6 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette.cpp | 6 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replaceacolor.cpp | 6 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replaceaoglcolor.cpp | 6 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replacescolor.cpp | 6 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replacesoglcolor.cpp | 6 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_unittest.cc | 6 |
8 files changed, 24 insertions, 24 deletions
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" |