diff options
| author | Bernard Normier <bernard@zeroc.com> | 2003-04-09 15:03:35 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2003-04-09 15:03:35 +0000 |
| commit | 3cbc97486f02fdd25a532af96146aa956e51e26d (patch) | |
| tree | 49dadb69954c3c3ef6ce87a9320b8c5c7bb714b8 /cpp/src/Ice/Object.cpp | |
| parent | adding Strategy.ice (diff) | |
| download | ice-3cbc97486f02fdd25a532af96146aa956e51e26d.tar.bz2 ice-3cbc97486f02fdd25a532af96146aa956e51e26d.tar.xz ice-3cbc97486f02fdd25a532af96146aa956e51e26d.zip | |
Solaris/Sun C++ 5.4 port
Diffstat (limited to 'cpp/src/Ice/Object.cpp')
| -rw-r--r-- | cpp/src/Ice/Object.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index 5e1397a2c9b..b2b8d81a458 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -164,7 +164,7 @@ string Ice::Object::__all[] = DispatchStatus Ice::Object::__dispatch(Incoming& in, const Current& current) { - pair<const string*, const string*> r = + pair<string*, string*> r = equal_range(__all, __all + sizeof(__all) / sizeof(string), current.operation); if(r.first == r.second) @@ -226,8 +226,8 @@ Ice::Object::__read(::IceInternal::BasicStream* __is) while(sz-- > 0) { - pair<string, ObjectPtr> v; - __is->read(v.first); + pair<const string, ObjectPtr> v; + __is->read(const_cast<string&>(v.first)); __is->read("", 0, v.second); _activeFacetMapHint = _activeFacetMap.insert(_activeFacetMapHint, v); } @@ -263,8 +263,8 @@ Ice::Object::__unmarshal(const ::Ice::StreamPtr& __is) while(sz-- > 0) { __is->startReadDictionaryElement(); - pair<string, ObjectPtr> v; - v.first = __is->readString("ice:key"); + pair<const string, ObjectPtr> v; + const_cast<string&>(v.first) = __is->readString("ice:key"); v.second = __is->readObject("ice:value", "", 0); _activeFacetMapHint = _activeFacetMap.insert(_activeFacetMapHint, v); __is->endReadDictionaryElement(); @@ -298,7 +298,7 @@ Ice::Object::ice_addFacet(const ObjectPtr& facet, const string& name) throw ex; } - _activeFacetMapHint = _activeFacetMap.insert(_activeFacetMapHint, make_pair(name, facet)); + _activeFacetMapHint = _activeFacetMap.insert(_activeFacetMapHint, pair<const string, ObjectPtr>(name, facet)); } ObjectPtr |