diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-05-11 12:33:14 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-05-11 12:33:14 -0230 |
| commit | 1fb6c38f2f6e33e3ef804aafda324c1bcb0ac7b5 (patch) | |
| tree | d95f06135aa5844e5d914e8bb37b96d4b2401dca /cpp/src/Ice/Reference.cpp | |
| parent | Bug 3885 - do not use localhost as node name in demos (diff) | |
| download | ice-1fb6c38f2f6e33e3ef804aafda324c1bcb0ac7b5.tar.bz2 ice-1fb6c38f2f6e33e3ef804aafda324c1bcb0ac7b5.tar.xz ice-1fb6c38f2f6e33e3ef804aafda324c1bcb0ac7b5.zip | |
Bug 3878 - remove some deprecated features
Diffstat (limited to 'cpp/src/Ice/Reference.cpp')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 939cfc61f69..8dccf73240a 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -46,14 +46,6 @@ struct RandomNumberGenerator : public std::unary_function<ptrdiff_t, ptrdiff_t> } -ReferencePtr -IceInternal::Reference::defaultContext() const -{ - ReferencePtr r = _instance->referenceFactory()->copy(this); - r->_context = _instance->getDefaultContext(); - return r; -} - CommunicatorPtr IceInternal::Reference::getCommunicator() const { @@ -411,7 +403,6 @@ public: IceInternal::Reference::Reference(const InstancePtr& instance, const CommunicatorPtr& communicator, const Identity& id, - const SharedContextPtr& context, const string& facet, Mode mode, bool secure) : @@ -421,7 +412,7 @@ IceInternal::Reference::Reference(const InstancePtr& instance, _mode(mode), _secure(secure), _identity(id), - _context(context), + _context(new SharedContext), _facet(facet), _overrideCompress(false), _compress(false) @@ -488,12 +479,11 @@ IceUtil::Shared* IceInternal::upCast(IceInternal::FixedReference* p) { return p; IceInternal::FixedReference::FixedReference(const InstancePtr& instance, const CommunicatorPtr& communicator, const Identity& id, - const SharedContextPtr& context, const string& facet, Mode mode, bool secure, const ConnectionIPtr& fixedConnection) : - Reference(instance, communicator, id, context, facet, mode, secure), + Reference(instance, communicator, id, facet, mode, secure), _fixedConnection(fixedConnection) { } @@ -785,7 +775,6 @@ IceUtil::Shared* IceInternal::upCast(IceInternal::RoutableReference* p) { return IceInternal::RoutableReference::RoutableReference(const InstancePtr& instance, const CommunicatorPtr& communicator, const Identity& id, - const SharedContextPtr& context, const string& facet, Mode mode, bool secure, @@ -798,7 +787,7 @@ IceInternal::RoutableReference::RoutableReference(const InstancePtr& instance, bool preferSecure, EndpointSelectionType endpointSelection, int locatorCacheTimeout) : - Reference(instance, communicator, id, context, facet, mode, secure), + Reference(instance, communicator, id, facet, mode, secure), _endpoints(endpoints), _adapterId(adapterId), _locatorInfo(locatorInfo), |