From 3b7d3cb1ea8c6f5f51d727732bbff8a6d89f3d33 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 16 Dec 2014 15:17:24 -0500
Subject: [PATCH] For one use case, boost::bind() better than
boost::phoenix::bind(). We use boost::phoenix::placeholders::arg1 to imply a
whole lambda expression, replacing boost::lambda. But to bind a plain
function in a more straightforward way, seems classic boost::bind() works
while boost::phoenix::bind() does not.
---
indra/llcommon/tests/llsdserialize_test.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index afd4e7c8c18..6fbb9abfc00 100755
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -46,6 +46,7 @@ typedef U32 uint32_t;
#include "boost/range.hpp"
#include "boost/foreach.hpp"
#include "boost/function.hpp"
+#include "boost/bind.hpp"
#include "boost/phoenix/bind/bind_function.hpp"
#include "boost/phoenix/core/argument.hpp"
using namespace boost::phoenix;
@@ -1659,7 +1660,7 @@ namespace tut
// takes a callable. To this callable it passes the
// std::ostream with which it's writing the
// NamedTempFile.
- bind(writeLLSDArray, placeholders::arg1, cdata));
+ boost::bind(writeLLSDArray, _1, cdata));
python("read C++ notation",
placeholders::arg1 <<
--
GitLab