summaryrefslogtreecommitdiff
path: root/src/resources/resourcemanager/resourcemanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-20 01:02:22 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-20 01:02:22 +0300
commit132ee3146d10b6e6a860bfd7e03b5a8667f2a44b (patch)
tree0ef5bab643e4571ca77f4b4fa53276410edc0af2 /src/resources/resourcemanager/resourcemanager.cpp
parent5d8285ae8d16b40cf842f2bafd41978e316ac9b8 (diff)
downloadmanaverse-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.gz
manaverse-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.bz2
manaverse-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.xz
manaverse-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.zip
Prevent Wshadow varnings in SDL code.
Diffstat (limited to 'src/resources/resourcemanager/resourcemanager.cpp')
-rw-r--r--src/resources/resourcemanager/resourcemanager.cpp4
1 files changed, 4 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>