summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-10-21 17:50:31 -0700
committercallum_linden <none@none>2014-10-21 17:50:31 -0700
commitd7990bc9b2d906b18ee2b861fc0f0344147cfa05 (patch)
tree9cbf9c430ba206e31bdc616373e994a1e96ed16d /indra
parent87eb43e63a32581fe45a47791fb7adca5bddadf0 (diff)
Update to build on Xcode 6.0 (fix unit tests): turn off warnings for multiple unused private members
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llkdu/tests/llimagej2ckdu_test.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp
index 3f627b65e1..8ee6b16b92 100755
--- a/indra/llkdu/tests/llimagej2ckdu_test.cpp
+++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp
@@ -28,7 +28,16 @@
#include "linden_common.h"
// Class to test
#include "llimagej2ckdu.h"
+
+#if LL_DARWIN
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-private-field"
+#include "llkdumem.h"
+#pragma clang diagnostic pop
+#elif
#include "llkdumem.h"
+#endif
+
#include "kdu_block_coding.h"
// Tut header
#include "lltut.h"