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/image | |
| parent | 5d8285ae8d16b40cf842f2bafd41978e316ac9b8 (diff) | |
| download | plus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.gz plus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.bz2 plus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.xz plus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.zip | |
Prevent Wshadow varnings in SDL code.
Diffstat (limited to 'src/resources/image')
| -rw-r--r-- | src/resources/image/image.cpp | 3 | ||||
| -rw-r--r-- | src/resources/image/image.h | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/resources/image/image.cpp b/src/resources/image/image.cpp index b1b23ce13..747609095 100644 --- a/src/resources/image/image.cpp +++ b/src/resources/image/image.cpp @@ -37,11 +37,14 @@ #include "utils/sdlcheckutils.h" +#pragma GCC diagnostic push +#pragma 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 #include "debug.h" diff --git a/src/resources/image/image.h b/src/resources/image/image.h index 762f82fab..8657eee2c 100644 --- a/src/resources/image/image.h +++ b/src/resources/image/image.h @@ -37,15 +37,21 @@ #ifndef USE_SDL2 #define GL_GLEXT_PROTOTYPES 1 #endif // USE_SDL2 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #include <SDL_opengl.h> +#pragma GCC diagnostic pop #endif // ANDROID #endif // USE_OPENGL +#pragma GCC diagnostic push +#pragma 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 #include <map> |