diff options
author | Bernard Normier <bernard@zeroc.com> | 2016-07-11 12:12:32 -0400 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2016-07-11 12:12:32 -0400 |
commit | c82c5fa257bdbd1d76024ec1cc188d4ade3bead6 (patch) | |
tree | 2476163048f60215a0674ad98499b030afeb048f /cpp/src/IceUtil | |
parent | Add missing file from previous commit (diff) | |
download | ice-c82c5fa257bdbd1d76024ec1cc188d4ade3bead6.tar.bz2 ice-c82c5fa257bdbd1d76024ec1cc188d4ade3bead6.tar.xz ice-c82c5fa257bdbd1d76024ec1cc188d4ade3bead6.zip |
Fixed streamFilename bug
Diffstat (limited to 'cpp/src/IceUtil')
-rw-r--r-- | cpp/src/IceUtil/FileUtil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp index 13cedac2d2a..0bb94620137 100644 --- a/cpp/src/IceUtil/FileUtil.cpp +++ b/cpp/src/IceUtil/FileUtil.cpp @@ -345,10 +345,10 @@ IceUtilInternal::FileLock::~FileLock() } #ifndef __MINGW32__ -const wchar_t* +wstring IceUtilInternal::streamFilename(const string& filename) { - return IceUtil::stringToWstring(filename, IceUtil::getProcessStringConverter()).c_str(); + return IceUtil::stringToWstring(filename, IceUtil::getProcessStringConverter()); } #endif |