diff options
| author | Bernard Normier <bernard@zeroc.com> | 2003-04-24 16:43:00 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2003-04-24 16:43:00 +0000 |
| commit | 38799e58ddb78e9ada2c63694bbf54b6746f71bf (patch) | |
| tree | 40ea71b972895ad06ff92b5631bc4a73bac788f6 /cpp/src/Ice/Reference.cpp | |
| parent | override Ice.Default.Locator to avoid iceboxadmin error message (diff) | |
| download | ice-38799e58ddb78e9ada2c63694bbf54b6746f71bf.tar.bz2 ice-38799e58ddb78e9ada2c63694bbf54b6746f71bf.tar.xz ice-38799e58ddb78e9ada2c63694bbf54b6746f71bf.zip | |
Eliminated numerous warnings from Sun C++ 5.4 builds
Diffstat (limited to 'cpp/src/Ice/Reference.cpp')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 38d9bf3c26a..bffa4b46929 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -599,11 +599,11 @@ IceInternal::Reference::changeCollocationOptimization(bool newCollocationOptimiz ReferencePtr IceInternal::Reference::changeDefault() const { - RouterInfoPtr routerInfo = instance->routerManager()->get(instance->referenceFactory()->getDefaultRouter()); - LocatorInfoPtr locatorInfo = instance->locatorManager()->get(instance->referenceFactory()->getDefaultLocator()); + RouterInfoPtr defaultRouterInfo = instance->routerManager()->get(instance->referenceFactory()->getDefaultRouter()); + LocatorInfoPtr defaultLocatorInfo = instance->locatorManager()->get(instance->referenceFactory()->getDefaultLocator()); return instance->referenceFactory()->create(identity, FacetPath(), ModeTwoway, false, adapterId, - endpoints, routerInfo, locatorInfo, 0, true); + endpoints, defaultRouterInfo, defaultLocatorInfo, 0, true); } IceInternal::Reference::Reference(const InstancePtr& inst, |