summaryrefslogtreecommitdiff
path: root/indra/test
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/test
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/test')
-rw-r--r--indra/test/namedtempfile.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/test/namedtempfile.h b/indra/test/namedtempfile.h
index acfc048b7a..84b62a0945 100644
--- a/indra/test/namedtempfile.h
+++ b/indra/test/namedtempfile.h
@@ -15,10 +15,10 @@
#include "llerror.h"
#include "stringize.h"
#include <string>
-#include <boost/function.hpp>
#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/noncopyable.hpp>
+#include <functional>
#include <iostream>
#include <sstream>
#include <string_view>
@@ -50,7 +50,7 @@ public:
// Function that accepts an ostream ref and (presumably) writes stuff to
// it, e.g.:
// (boost::phoenix::placeholders::arg1 << "the value is " << 17 << '\n')
- typedef boost::function<void(std::ostream&)> Streamer;
+ typedef std::function<void(std::ostream&)> Streamer;
NamedTempFile(const std::string_view& pfx,
const Streamer& func,