diff options
Diffstat (limited to 'cpp/src/Ice/Reference.cpp')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 8e4946eb8c2..169a5c71a0c 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -65,7 +65,7 @@ ReferencePtr IceInternal::Reference::changeContext(const Context& newContext) const { ReferencePtr r = _instance->referenceFactory()->copy(this); - r->_context = newContext; + r->_context = new SharedContext(newContext); return r; } @@ -130,7 +130,7 @@ Reference::hash() const h = 5 * h + *p; } - for(q = _context.begin(); q != _context.end(); ++q) + for(q = _context->getValue().begin(); q != _context->getValue().end(); ++q) { for(p = q->first.begin(); p != q->first.end(); ++p) { @@ -297,7 +297,7 @@ IceInternal::Reference::operator==(const Reference& r) const return false; } - if(_context != r._context) + if(_context->getValue() != r._context->getValue()) { return false; } @@ -341,11 +341,11 @@ IceInternal::Reference::operator<(const Reference& r) const return false; } - if(_context < r._context) + if(_context->getValue() < r._context->getValue()) { return true; } - else if(r._context < _context) + else if(r._context->getValue() < _context->getValue()) { return false; } @@ -385,7 +385,7 @@ public: }; IceInternal::Reference::Reference(const InstancePtr& inst, const CommunicatorPtr& com, const Identity& ident, - const Context& ctx, const string& fs, Mode md) : + const SharedContextPtr& ctx, const string& fs, Mode md) : _hashInitialized(false), _instance(inst), _communicator(com), @@ -411,7 +411,7 @@ void IceInternal::incRef(IceInternal::FixedReference* p) { p->__incRef(); } void IceInternal::decRef(IceInternal::FixedReference* p) { p->__decRef(); } IceInternal::FixedReference::FixedReference(const InstancePtr& inst, const CommunicatorPtr& com, const Identity& ident, - const Context& ctx, const string& fs, Mode md, + const SharedContextPtr& ctx, const string& fs, Mode md, const vector<ConnectionIPtr>& fixedConns) : Reference(inst, com, ident, ctx, fs, md), _fixedConnections(fixedConns) @@ -989,7 +989,7 @@ IceInternal::RoutableReference::operator<(const Reference& r) const } IceInternal::RoutableReference::RoutableReference(const InstancePtr& inst, const CommunicatorPtr& com, - const Identity& ident, const Context& ctx, const string& fs, Mode md, + const Identity& ident, const SharedContextPtr& ctx, const string& fs, Mode md, bool sec, const RouterInfoPtr& rtrInfo, bool collocationOpt) : Reference(inst, com, ident, ctx, fs, md), _secure(sec), @@ -1177,7 +1177,7 @@ void IceInternal::incRef(IceInternal::DirectReference* p) { p->__incRef(); } void IceInternal::decRef(IceInternal::DirectReference* p) { p->__decRef(); } IceInternal::DirectReference::DirectReference(const InstancePtr& inst, const CommunicatorPtr& com, - const Identity& ident, const Context& ctx, const string& fs, Mode md, + const Identity& ident, const SharedContextPtr& ctx, const string& fs, Mode md, bool sec, const vector<EndpointIPtr>& endpts, const RouterInfoPtr& rtrInfo, bool collocationOpt) : RoutableReference(inst, com, ident, ctx, fs, md, sec, rtrInfo, collocationOpt), @@ -1425,7 +1425,7 @@ void IceInternal::incRef(IceInternal::IndirectReference* p) { p->__incRef(); } void IceInternal::decRef(IceInternal::IndirectReference* p) { p->__decRef(); } IceInternal::IndirectReference::IndirectReference(const InstancePtr& inst, const CommunicatorPtr& com, - const Identity& ident, const Context& ctx, const string& fs, Mode md, + const Identity& ident, const SharedContextPtr& ctx, const string& fs, Mode md, bool sec, const string& adptid, const RouterInfoPtr& rtrInfo, const LocatorInfoPtr& locInfo, bool collocationOpt, int locatorCacheTimeout) : |