summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-06-05 23:24:34 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-06-05 23:24:34 -0400
commitaab769e9d7a9b11256572f8adb69d586d9ff8d3d (patch)
tree8d774c76731bc00a1cd73505e8f31825e643bdb5 /indra/test
parentca510f6c299335c8db27c65c10a8553801c06023 (diff)
SL-18837: Make NamedTempFile revert to boost::function
from std::function, since some consumers still use (e.g.) boost::phoenix::placeholders::arg1 to generate an inline callable.
Diffstat (limited to 'indra/test')
-rw-r--r--indra/test/namedtempfile.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/test/namedtempfile.h b/indra/test/namedtempfile.h
index 927e2b4fd9..df7495fc13 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/noncopyable.hpp>
+#include <boost/function.hpp>
#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
-#include <functional>
+#include <boost/noncopyable.hpp>
#include <iostream>
#include <sstream>
#include <string_view>
@@ -41,7 +41,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 std::function<void(std::ostream&)> Streamer;
+ typedef boost::function<void(std::ostream&)> Streamer;
NamedTempFile(const std::string_view& pfx,
const Streamer& func,