diff options
| author | Nicky Dasmijn <nicky.dasmijn@gmail.com> | 2020-07-18 10:29:01 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-07-22 06:48:15 +0300 |
| commit | c16a364377fef29454c958087121de103fa9de41 (patch) | |
| tree | 2887daf2a84f296ae7520d670f322b1c0797bf7f /indra | |
| parent | 383e250fa6484a160bc733cca981fc4cffc8de88 (diff) | |
There was an idiom to test with LL_DARWIN if the compiler used is clang. This is not correct, as clang is available on all 3 platforms. The correct way to check for this is via __clang__ (https://clang.llvm.org/docs/LanguageExtensions.html#builtin-macros)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llkdu/include_kdu_xxxx.h | 2 | ||||
| -rw-r--r-- | indra/llkdu/tests/llimagej2ckdu_test.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/llrngwriter.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/lluictrlfactory.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/indra/llkdu/include_kdu_xxxx.h b/indra/llkdu/include_kdu_xxxx.h index a1dbced60b..61204b5689 100644 --- a/indra/llkdu/include_kdu_xxxx.h +++ b/indra/llkdu/include_kdu_xxxx.h @@ -16,7 +16,7 @@ // #include "include_kdu_xxxx.h" // // kdu_xxxx #undef'ed by include_kdu_xxxx.h -#if LL_DARWIN +#if __clang__ // 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" 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" diff --git a/indra/llui/llrngwriter.cpp b/indra/llui/llrngwriter.cpp index e4a31d6a79..80e9842a9b 100644 --- a/indra/llui/llrngwriter.cpp +++ b/indra/llui/llrngwriter.cpp @@ -29,7 +29,7 @@ #include "llrngwriter.h" #include "lluicolor.h" -#if LL_DARWIN +#ifdef __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdelete-incomplete" #include "lluictrlfactory.h" diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h index f740f14e4d..0ed7fb09b3 100644 --- a/indra/llui/lluictrlfactory.h +++ b/indra/llui/lluictrlfactory.h @@ -174,7 +174,7 @@ public: { LL_WARNS() << "Widget in " << filename << " was of type " << typeid(view).name() << " instead of expected type " << typeid(T).name() << LL_ENDL; -#if LL_DARWIN +#ifdef __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdelete-incomplete" delete view; |