diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2014-12-10 11:15:56 -0800 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2014-12-10 11:15:56 -0800 |
commit | d74d8ff7c5ed4a145f8ab440c9e21f46ff35f2a0 (patch) | |
tree | e15a9a40ab66d9be2203c38654ec9e06d9ce1b0e | |
parent | 6ad2b5f8d3e4c240a48452578d5c3101a2811053 (diff) |
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.
-rwxr-xr-x | indra/test/namedtempfile.h | 10 |
1 files changed, 5 insertions, 5 deletions
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): |