diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-07-28 20:35:26 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-07-28 20:35:26 +0000 |
| commit | a7270eb607bf5602b6f10dbd2e78da18e4f3d6fb (patch) | |
| tree | ef3ca6c6da06abf84b16fcb3eff00f36ab5d65d3 /cppe/src/IceE/ReferenceFactory.cpp | |
| parent | cleaning up the Ruby settings (diff) | |
| download | ice-a7270eb607bf5602b6f10dbd2e78da18e4f3d6fb.tar.bz2 ice-a7270eb607bf5602b6f10dbd2e78da18e4f3d6fb.tar.xz ice-a7270eb607bf5602b6f10dbd2e78da18e4f3d6fb.zip | |
restored setDefaultContext
Diffstat (limited to 'cppe/src/IceE/ReferenceFactory.cpp')
| -rw-r--r-- | cppe/src/IceE/ReferenceFactory.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/cppe/src/IceE/ReferenceFactory.cpp b/cppe/src/IceE/ReferenceFactory.cpp index 2d9fdee24e4..1c07371db19 100644 --- a/cppe/src/IceE/ReferenceFactory.cpp +++ b/cppe/src/IceE/ReferenceFactory.cpp @@ -53,7 +53,7 @@ IceInternal::ReferenceFactory::copy(const Reference* r) const ReferencePtr IceInternal::ReferenceFactory::create(const Identity& ident, - const Context& context, + const SharedContextPtr& context, const string& facet, Reference::Mode mode, bool secure, @@ -89,7 +89,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, ReferencePtr IceInternal::ReferenceFactory::create(const Identity& ident, - const Context& context, + const SharedContextPtr& context, const string& facet, Reference::Mode mode, bool secure, @@ -126,7 +126,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, ReferencePtr IceInternal::ReferenceFactory::create(const Identity& ident, - const Context& context, + const SharedContextPtr& context, const string& facet, Reference::Mode mode, const vector<Ice::ConnectionPtr>& fixedConnections) @@ -441,10 +441,10 @@ IceInternal::ReferenceFactory::create(const string& str) { #ifdef ICEE_HAS_LOCATOR # ifdef ICEE_HAS_ROUTER - return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, "", routerInfo, + return create(ident, _instance->getDefaultContext(), facet, mode, secure, "", routerInfo, locatorInfo); # else - return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, "", locatorInfo); + return create(ident, _instance->getDefaultContext(), facet, mode, secure, "", locatorInfo); # endif #else ProxyParseException ex(__FILE__, __LINE__); @@ -503,10 +503,10 @@ IceInternal::ReferenceFactory::create(const string& str) } #ifdef ICEE_HAS_ROUTER - return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, endpoints, + return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints, routerInfo); #else - return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, endpoints); + return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints); #endif break; } @@ -559,10 +559,10 @@ IceInternal::ReferenceFactory::create(const string& str) } #ifdef ICEE_HAS_ROUTER - return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, adapter, + return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapter, routerInfo, locatorInfo); #else - return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, adapter, + return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapter, locatorInfo); #endif break; @@ -637,10 +637,10 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) endpoints.push_back(endpoint); } #ifdef ICEE_HAS_ROUTER - return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, endpoints, + return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints, routerInfo); #else - return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, endpoints); + return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints); #endif } else @@ -649,10 +649,10 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) LocatorInfoPtr locatorInfo = _instance->locatorManager()->get(getDefaultLocator()); s->read(adapterId); # ifdef ICEE_HAS_ROUTER - return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, adapterId, + return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapterId, routerInfo, locatorInfo); # else - return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, adapterId, + return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapterId, locatorInfo); # endif #else |