From 4e55456d8b6538a0fbfa67e6852453df7efa3424 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 17 Oct 2014 20:40:57 -0700
Subject: 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

---
 indra/llui/llrngwriter.cpp   | 9 +++++++++
 indra/llui/lluictrlfactory.h | 8 ++++++++
 indra/llui/llview.h          | 9 ---------
 3 files changed, 17 insertions(+), 9 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;
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;
 				}
 			}
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 7025e81895..7861c8f729 100755
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -44,16 +44,7 @@
 #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"
 
-- 
cgit v1.2.3