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/Object.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/Object.cpp')
| -rw-r--r-- | cpp/src/Ice/Object.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index b2b8d81a458..a57551c1673 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -53,7 +53,7 @@ Ice::Object::operator<(const Object& r) const Int Ice::Object::ice_hash() const { - return reinterpret_cast<Int>(this) >> 4; + return static_cast<Int>(reinterpret_cast<Long>(this) >> 4); } const string Ice::Object::__ids[] = @@ -238,7 +238,7 @@ Ice::Object::__marshal(const ::Ice::StreamPtr& __os) const { IceUtil::Mutex::Lock sync(_activeFacetMapMutex); - __os->startWriteDictionary("ice:facets", _activeFacetMap.size()); + __os->startWriteDictionary("ice:facets", static_cast<Int>(_activeFacetMap.size())); for(map<string, ObjectPtr>::const_iterator p = _activeFacetMap.begin(); p != _activeFacetMap.end(); ++p) { __os->startWriteDictionaryElement(); @@ -388,7 +388,7 @@ Ice::Object::ice_findFacet(const string& name) ObjectPtr Ice::Object::ice_findFacetPath(const vector<string>& path, int start) { - int sz = path.size(); + int sz = static_cast<int>(path.size()); if(start > sz) { |