summaryrefslogtreecommitdiff
path: root/src/actions
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/actions
parent5d8285ae8d16b40cf842f2bafd41978e316ac9b8 (diff)
downloadplus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.gz
plus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.bz2
plus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.xz
plus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.zip
Prevent Wshadow varnings in SDL code.
Diffstat (limited to 'src/actions')
-rw-r--r--src/actions/actions.cpp3
-rw-r--r--src/actions/statusbar.cpp3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index e9bf8b110..7aa42d6eb 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -108,11 +108,14 @@
#include "utils/parameters.h"
#include "utils/timer.h"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
#ifdef ANDROID
#ifndef USE_SDL2
#include <SDL_screenkeyboard.h>
#endif // USE_OPENGL
#endif // ANDROID
+#pragma GCC diagnostic pop
#include <sstream>
diff --git a/src/actions/statusbar.cpp b/src/actions/statusbar.cpp
index 1555c7233..5511876ad 100644
--- a/src/actions/statusbar.cpp
+++ b/src/actions/statusbar.cpp
@@ -39,11 +39,14 @@
#include "utils/gettext.h"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
#ifdef ANDROID
#ifndef USE_SDL2
#include <SDL_screenkeyboard.h>
#endif // USE_SDL2
#endif // ANDROID
+#pragma GCC diagnostic pop
#include "debug.h"