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')

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.2.3