diff options
author | Bernard Normier <bernard@zeroc.com> | 2018-10-26 17:17:11 -0400 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2018-10-26 17:17:11 -0400 |
commit | 42c905a3ca29a1e911e7def9c2d9d9b8e95383cd (patch) | |
tree | 1b704d084e39c0acd15859f2dd258eff7aaa7fc6 /cpp/src/IceGrid/Client.cpp | |
parent | Do not use time.clock() with Python >= 3.3 as it is deprecated (diff) | |
download | ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.tar.bz2 ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.tar.xz ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.zip |
Extra C++ warning flags with clang and g++.
Fixes 223.
Diffstat (limited to 'cpp/src/IceGrid/Client.cpp')
-rw-r--r-- | cpp/src/IceGrid/Client.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp index 36f7c502716..c25c84d690b 100644 --- a/cpp/src/IceGrid/Client.cpp +++ b/cpp/src/IceGrid/Client.cpp @@ -387,8 +387,8 @@ run(const Ice::StringSeq& args) // to lookup for locator proxies. We destroy the plugin, once we have selected a // locator. // - Ice::PluginPtr p = createIceLocatorDiscovery(communicator, "IceGridAdmin.Discovery", Ice::StringSeq()); - IceLocatorDiscovery::PluginPtr plugin = IceLocatorDiscovery::PluginPtr::dynamicCast(p); + Ice::PluginPtr pluginObj = createIceLocatorDiscovery(communicator, "IceGridAdmin.Discovery", Ice::StringSeq()); + IceLocatorDiscovery::PluginPtr plugin = IceLocatorDiscovery::PluginPtr::dynamicCast(pluginObj); plugin->initialize(); vector<Ice::LocatorPrx> locators = plugin->getLocators(instanceName, IceUtil::Time::milliSeconds(300)); @@ -610,8 +610,8 @@ run(const Ice::StringSeq& args) if(registry->ice_getIdentity() == localRegistry->ice_getIdentity()) { Ice::ObjectAdapterPtr colloc = communicator->createObjectAdapter(""); // colloc-only adapter - Ice::ObjectPrx router = colloc->addWithUUID(new ReuseConnectionRouter(locator)); - communicator->setDefaultRouter(Ice::RouterPrx::uncheckedCast(router)); + communicator->setDefaultRouter(Ice::RouterPrx::uncheckedCast( + colloc->addWithUUID(new ReuseConnectionRouter(locator)))); registry = registry->ice_router(communicator->getDefaultRouter()); } |