merge changes for callum fixes and workarounds

3 files changed, 8 insertions, 0 deletions

diff --git a/indra/test/llbuffer_tut.cpp b/indra/test/llbuffer_tut.cpp
index a25fdebb7f..9b8aae6a73 100755
--- a/indra/test/llbuffer_tut.cpp
+++ b/indra/test/llbuffer_tut.cpp
@@ -27,6 +27,7 @@
  */
 
 #include <tut/tut.hpp>
+
 #include "linden_common.h"
 #include "lltut.h"
 #include "llbuffer.h"
diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp
index 8d8d47a667..fa4b085fd3 100755
--- a/indra/test/llpermissions_tut.cpp
+++ b/indra/test/llpermissions_tut.cpp
@@ -28,7 +28,9 @@
  
 #include <tut/tut.hpp>
 #include "linden_common.h"
+
 #include "lltut.h"
+
 #include "message.h"
 #include "llpermissions.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;