summaryrefslogtreecommitdiff
path: root/cpp/src/IceUtil/UUID.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceUtil/UUID.cpp')
-rw-r--r--cpp/src/IceUtil/UUID.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index 9ec636057d9..7b2ea932377 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.cpp
@@ -28,8 +28,13 @@ IceUtil::generateUUID()
UUID uuid;
UuidCreate(&uuid);
+
+#if _MSC_VER == 1200
+ unsigned char* str;
+#else
+ unsigned short* str; // Type has changed for some reason in VC++ 2002 (but doc still
+#endif // says it's unsigned char *...)
- unsigned char* str;
UuidToString(&uuid, &str);
string result(reinterpret_cast<char*>(str));