diff options
| author | callum_linden <none@none> | 2014-10-17 16:28:12 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-17 16:28:12 -0700 |
| commit | f7e4c27add56952a7d2d0fb475e439922640825e (patch) | |
| tree | 5d13f7bbfa5c99fb7e905b31bca330f31f2dd111 /indra/llui | |
| parent | d20c719f03939a0e0220429647f5964fe6c8aeb2 (diff) | |
Update to build on Xcode 6.0: turn off warnings about -Wdelete-incomplete 0n llview.h - richard okay'd
Diffstat (limited to 'indra/llui')
| -rwxr-xr-x | indra/llui/llview.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h index 7861c8f729..7025e81895 100755 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -44,7 +44,16 @@ #include "llviewquery.h" #include "lluistring.h" #include "llcursortypes.h" + +#if LL_DARWIN +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdelete-incomplete" +#include "lluictrlfactory.h" +#pragma clang diagnostic pop +#elif #include "lluictrlfactory.h" +#endif + #include "lltreeiterators.h" #include "llfocusmgr.h" |