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/resourcemanager | |
| 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/resourcemanager')
| -rw-r--r-- | src/resources/resourcemanager/resourcemanager.cpp | 4 | ||||
| -rw-r--r-- | src/resources/resourcemanager/resourcemanager_unittest.cc | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index a60fea2a4..1343f3619 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -40,9 +40,13 @@ #include "resources/resourcetypes.h" #endif // defined(DEBUG_DUMP_LEAKS) || defined(UNITTESTS) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #ifndef USE_OPENGL #include <SDL_image.h> #endif // USE_OPENGL +#pragma GCC diagnostic pop + #include <sstream> #include <sys/time.h> diff --git a/src/resources/resourcemanager/resourcemanager_unittest.cc b/src/resources/resourcemanager/resourcemanager_unittest.cc index fe3e2e995..eaa7c3797 100644 --- a/src/resources/resourcemanager/resourcemanager_unittest.cc +++ b/src/resources/resourcemanager/resourcemanager_unittest.cc @@ -40,9 +40,12 @@ #include <unistd.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" |