diff options
author | Bernard Normier <bernard@zeroc.com> | 2003-04-29 19:51:33 +0000 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2003-04-29 19:51:33 +0000 |
commit | d6b805efcf63a16a759f0a104db74c5e9c009f7d (patch) | |
tree | 2a73b6a3e15c2cf711a0c4f1ab12dd52687e003e /cpp/src/Ice/ThreadPool.cpp | |
parent | file UserExceptionFactory.h was initially added on branch slicing. (diff) | |
download | ice-d6b805efcf63a16a759f0a104db74c5e9c009f7d.tar.bz2 ice-d6b805efcf63a16a759f0a104db74c5e9c009f7d.tar.xz ice-d6b805efcf63a16a759f0a104db74c5e9c009f7d.zip |
Sun: 64 bit + CC 5.3 support
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
-rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 5f4f6dfb6f2..53152fd03d8 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -634,11 +634,11 @@ IceInternal::ThreadPool::read(const EventHandlerPtr& handler) assert(stream.i == stream.b.end()); } - int pos = stream.i - stream.b.begin(); + ptrdiff_t pos = stream.i - stream.b.begin(); assert(pos >= headerSize); stream.i = stream.b.begin(); MagicBytes m(sizeof(magic), 0); - stream.readBlob(m, sizeof(magic)); + stream.readBlob(m, static_cast<Int>(sizeof(magic))); if(!equal(m.begin(), m.end(), magic)) { BadMagicException ex(__FILE__, __LINE__); |