diff options
| author | Mark Spruiell <mes@zeroc.com> | 2003-12-05 00:57:38 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2003-12-05 00:57:38 +0000 |
| commit | 931e8a6bd0a8ef0f86a0039fc59d485282927f86 (patch) | |
| tree | f6d6b6254e89758654c88b8526e2c8c2b6f21d47 /cpp/src/IceUtil/UUID.cpp | |
| parent | fix for rounded double (diff) | |
| download | ice-931e8a6bd0a8ef0f86a0039fc59d485282927f86.tar.bz2 ice-931e8a6bd0a8ef0f86a0039fc59d485282927f86.tar.xz ice-931e8a6bd0a8ef0f86a0039fc59d485282927f86.zip | |
removing UNICODE requirement on Win32
Diffstat (limited to 'cpp/src/IceUtil/UUID.cpp')
| -rw-r--r-- | cpp/src/IceUtil/UUID.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp index e60c9b45b6a..bcefe9fe008 100644 --- a/cpp/src/IceUtil/UUID.cpp +++ b/cpp/src/IceUtil/UUID.cpp @@ -13,7 +13,6 @@ // ********************************************************************** #include <IceUtil/UUID.h> -#include <IceUtil/Unicode.h> // On Windows, we use Windows's RPC UUID generator. // On other platforms, we use a high quality random number generator @@ -87,21 +86,11 @@ IceUtil::generateUUID() UUID uuid; UuidCreate(&uuid); -#if _MSC_VER > 1200 - wchar_t* str; -#else unsigned char* str; -#endif UuidToString(&uuid, &str); - string result; - -#if _MSC_VER > 1200 - result = wstringToString(wstring(str)); -#else - result = reinterpret_cast<char*>(str); -#endif + string result = reinterpret_cast<char*>(str); RpcStringFree(&str); return result; |