diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 66 | ||||
| -rw-r--r-- | cpp/src/Ice/Reference.h | 11 |
2 files changed, 1 insertions, 76 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 8b22308978a..bf50f0c0bca 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -97,16 +97,6 @@ IceInternal::Reference::changeFacet(const string& newFacet) const return r; } -ReferencePtr -IceInternal::Reference::changeDefault() const -{ - ReferencePtr r = _instance->referenceFactory()->copy(this); - r->_mode = ModeTwoway; - r->_context = _instance->getDefaultContext(); - r->_facet = ""; - return r; -} - Int Reference::hash() const { @@ -466,8 +456,7 @@ IceInternal::FixedReference::changeCompress(bool) const { // TODO: FixedReferences should probably have a _compress flag, // that gets its default from the fixed connection this reference - // refers to. This should be changable with changeCompress(), and - // reset in changeDefault(). + // refers to. This should be changable with changeCompress(). return FixedReferencePtr(const_cast<FixedReference*>(this)); } @@ -614,16 +603,6 @@ IceInternal::RoutableReference::getCollocationOptimization() const } ReferencePtr -IceInternal::RoutableReference::changeDefault() const -{ - RoutableReferencePtr r = RoutableReferencePtr::dynamicCast(Reference::changeDefault()); - r->_secure = false; - r->_routerInfo = getInstance()->routerManager()->get(getInstance()->referenceFactory()->getDefaultRouter()); - r->_collocationOptimization = getInstance()->defaultsAndOverrides()->defaultCollocationOptimization; - return r; -} - -ReferencePtr IceInternal::RoutableReference::changeSecure(bool newSecure) const { if(newSecure == _secure) @@ -770,27 +749,6 @@ IceInternal::DirectReference::getEndpoints() const } ReferencePtr -IceInternal::DirectReference::changeDefault() const -{ - // - // Return an indirect reference if a default locator is set. - // - LocatorPrx loc = getInstance()->referenceFactory()->getDefaultLocator(); - if(loc) - { - LocatorInfoPtr newLocatorInfo = getInstance()->locatorManager()->get(loc); - return getInstance()->referenceFactory()->create(getIdentity(), getInstance()->getDefaultContext(), "", - ModeTwoway, false, "", 0, newLocatorInfo, - getInstance()->defaultsAndOverrides()-> - defaultCollocationOptimization); - } - else - { - return RoutableReference::changeDefault(); - } -} - -ReferencePtr IceInternal::DirectReference::changeLocator(const LocatorPrx& newLocator) const { if(newLocator) @@ -1031,28 +989,6 @@ IceInternal::IndirectReference::getEndpoints() const } ReferencePtr -IceInternal::IndirectReference::changeDefault() const -{ - // - // Return a direct reference if no default locator is defined. - // - LocatorPrx loc = getInstance()->referenceFactory()->getDefaultLocator(); - if(!loc) - { - return getInstance()->referenceFactory()->create(getIdentity(), getInstance()->getDefaultContext(), "", - ModeTwoway, false, vector<EndpointIPtr>(), getRouterInfo(), - getInstance()->defaultsAndOverrides()-> - defaultCollocationOptimization); - } - else - { - IndirectReferencePtr r = IndirectReferencePtr::dynamicCast(RoutableReference::changeDefault()); - r->_locatorInfo = getInstance()->locatorManager()->get(loc); - return r; - } -} - -ReferencePtr IceInternal::IndirectReference::changeLocator(const LocatorPrx& newLocator) const { // diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h index a0ce1608a7a..41ce6eddd84 100644 --- a/cpp/src/Ice/Reference.h +++ b/cpp/src/Ice/Reference.h @@ -67,11 +67,6 @@ public: ReferencePtr changeIdentity(const Ice::Identity&) const; ReferencePtr changeFacet(const std::string&) const; - // - // Return a reference in the default configuration. - // - virtual ReferencePtr changeDefault() const; - virtual ReferencePtr changeSecure(bool) const = 0; virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const = 0; virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const = 0; @@ -181,8 +176,6 @@ public: virtual bool getSecure() const; virtual bool getCollocationOptimization() const; - virtual ReferencePtr changeDefault() const; - virtual ReferencePtr changeSecure(bool) const; virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const; virtual ReferencePtr changeCollocationOptimization(bool) const; @@ -219,8 +212,6 @@ public: virtual std::string getAdapterId() const; virtual std::vector<EndpointIPtr> getEndpoints() const; - virtual ReferencePtr changeDefault() const; - virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const; virtual ReferencePtr changeCompress(bool) const; virtual ReferencePtr changeTimeout(int) const; @@ -260,8 +251,6 @@ public: virtual std::string getAdapterId() const; virtual std::vector<EndpointIPtr> getEndpoints() const; - virtual ReferencePtr changeDefault() const; - virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const; virtual ReferencePtr changeCompress(bool) const; virtual ReferencePtr changeTimeout(int) const; |