diff options
| author | Mark Spruiell <mes@zeroc.com> | 2003-12-16 18:48:44 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2003-12-16 18:48:44 +0000 |
| commit | f4e4ec7afacea9a1f6635ee38eb70e49d8d28474 (patch) | |
| tree | d024e9d2d41ad34a138acaba76016ad3f2986644 /cpp/src | |
| parent | VC6 fixes (diff) | |
| download | ice-f4e4ec7afacea9a1f6635ee38eb70e49d8d28474.tar.bz2 ice-f4e4ec7afacea9a1f6635ee38eb70e49d8d28474.tar.xz ice-f4e4ec7afacea9a1f6635ee38eb70e49d8d28474.zip | |
removing Unicode usage
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IcePack/ComponentBuilder.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/IcePack/ComponentBuilder.cpp b/cpp/src/IcePack/ComponentBuilder.cpp index d13c1cde46a..b5e71a27d78 100644 --- a/cpp/src/IcePack/ComponentBuilder.cpp +++ b/cpp/src/IcePack/ComponentBuilder.cpp @@ -24,7 +24,6 @@ #include <sys/types.h> #ifdef _WIN32 -# include <IceUtil/Unicode.h> # include <direct.h> # include <io.h> # define S_ISDIR(mode) ((mode) & _S_IFDIR) @@ -91,9 +90,8 @@ public: #ifdef _WIN32 string pattern = _name + "/*"; - wstring wpattern = IceUtil::stringToWstring(pattern); WIN32_FIND_DATA data; - HANDLE hnd = FindFirstFile(wpattern.c_str(), &data); + HANDLE hnd = FindFirstFile(pattern.c_str(), &data); if(hnd == INVALID_HANDLE_VALUE) { // TODO: log a warning, throw an exception? @@ -104,8 +102,7 @@ public: { if((data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) { - wstring wname(data.cFileName); - files.push_back(_name + "/" + IceUtil::wstringToString(wname)); + files.push_back(_name + "/" + data.cFileName); } } while(FindNextFile(hnd, &data)); |