diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-04-10 14:39:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-04-10 16:32:22 +0300 |
| commit | 3504545ff8dc818d08ac9526589b981a9a21c7a6 (patch) | |
| tree | 13033d4b30c944202ac5d2a737d4a7173089e0ac /src | |
| parent | 9715494e4145243feb068a40a6d7e58baca814d1 (diff) | |
| download | manaverse-3504545ff8dc818d08ac9526589b981a9a21c7a6.tar.gz manaverse-3504545ff8dc818d08ac9526589b981a9a21c7a6.tar.bz2 manaverse-3504545ff8dc818d08ac9526589b981a9a21c7a6.tar.xz manaverse-3504545ff8dc818d08ac9526589b981a9a21c7a6.zip | |
Add pragma for clang for disable some warnings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/localconsts.h | 8 | ||||
| -rw-r--r-- | src/test/testlauncher.cpp | 9 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/localconsts.h b/src/localconsts.h index dd8da46f3..eeb1d657e 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -160,9 +160,17 @@ #define PRAGMA6(str) #endif // ADVGCC +#ifdef __clang__ +#define PRAGMACLANG(str) _Pragma(#str) +#else // __clang__ +#define PRAGMACLANG(str) +#endif // __clang__ + #ifdef __GNUC__ #if GCC_VERSION > 40500 #define PRAGMA45(str) _Pragma(#str) +#elif defined(__clang__) +#define PRAGMA45(str) _Pragma(#str) #else // GCC_VERSION > 40400 #define PRAGMA45(str) #endif // GCC_VERSION > 40400 diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index 2b86a3eca..8909b29ee 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -151,6 +151,9 @@ int TestLauncher::testRescale() const return 0; } +PRAGMACLANG(GCC diagnostic push) +PRAGMACLANG(GCC diagnostic ignored "-Wunused-result") + int TestLauncher::testFps() { timeval start; @@ -279,6 +282,7 @@ int TestLauncher::testFps3() sleep(1); return 0; } +PRAGMACLANG(GCC diagnostic pop) int TestLauncher::testBatches() { @@ -371,6 +375,9 @@ int TestLauncher::testTextures() return 0; } +PRAGMACLANG(GCC diagnostic push) +PRAGMACLANG(GCC diagnostic ignored "-Wunused-result") + int TestLauncher::testInternal() { timeval start; @@ -421,6 +428,8 @@ int TestLauncher::testInternal() return 0; } +PRAGMACLANG(GCC diagnostic pop) + int TestLauncher::testDye() { SDL_RWops *rw = MPHYSFSRWOPS_openRead( |