summaryrefslogtreecommitdiff
path: root/indra/llkdu
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-10-17 15:35:28 -0700
committercallum_linden <none@none>2014-10-17 15:35:28 -0700
commitc2772bc13a9e3e2044706a0e41c7b5c0fe86e9ed (patch)
treeac613c650ca9a36fb5fbfac39ae34883d6bde830 /indra/llkdu
parentf405da4f318da2b5521a827ff08b0bb27cb11f4d (diff)
Update to build on Xcode 6.0: explicitly supress certain warnings in KDU package files
Diffstat (limited to 'indra/llkdu')
-rwxr-xr-xindra/llkdu/llimagej2ckdu.h6
-rwxr-xr-xindra/llkdu/llkdumem.h5
2 files changed, 11 insertions, 0 deletions
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"