summaryrefslogtreecommitdiff
path: root/cpp/src/IceUtil/UUID.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2003-04-29 19:51:33 +0000
committerBernard Normier <bernard@zeroc.com>2003-04-29 19:51:33 +0000
commitd6b805efcf63a16a759f0a104db74c5e9c009f7d (patch)
tree2a73b6a3e15c2cf711a0c4f1ab12dd52687e003e /cpp/src/IceUtil/UUID.cpp
parentfile UserExceptionFactory.h was initially added on branch slicing. (diff)
downloadice-d6b805efcf63a16a759f0a104db74c5e9c009f7d.tar.bz2
ice-d6b805efcf63a16a759f0a104db74c5e9c009f7d.tar.xz
ice-d6b805efcf63a16a759f0a104db74c5e9c009f7d.zip
Sun: 64 bit + CC 5.3 support
Diffstat (limited to 'cpp/src/IceUtil/UUID.cpp')
-rw-r--r--cpp/src/IceUtil/UUID.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index 9fe4ea8eb64..910158b112a 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.cpp
@@ -45,9 +45,9 @@ inline void halfByteToHex(unsigned char hb, char*& hexBuffer)
}
}
-inline void bytesToHex(unsigned char* bytes, int len, char*& hexBuffer)
+inline void bytesToHex(unsigned char* bytes, size_t len, char*& hexBuffer)
{
- for(int i = 0; i < len; i++)
+ for(size_t i = 0; i < len; i++)
{
halfByteToHex((bytes[i] & 0xF0) >> 4, hexBuffer);
halfByteToHex((bytes[i] & 0x0F), hexBuffer);
@@ -134,7 +134,7 @@ IceUtil::generateUUID()
assert(sizeof(UUID) == 16);
- ssize_t bytesRead = read(fd, &uuid, sizeof(UUID));
+ size_t bytesRead = read(fd, &uuid, sizeof(UUID));
if (bytesRead != sizeof(UUID))
{