From aab769e9d7a9b11256572f8adb69d586d9ff8d3d Mon Sep 17 00:00:00 2001 From: Nat Goodspeed <nat@lindenlab.com> Date: Mon, 5 Jun 2023 23:24:34 -0400 Subject: 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. --- indra/test/namedtempfile.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra') 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, -- cgit v1.2.3