summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-06-06 07:44:42 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-06-06 07:44:42 -0400
commit6516c9d07db42beba5ba9c0c41a33925794a249c (patch)
tree5fd2972fcb4b64de5e5dfeb94c3cd700d5058d99 /indra/llcommon
parent26ca3e14d623e4094dde76ad88e3da2a209483b5 (diff)
SL-18837: NamedTempFile back to std::function, use boost::phoenix <<
It seems the problem addressed by aab769e wasn't some synergy between Boost.Phoenix and Boost.Function, but rather the lack of a Phoenix header file introducing operator<<().
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/tests/llleap_test.cpp1
-rw-r--r--indra/llcommon/tests/llsdserialize_test.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp
index 99fd073dd2..0c91db3e24 100644
--- a/indra/llcommon/tests/llleap_test.cpp
+++ b/indra/llcommon/tests/llleap_test.cpp
@@ -19,6 +19,7 @@
// external library headers
#include <boost/assign/list_of.hpp>
#include <boost/phoenix/core/argument.hpp>
+#include <boost/phoenix/operator/bitwise.hpp> // operator<<()
// other Linden headers
#include "../test/lltut.h"
#include "../test/namedtempfile.h"
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index d7c11c5021..a0b8519508 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -50,6 +50,7 @@ typedef U32 uint32_t;
#include "boost/bind.hpp"
#include "boost/phoenix/bind/bind_function.hpp"
#include "boost/phoenix/core/argument.hpp"
+#include <boost/phoenix/operator/bitwise.hpp>
using namespace boost::phoenix;
#include "../llsd.h"