From c2772bc13a9e3e2044706a0e41c7b5c0fe86e9ed Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 17 Oct 2014 15:35:28 -0700 Subject: Update to build on Xcode 6.0: explicitly supress certain warnings in KDU package files --- indra/llkdu/llimagej2ckdu.h | 6 ++++++ indra/llkdu/llkdumem.h | 5 +++++ 2 files changed, 11 insertions(+) (limited to 'indra/llkdu') diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h index fb1f6535ba..e3b0452293 100755 --- a/indra/llkdu/llimagej2ckdu.h +++ b/indra/llkdu/llimagej2ckdu.h @@ -36,7 +36,13 @@ #include "kdu_elementary.h" #include "kdu_messaging.h" #include "kdu_params.h" + +// don't *really* want to rebuild KDU so turn off specific warnings for this header +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-private-field" #include "kdu_compressed.h" +#pragma clang diagnostic pop + #include "kdu_sample_processing.h" class LLKDUDecodeState; diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index dbdf88b2d9..892826f199 100755 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h @@ -29,7 +29,12 @@ // Support classes for reading and writing from memory buffers in KDU #define KDU_NO_THREADS +// don't *really* want to rebuild KDU so turn off specific warnings for this header +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wself-assign-field" +#pragma clang diagnostic ignored "-Wunused-private-field" #include "kdu_image.h" +#pragma clang diagnostic pop #include "kdu_elementary.h" #include "kdu_messaging.h" #include "kdu_params.h" -- cgit v1.2.3 From f3baf8dc4e900a4e8d4005e31f20be2bae162a56 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 20 Oct 2014 16:02:03 -0700 Subject: Update to build on Xcode 6.0: remove #pragmas from code to deal with tut warnigs/errors (moved to package) AND bracket clang #pragmas in #if LL_DARWIN --- indra/llkdu/llimagej2ckdu.h | 4 ++++ indra/llkdu/llkdumem.h | 5 +++++ 2 files changed, 9 insertions(+) (limited to 'indra/llkdu') diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h index e3b0452293..762476ce69 100755 --- a/indra/llkdu/llimagej2ckdu.h +++ b/indra/llkdu/llimagej2ckdu.h @@ -38,10 +38,14 @@ #include "kdu_params.h" // don't *really* want to rebuild KDU so turn off specific warnings for this header +#if LL_DARWIN #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-private-field" #include "kdu_compressed.h" #pragma clang diagnostic pop +#elif +#include "kdu_compressed.h" +#endif #include "kdu_sample_processing.h" diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index 892826f199..a0d304868e 100755 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h @@ -30,11 +30,16 @@ // Support classes for reading and writing from memory buffers in KDU #define KDU_NO_THREADS // don't *really* want to rebuild KDU so turn off specific warnings for this header +#if LL_DARWIN #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wself-assign-field" #pragma clang diagnostic ignored "-Wunused-private-field" #include "kdu_image.h" #pragma clang diagnostic pop +#elif +#include "kdu_image.h" +#endif + #include "kdu_elementary.h" #include "kdu_messaging.h" #include "kdu_params.h" -- cgit v1.2.3