diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2005-10-27 15:55:14 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2005-10-27 15:55:14 +0000 |
| commit | 6784d4bde53175419fb12afb1f01f03575a3fdbd (patch) | |
| tree | 958e08ab1170b6f8010f77606ae63de4fef2cd53 /cppe/src/IceE/Reference.cpp | |
| parent | Renamed IceBox library and executable (diff) | |
| download | ice-6784d4bde53175419fb12afb1f01f03575a3fdbd.tar.bz2 ice-6784d4bde53175419fb12afb1f01f03575a3fdbd.tar.xz ice-6784d4bde53175419fb12afb1f01f03575a3fdbd.zip | |
Removed ice_default()
Diffstat (limited to 'cppe/src/IceE/Reference.cpp')
| -rw-r--r-- | cppe/src/IceE/Reference.cpp | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/cppe/src/IceE/Reference.cpp b/cppe/src/IceE/Reference.cpp index df1cad4aa89..dc29b400091 100644 --- a/cppe/src/IceE/Reference.cpp +++ b/cppe/src/IceE/Reference.cpp @@ -103,17 +103,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->_secure = false; - r->_context = _instance->getDefaultContext(); - r->_facet = ""; - return r; -} - Int Reference::hash() const { @@ -591,14 +580,6 @@ IceInternal::RoutableReference::getRoutedEndpoints() const } ReferencePtr -IceInternal::RoutableReference::changeDefault() const -{ - RoutableReferencePtr r = RoutableReferencePtr::dynamicCast(Reference::changeDefault()); - r->_routerInfo = getInstance()->routerManager()->get(getInstance()->referenceFactory()->getDefaultRouter()); - return r; -} - -ReferencePtr IceInternal::RoutableReference::changeRouter(const RouterPrx& newRouter) const { RouterInfoPtr newRouterInfo = getInstance()->routerManager()->get(newRouter); @@ -710,32 +691,6 @@ IceInternal::DirectReference::changeEndpoints(const vector<EndpointPtr>& newEndp return r; } -ReferencePtr -IceInternal::DirectReference::changeDefault() const -{ - // - // Return an indirect reference if a default locator is set. - // -#ifdef ICEE_HAS_LOCATOR - LocatorPrx loc = getInstance()->referenceFactory()->getDefaultLocator(); - if(loc) - { - LocatorInfoPtr newLocatorInfo = getInstance()->locatorManager()->get(loc); -#ifdef ICEE_HAS_ROUTER - return getInstance()->referenceFactory()->create(getIdentity(), Context(), "", ModeTwoway, false, - "", 0, newLocatorInfo); -#else - return getInstance()->referenceFactory()->create(getIdentity(), Context(), "", ModeTwoway, false, - "", newLocatorInfo); -#endif - } - else -#endif // ICEE_HAS_LOCATOR - { - return Parent::changeDefault(); - } -} - #ifdef ICEE_HAS_LOCATOR ReferencePtr @@ -940,31 +895,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) - { -#ifdef ICEE_HAS_ROUTER - return getInstance()->referenceFactory()->create(getIdentity(), Context(), "", ModeTwoway, false, - vector<EndpointPtr>(), getRouterInfo()); -#else - return getInstance()->referenceFactory()->create(getIdentity(), Context(), "", ModeTwoway, false, - vector<EndpointPtr>()); -#endif - } - else - { - IndirectReferencePtr r = IndirectReferencePtr::dynamicCast(Parent::changeDefault()); - r->_locatorInfo = getInstance()->locatorManager()->get(loc); - return r; - } -} - -ReferencePtr IceInternal::IndirectReference::changeLocator(const LocatorPrx& newLocator) const { // |