summaryrefslogtreecommitdiff
path: root/src/resources/resourcemanager
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/resourcemanager')
-rw-r--r--src/resources/resourcemanager/resourcemanager.cpp4
-rw-r--r--src/resources/resourcemanager/resourcemanager_unittest.cc3
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"