diff options
| author | callum_linden <none@none> | 2014-10-17 20:40:57 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-17 20:40:57 -0700 |
| commit | 4e55456d8b6538a0fbfa67e6852453df7efa3424 (patch) | |
| tree | b7cbb7fd141d9baf4998ee95920758ceaca7356e /indra/llui/lluictrlfactory.h | |
| parent | 86f49bec1b0cfacb1496d588f12788ae3f39204f (diff) | |
Update to build on Xcode 6.0: Change tactic about turning off warnings about -Wdelete-incomplete in anywhere lluictrlfactory.h is used - richard okay'd
Diffstat (limited to 'indra/llui/lluictrlfactory.h')
| -rwxr-xr-x | indra/llui/lluictrlfactory.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h index a5796c8af2..17af45cc0c 100755 --- a/indra/llui/lluictrlfactory.h +++ b/indra/llui/lluictrlfactory.h @@ -183,7 +183,15 @@ public: if (!widget) { LL_WARNS() << "Widget in " << filename << " was of type " << typeid(view).name() << " instead of expected type " << typeid(T).name() << LL_ENDL; + +#if LL_DARWIN +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdelete-incomplete" + delete view; +#pragma clang diagnostic pop +#elif delete view; +#endif view = NULL; } } |