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/resources/dye | |
| parent | 5d8285ae8d16b40cf842f2bafd41978e316ac9b8 (diff) | |
| download | mv-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.gz mv-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.bz2 mv-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.xz mv-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.zip | |
Prevent Wshadow varnings in SDL code.
Diffstat (limited to 'src/resources/dye')
| -rw-r--r-- | src/resources/dye/dye.cpp | 3 | ||||
| -rw-r--r-- | src/resources/dye/dye_unittest.cc | 3 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette.cpp | 3 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replaceacolor.cpp | 3 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replaceaoglcolor.cpp | 3 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replacescolor.cpp | 3 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_replacesoglcolor.cpp | 3 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette_unittest.cc | 3 |
8 files changed, 24 insertions, 0 deletions
diff --git a/src/resources/dye/dye.cpp b/src/resources/dye/dye.cpp index 70d2a21b1..cc597f9d5 100644 --- a/src/resources/dye/dye.cpp +++ b/src/resources/dye/dye.cpp @@ -30,9 +30,12 @@ #include <sstream> +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER +#pragma GCC diagnostic pop #include "debug.h" diff --git a/src/resources/dye/dye_unittest.cc b/src/resources/dye/dye_unittest.cc index 09b207371..8f6e75614 100644 --- a/src/resources/dye/dye_unittest.cc +++ b/src/resources/dye/dye_unittest.cc @@ -47,9 +47,12 @@ #include "utils/delete2.h" #include "utils/env.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #ifndef USE_SDL2 #include <SDL.h> #endif // USE_SDL2 +#pragma GCC diagnostic pop #include "debug.h" diff --git a/src/resources/dye/dyepalette.cpp b/src/resources/dye/dyepalette.cpp index cf1d7c205..cf563d4e4 100644 --- a/src/resources/dye/dyepalette.cpp +++ b/src/resources/dye/dyepalette.cpp @@ -34,9 +34,12 @@ #include <cmath> #endif // USE_SDL2 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER +#pragma 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 21cd0b0c5..259bc6a71 100644 --- a/src/resources/dye/dyepalette_replaceacolor.cpp +++ b/src/resources/dye/dyepalette_replaceacolor.cpp @@ -22,9 +22,12 @@ #include "resources/dye/dyepalette.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER +#pragma GCC diagnostic pop #ifdef SIMD_SUPPORTED // avx2 diff --git a/src/resources/dye/dyepalette_replaceaoglcolor.cpp b/src/resources/dye/dyepalette_replaceaoglcolor.cpp index c0225df65..b0b2f5943 100644 --- a/src/resources/dye/dyepalette_replaceaoglcolor.cpp +++ b/src/resources/dye/dyepalette_replaceaoglcolor.cpp @@ -24,9 +24,12 @@ #include "resources/dye/dyepalette.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER +#pragma GCC diagnostic pop #ifdef SIMD_SUPPORTED // avx2 diff --git a/src/resources/dye/dyepalette_replacescolor.cpp b/src/resources/dye/dyepalette_replacescolor.cpp index 0a4206e83..4a8acdb5b 100644 --- a/src/resources/dye/dyepalette_replacescolor.cpp +++ b/src/resources/dye/dyepalette_replacescolor.cpp @@ -22,9 +22,12 @@ #include "resources/dye/dyepalette.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER +#pragma GCC diagnostic pop #ifdef SIMD_SUPPORTED // avx2 diff --git a/src/resources/dye/dyepalette_replacesoglcolor.cpp b/src/resources/dye/dyepalette_replacesoglcolor.cpp index cde7fac8e..7aec79cdb 100644 --- a/src/resources/dye/dyepalette_replacesoglcolor.cpp +++ b/src/resources/dye/dyepalette_replacesoglcolor.cpp @@ -24,9 +24,12 @@ #include "resources/dye/dyepalette.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> #endif // SDL_BYTEORDER +#pragma GCC diagnostic pop #ifdef SIMD_SUPPORTED // avx2 diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc index 351a74a2d..db82c4297 100644 --- a/src/resources/dye/dyepalette_unittest.cc +++ b/src/resources/dye/dyepalette_unittest.cc @@ -46,9 +46,12 @@ #include "utils/delete2.h" #include "utils/env.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #ifndef USE_SDL2 #include <SDL.h> #endif // USE_SDL2 +#pragma GCC diagnostic pop #include "debug.h" |