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/fs | |
| 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/fs')
| -rw-r--r-- | src/fs/paths.cpp | 3 | ||||
| -rw-r--r-- | src/fs/virtfs/fsdirrwops.cpp | 3 | ||||
| -rw-r--r-- | src/fs/virtfs/fsziprwops.cpp | 3 | ||||
| -rw-r--r-- | src/fs/virtfs/rwops.cpp | 3 | ||||
| -rw-r--r-- | src/fs/virtfs/virtfs1_unittest.cc | 3 | ||||
| -rw-r--r-- | src/fs/virtfs/zipreader.cpp | 3 |
6 files changed, 18 insertions, 0 deletions
diff --git a/src/fs/paths.cpp b/src/fs/paths.cpp index a0165fc43..db16d5475 100644 --- a/src/fs/paths.cpp +++ b/src/fs/paths.cpp @@ -55,11 +55,14 @@ #include <pwd.h> #endif // WIN32 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #ifdef ANDROID #ifdef USE_SDL2 #include <SDL_system.h> #endif // USE_SDL2 #endif // ANDROID +#pragma GCC diagnostic pop #include "debug.h" diff --git a/src/fs/virtfs/fsdirrwops.cpp b/src/fs/virtfs/fsdirrwops.cpp index e77a4fc5f..14c6015f5 100644 --- a/src/fs/virtfs/fsdirrwops.cpp +++ b/src/fs/virtfs/fsdirrwops.cpp @@ -24,7 +24,10 @@ #include "fs/virtfs/file.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #include <SDL_rwops.h> +#pragma GCC diagnostic pop #include "debug.h" diff --git a/src/fs/virtfs/fsziprwops.cpp b/src/fs/virtfs/fsziprwops.cpp index 739ad4d3a..d744bdc73 100644 --- a/src/fs/virtfs/fsziprwops.cpp +++ b/src/fs/virtfs/fsziprwops.cpp @@ -25,7 +25,10 @@ #include "fs/virtfs/file.h" #include "fs/virtfs/fsfuncs.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #include <SDL_rwops.h> +#pragma GCC diagnostic pop #include "debug.h" diff --git a/src/fs/virtfs/rwops.cpp b/src/fs/virtfs/rwops.cpp index e6ff601b3..03131e1db 100644 --- a/src/fs/virtfs/rwops.cpp +++ b/src/fs/virtfs/rwops.cpp @@ -52,7 +52,10 @@ #include "utils/fuzzer.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #include <SDL_rwops.h> +#pragma GCC diagnostic pop #include "debug.h" diff --git a/src/fs/virtfs/virtfs1_unittest.cc b/src/fs/virtfs/virtfs1_unittest.cc index 4bec32e5b..c5ca2736e 100644 --- a/src/fs/virtfs/virtfs1_unittest.cc +++ b/src/fs/virtfs/virtfs1_unittest.cc @@ -31,7 +31,10 @@ #include "utils/delete2.h" #include "utils/stringutils.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #include <SDL_rwops.h> +#pragma GCC diagnostic pop #ifndef UNITTESTS_CATCH #include <algorithm> diff --git a/src/fs/virtfs/zipreader.cpp b/src/fs/virtfs/zipreader.cpp index c97b2ec61..4e81d24eb 100644 --- a/src/fs/virtfs/zipreader.cpp +++ b/src/fs/virtfs/zipreader.cpp @@ -29,7 +29,10 @@ #include "utils/stringutils.h" #include <zlib.h> +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #include <SDL_endian.h> +#pragma GCC diagnostic pop #if SDL_BYTEORDER == SDL_BIG_ENDIAN #include <byteswap.h> |