summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/test/namedtempfile.h4
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()
{