From a7e49a1394b634a6659666eab4378e5f397ad130 Mon Sep 17 00:00:00 2001 From: David Williams Date: Fri, 1 Mar 2013 16:07:50 +0100 Subject: [PATCH] Still trying to get rid of the warnings on the CDash machine. It's tricky because I'm not seeing the locally and the warning supression seems to vary bewteen vesions of GCC (See: http://dbp-consulting.com/tutorials/SuppressingGCCWarnings.html). --- library/PolyVoxCore/include/PolyVoxCore/Impl/miniz.c | 11 +++++++++++ library/PolyVoxCore/source/MinizCompressor.cpp | 2 -- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/miniz.c b/library/PolyVoxCore/include/PolyVoxCore/Impl/miniz.c index 39a17524..4b2608e1 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Impl/miniz.c +++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/miniz.c @@ -1,3 +1,14 @@ +/* + * CHANGES FOR POLYVOX + * ------------------- + * This file gave compiler warnings on certain versions of GCC (at least version 4.3.5 used by out build machine) + * and I did not want to risk tampering with the code to fix them.Therefore the only difference between this file + * and the official 'miniz.c' is the pragma below which disables warnings for this file in GCC. + */ +#ifdef __GNUC__ +#pragma GCC system_header +#endif + /* miniz.c v1.14 - public domain deflate/inflate, zlib-subset, ZIP reading/writing/appending, PNG writing See "unlicense" statement at the end of this file. Rich Geldreich , last updated May 20, 2012 diff --git a/library/PolyVoxCore/source/MinizCompressor.cpp b/library/PolyVoxCore/source/MinizCompressor.cpp index 827c2817..b44f63d9 100644 --- a/library/PolyVoxCore/source/MinizCompressor.cpp +++ b/library/PolyVoxCore/source/MinizCompressor.cpp @@ -16,8 +16,6 @@ // For some unknown reason the miniz library is supplied only as a // single .c file without a header. Apparently the only way to use // it is then to #include it directly which is what the examples do. -// We also disable some warnings as I don't want to fix external code. -#pragma GCC diagnostic ignored "-Wall" #include "PolyVoxCore/Impl/miniz.c"