diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-06-06 13:34:01 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-06-06 13:34:01 -0400 |
| commit | e63c571d1336e3c521e1fc3a5e27bb77fc667790 (patch) | |
| tree | a4f877f4e527229e261ff5ac1bf1b322d5e9ed08 /indra | |
| parent | c4366378b61cacb9d87eb2917302fa17e9207491 (diff) | |
SL-18837: On Windows, NamedTempFile must convert from wstring
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/test/namedtempfile.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/test/namedtempfile.h b/indra/test/namedtempfile.h index 8cd6c990dc..da4fec97c8 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 @@ public: 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() { |