diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 10:22:40 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 10:22:40 -0600 |
| commit | 4e94745139ea116b1779035e1b303a9fcc92f315 (patch) | |
| tree | fa6ba40f4609073d96f20460fcc8e38f8b8e1bf7 /indra/llkdu/tests | |
| parent | 456968de657f17de4757e95b87350b2564e54f71 (diff) | |
| parent | e8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff) | |
Merge branch 'master' 6.4.8 into DRTVWR-510
Diffstat (limited to 'indra/llkdu/tests')
| -rw-r--r-- | indra/llkdu/tests/llimagej2ckdu_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index 79ed566d00..ee7b14be85 100644 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp @@ -29,7 +29,7 @@ // Class to test #include "llimagej2ckdu.h" -#if LL_DARWIN +#if __clang__ // For this source, it's true that private fields in llkdumem.h are unused. #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-private-field" |