summaryrefslogtreecommitdiff
path: root/indra/llui/llrngwriter.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-10-17 20:40:57 -0700
committercallum_linden <none@none>2014-10-17 20:40:57 -0700
commit4e55456d8b6538a0fbfa67e6852453df7efa3424 (patch)
treeb7cbb7fd141d9baf4998ee95920758ceaca7356e /indra/llui/llrngwriter.cpp
parent86f49bec1b0cfacb1496d588f12788ae3f39204f (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/llrngwriter.cpp')
-rwxr-xr-xindra/llui/llrngwriter.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llui/llrngwriter.cpp b/indra/llui/llrngwriter.cpp
index cd9fe3610e..523bc7c667 100755
--- a/indra/llui/llrngwriter.cpp
+++ b/indra/llui/llrngwriter.cpp
@@ -28,7 +28,16 @@
#include "llrngwriter.h"
#include "lluicolor.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 "boost/bind.hpp"
static LLInitParam::Parser::parser_read_func_map_t sReadFuncs;