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/include/IceUtil/FileUtil.h | |
| 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/include/IceUtil/FileUtil.h')
| -rw-r--r-- | cpp/include/IceUtil/FileUtil.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h index aa70fd28b32..d943aa3f9df 100644 --- a/cpp/include/IceUtil/FileUtil.h +++ b/cpp/include/IceUtil/FileUtil.h @@ -136,11 +136,11 @@ typedef IceUtil::Handle<FileLock> FileLockPtr; // like ifstream and ofstream. // #if defined(_WIN32) && !defined(__MINGW32__) -ICE_API const wchar_t* streamFilename(const std::string&); +ICE_API std::wstring streamFilename(const std::string&); #else -inline const char* streamFilename(const std::string& filename) +inline std::string streamFilename(const std::string& filename) { - return filename.c_str(); + return filename; } #endif |