From e63c571d1336e3c521e1fc3a5e27bb77fc667790 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 6 Jun 2023 13:34:01 -0400
Subject: [PATCH] SL-18837: On Windows, NamedTempFile must convert from wstring
---
indra/test/namedtempfile.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/indra/test/namedtempfile.h b/indra/test/namedtempfile.h
index 8cd6c990dc5..da4fec97c87 100644
--- a/indra/test/namedtempfile.h
+++ b/indra/test/namedtempfile.h
@@ -13,6 +13,7 @@
#define LL_NAMEDTEMPFILE_H
#include "llerror.h"
+#include "llstring.h"
#include "stringize.h"
#include <string>
#include <boost/filesystem.hpp>
@@ -64,7 +65,8 @@ class NamedTempFile: public boost::noncopyable
boost::filesystem::remove(mPath);
}
- virtual std::string getName() const { return mPath.native(); }
+ // On Windows, path::native() returns a wstring
+ std::string getName() const { return ll_convert<std::string>(mPath.native()); }
void peep()
{
--
GitLab