diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-06-20 03:06:00 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-06-20 04:04:40 +0300 |
| commit | 5e37f24550e133d985945bb008782df543e1f428 (patch) | |
| tree | d32657fab845823be6a75bc743bdf6e8a357bcaa /src/fs | |
| parent | d3c69c839b180e1d22d5a89625322dfc6ae72785 (diff) | |
| download | manaverse-5e37f24550e133d985945bb008782df543e1f428.tar.gz manaverse-5e37f24550e133d985945bb008782df543e1f428.tar.bz2 manaverse-5e37f24550e133d985945bb008782df543e1f428.tar.xz manaverse-5e37f24550e133d985945bb008782df543e1f428.zip | |
Fix sdl warning hiding pragmas for old compilers.
Diffstat (limited to 'src/fs')
| -rw-r--r-- | src/fs/paths.cpp | 6 | ||||
| -rw-r--r-- | src/fs/virtfs/fsdirrwops.cpp | 6 | ||||
| -rw-r--r-- | src/fs/virtfs/fsziprwops.cpp | 6 | ||||
| -rw-r--r-- | src/fs/virtfs/rwops.cpp | 6 | ||||
| -rw-r--r-- | src/fs/virtfs/virtfs1_unittest.cc | 6 | ||||
| -rw-r--r-- | src/fs/virtfs/zipreader.cpp | 6 |
6 files changed, 18 insertions, 18 deletions
diff --git a/src/fs/paths.cpp b/src/fs/paths.cpp index db16d5475..22f227650 100644 --- a/src/fs/paths.cpp +++ b/src/fs/paths.cpp @@ -55,14 +55,14 @@ #include <pwd.h> #endif // WIN32 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifdef ANDROID #ifdef USE_SDL2 #include <SDL_system.h> #endif // USE_SDL2 #endif // ANDROID -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/fs/virtfs/fsdirrwops.cpp b/src/fs/virtfs/fsdirrwops.cpp index 14c6015f5..9527aaf5b 100644 --- a/src/fs/virtfs/fsdirrwops.cpp +++ b/src/fs/virtfs/fsdirrwops.cpp @@ -24,10 +24,10 @@ #include "fs/virtfs/file.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_rwops.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/fs/virtfs/fsziprwops.cpp b/src/fs/virtfs/fsziprwops.cpp index d744bdc73..3dbe7ece7 100644 --- a/src/fs/virtfs/fsziprwops.cpp +++ b/src/fs/virtfs/fsziprwops.cpp @@ -25,10 +25,10 @@ #include "fs/virtfs/file.h" #include "fs/virtfs/fsfuncs.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_rwops.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/fs/virtfs/rwops.cpp b/src/fs/virtfs/rwops.cpp index 03131e1db..e6a7a5914 100644 --- a/src/fs/virtfs/rwops.cpp +++ b/src/fs/virtfs/rwops.cpp @@ -52,10 +52,10 @@ #include "utils/fuzzer.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_rwops.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/fs/virtfs/virtfs1_unittest.cc b/src/fs/virtfs/virtfs1_unittest.cc index c5ca2736e..d098d5765 100644 --- a/src/fs/virtfs/virtfs1_unittest.cc +++ b/src/fs/virtfs/virtfs1_unittest.cc @@ -31,10 +31,10 @@ #include "utils/delete2.h" #include "utils/stringutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_rwops.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #ifndef UNITTESTS_CATCH #include <algorithm> diff --git a/src/fs/virtfs/zipreader.cpp b/src/fs/virtfs/zipreader.cpp index 4e81d24eb..4bbdd6af7 100644 --- a/src/fs/virtfs/zipreader.cpp +++ b/src/fs/virtfs/zipreader.cpp @@ -29,10 +29,10 @@ #include "utils/stringutils.h" #include <zlib.h> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #include <SDL_endian.h> -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #if SDL_BYTEORDER == SDL_BIG_ENDIAN #include <byteswap.h> |