Skip to content
Snippets Groups Projects
Commit e63c571d authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

SL-18837: On Windows, NamedTempFile must convert from wstring

parent c4366378
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#define LL_NAMEDTEMPFILE_H #define LL_NAMEDTEMPFILE_H
#include "llerror.h" #include "llerror.h"
#include "llstring.h"
#include "stringize.h" #include "stringize.h"
#include <string> #include <string>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
...@@ -64,7 +65,8 @@ class NamedTempFile: public boost::noncopyable ...@@ -64,7 +65,8 @@ class NamedTempFile: public boost::noncopyable
boost::filesystem::remove(mPath); 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() void peep()
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment