From d20c719f03939a0e0220429647f5964fe6c8aeb2 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 17 Oct 2014 16:20:36 -0700
Subject: Update to build on Xcode 6.0: turn off warnings about unused
 functions from clang for tut package

---
 indra/test/llapp_tut.cpp | 4 ++++
 indra/test/lltut.h       | 5 +++++
 2 files changed, 9 insertions(+)

(limited to 'indra/test')

diff --git a/indra/test/llapp_tut.cpp b/indra/test/llapp_tut.cpp
index aa5c0672e6..5dad838a44 100755
--- a/indra/test/llapp_tut.cpp
+++ b/indra/test/llapp_tut.cpp
@@ -25,7 +25,11 @@
  * $/LicenseInfo$
  */
 
+// turn off warnings about unused functions from clang for tut package
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-function"
 #include <tut/tut.hpp>
+#pragma clang diagnostic pop
 
 #include "linden_common.h"
 #include "llapp.h"
diff --git a/indra/test/lltut.h b/indra/test/lltut.h
index 243e869be7..5428be3719 100755
--- a/indra/test/lltut.h
+++ b/indra/test/lltut.h
@@ -31,7 +31,12 @@
 
 #include "is_approx_equal_fraction.h" // instead of llmath.h
 
+// turn off warnings about unused functions from clang for tut package
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-function"
 #include <tut/tut.hpp>
+#pragma clang diagnostic pop
+
 #include <cstring>
 
 class LLDate;
-- 
cgit v1.2.3


From 618bb404fcac4e2b489e5ce3e8bbedd0202a4f2c Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 17 Oct 2014 16:53:40 -0700
Subject: Update to build on Xcode 6.0: turn off warnings about unused
 functions from clang for tut package

---
 indra/test/llbuffer_tut.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/test')

diff --git a/indra/test/llbuffer_tut.cpp b/indra/test/llbuffer_tut.cpp
index a25fdebb7f..10a23c688a 100755
--- a/indra/test/llbuffer_tut.cpp
+++ b/indra/test/llbuffer_tut.cpp
@@ -26,7 +26,15 @@
  * $/LicenseInfo$
  */
 
+#if LL_DARWIN
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-function"
 #include <tut/tut.hpp>
+#pragma clang diagnostic pop
+#elif
+#include <tut/tut.hpp>
+#endif
+
 #include "linden_common.h"
 #include "lltut.h"
 #include "llbuffer.h"
-- 
cgit v1.2.3


From 86f49bec1b0cfacb1496d588f12788ae3f39204f Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 17 Oct 2014 20:25:31 -0700
Subject: Update to build on Xcode 6.0: turn off warnings about unused
 functions from clang for tut package

---
 indra/test/llpermissions_tut.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/test')

diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp
index 8d8d47a667..32a016466d 100755
--- a/indra/test/llpermissions_tut.cpp
+++ b/indra/test/llpermissions_tut.cpp
@@ -28,7 +28,16 @@
  
 #include <tut/tut.hpp>
 #include "linden_common.h"
+
+#if LL_DARWIN
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-function"
+#include "lltut.h"
+#pragma clang diagnostic pop
+#elif
 #include "lltut.h"
+#endif
+
 #include "message.h"
 #include "llpermissions.h"
 
-- 
cgit v1.2.3


From f3baf8dc4e900a4e8d4005e31f20be2bae162a56 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Mon, 20 Oct 2014 16:02:03 -0700
Subject: Update to build on Xcode 6.0: remove #pragmas from code to deal with
 tut warnigs/errors (moved to package) AND bracket clang #pragmas in #if
 LL_DARWIN

---
 indra/test/llapp_tut.cpp         | 4 ----
 indra/test/llbuffer_tut.cpp      | 7 -------
 indra/test/llpermissions_tut.cpp | 7 -------
 3 files changed, 18 deletions(-)

(limited to 'indra/test')

diff --git a/indra/test/llapp_tut.cpp b/indra/test/llapp_tut.cpp
index 5dad838a44..aa5c0672e6 100755
--- a/indra/test/llapp_tut.cpp
+++ b/indra/test/llapp_tut.cpp
@@ -25,11 +25,7 @@
  * $/LicenseInfo$
  */
 
-// turn off warnings about unused functions from clang for tut package
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-function"
 #include <tut/tut.hpp>
-#pragma clang diagnostic pop
 
 #include "linden_common.h"
 #include "llapp.h"
diff --git a/indra/test/llbuffer_tut.cpp b/indra/test/llbuffer_tut.cpp
index 10a23c688a..9b8aae6a73 100755
--- a/indra/test/llbuffer_tut.cpp
+++ b/indra/test/llbuffer_tut.cpp
@@ -26,14 +26,7 @@
  * $/LicenseInfo$
  */
 
-#if LL_DARWIN
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-function"
 #include <tut/tut.hpp>
-#pragma clang diagnostic pop
-#elif
-#include <tut/tut.hpp>
-#endif
 
 #include "linden_common.h"
 #include "lltut.h"
diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp
index 32a016466d..fa4b085fd3 100755
--- a/indra/test/llpermissions_tut.cpp
+++ b/indra/test/llpermissions_tut.cpp
@@ -29,14 +29,7 @@
 #include <tut/tut.hpp>
 #include "linden_common.h"
 
-#if LL_DARWIN
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-function"
 #include "lltut.h"
-#pragma clang diagnostic pop
-#elif
-#include "lltut.h"
-#endif
 
 #include "message.h"
 #include "llpermissions.h"
-- 
cgit v1.2.3