From c54d102c8f7f336e3ad2144710e51062b5eeac97 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 5 Dec 2014 08:48:10 -0500
Subject: Wrap #pragma clang in #if __clang__, else VS produces fatal warnings.

---
 indra/test/lltut.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/test')

diff --git a/indra/test/lltut.h b/indra/test/lltut.h
index b334fb51e2..9835565bb6 100755
--- a/indra/test/lltut.h
+++ b/indra/test/lltut.h
@@ -75,10 +75,14 @@ namespace tut
 // overloads declared above.
 
 // turn off warnings about unused functions from clang for tut package
+#if __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-function"
+#endif
 #include <tut/tut.hpp>
+#if __clang__
 #pragma clang diagnostic pop
+#endif
 
 // The functions BELOW this point actually consume tut.hpp functionality.
 namespace tut
-- 
cgit v1.3


From d74d8ff7c5ed4a145f8ab440c9e21f46ff35f2a0 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 10 Dec 2014 11:15:56 -0800
Subject: Replace boost::lambda::_1 with boost::phoenix::placeholders::arg1.
 Apparently in Boost 1.57 with Xcode 6, the combination of Boost.Lambda and
 Boost.Function is broken -- Trac ticket 10864:
 https://svn.boost.org/trac/boost/ticket/10864 However, Boost.Phoenix provides
 an acceptable replacement.

---
 indra/test/namedtempfile.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/test')

diff --git a/indra/test/namedtempfile.h b/indra/test/namedtempfile.h
index 6069064627..7d59cad32c 100755
--- a/indra/test/namedtempfile.h
+++ b/indra/test/namedtempfile.h
@@ -17,8 +17,8 @@
 #include "apr_file_io.h"
 #include <string>
 #include <boost/function.hpp>
-#include <boost/lambda/lambda.hpp>
-#include <boost/lambda/bind.hpp>
+#include <boost/phoenix/core/argument.hpp>
+#include <boost/phoenix/operator/bitwise.hpp>
 #include <boost/noncopyable.hpp>
 #include <iostream>
 #include <sstream>
@@ -34,19 +34,19 @@ public:
     NamedTempFile(const std::string& pfx, const std::string& content, apr_pool_t* pool=gAPRPoolp):
         mPool(pool)
     {
-        createFile(pfx, boost::lambda::_1 << content);
+        createFile(pfx, boost::phoenix::placeholders::arg1 << content);
     }
 
     // Disambiguate when passing string literal
     NamedTempFile(const std::string& pfx, const char* content, apr_pool_t* pool=gAPRPoolp):
         mPool(pool)
     {
-        createFile(pfx, boost::lambda::_1 << content);
+        createFile(pfx, boost::phoenix::placeholders::arg1 << content);
     }
 
     // Function that accepts an ostream ref and (presumably) writes stuff to
     // it, e.g.:
-    // (boost::lambda::_1 << "the value is " << 17 << '\n')
+    // (boost::phoenix::placeholders::arg1 << "the value is " << 17 << '\n')
     typedef boost::function<void(std::ostream&)> Streamer;
 
     NamedTempFile(const std::string& pfx, const Streamer& func, apr_pool_t* pool=gAPRPoolp):
-- 
cgit v1.3


From 210c95b283332bc463edb8baa2d6438c3fd500af Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 16 Dec 2014 14:03:57 -0500
Subject: Remove Visual Studio workaround for lack of std::fpclassify(). Visual
 Studio 2013 evidently does provide std::fpclassify(), so we no longer need
 the funky local alias.

---
 indra/test/llsd_new_tut.cpp | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/test')

diff --git a/indra/test/llsd_new_tut.cpp b/indra/test/llsd_new_tut.cpp
index 81db191ca6..458df3361e 100755
--- a/indra/test/llsd_new_tut.cpp
+++ b/indra/test/llsd_new_tut.cpp
@@ -33,18 +33,7 @@
 #include "llsdtraits.h"
 #include "llstring.h"
 
-#if LL_WINDOWS
-#include <float.h>
-namespace
-{
-	int fpclassify(double x)
-	{
-		return _fpclass(x);
-	}
-}
-#else
 using std::fpclassify;
-#endif
 
 namespace tut
 {
-- 
cgit v1.3