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/resources/resourcemanager | |
| 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/resources/resourcemanager')
| -rw-r--r-- | src/resources/resourcemanager/resourcemanager.cpp | 6 | ||||
| -rw-r--r-- | src/resources/resourcemanager/resourcemanager_unittest.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index 1343f3619..d90448e7b 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -40,12 +40,12 @@ #include "resources/resourcetypes.h" #endif // defined(DEBUG_DUMP_LEAKS) || defined(UNITTESTS) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef USE_OPENGL #include <SDL_image.h> #endif // USE_OPENGL -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include <sstream> diff --git a/src/resources/resourcemanager/resourcemanager_unittest.cc b/src/resources/resourcemanager/resourcemanager_unittest.cc index eaa7c3797..2efbc2ab1 100644 --- a/src/resources/resourcemanager/resourcemanager_unittest.cc +++ b/src/resources/resourcemanager/resourcemanager_unittest.cc @@ -40,12 +40,12 @@ #include <unistd.h> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef USE_SDL2 #include <SDL.h> #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" |