diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2007-01-03 18:08:31 +0000 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2007-01-03 18:08:31 +0000 |
commit | ae899e981811eec7ad4ee2c7bf354174cf7dfeaf (patch) | |
tree | 8606155063f77cf50d0d28e335c544bd776b603a /cpp/src/Ice/RouterInfo.h | |
parent | Added -bind_at_load, without this we get various crashes in the linker (diff) | |
download | ice-ae899e981811eec7ad4ee2c7bf354174cf7dfeaf.tar.bz2 ice-ae899e981811eec7ad4ee2c7bf354174cf7dfeaf.tar.xz ice-ae899e981811eec7ad4ee2c7bf354174cf7dfeaf.zip |
Bug 1327 - allow getClientProxy to return nil proxy
Diffstat (limited to 'cpp/src/Ice/RouterInfo.h')
-rw-r--r-- | cpp/src/Ice/RouterInfo.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h index 71d885cb394..32dacb0750a 100644 --- a/cpp/src/Ice/RouterInfo.h +++ b/cpp/src/Ice/RouterInfo.h @@ -15,6 +15,7 @@ #include <Ice/RouterInfoF.h> #include <Ice/RouterF.h> #include <Ice/ProxyF.h> +#include <Ice/EndpointIF.h> #include <set> @@ -55,10 +56,8 @@ public: bool operator<(const RouterInfo&) const; Ice::RouterPrx getRouter() const; - Ice::ObjectPrx getClientProxy(); - void setClientProxy(const Ice::ObjectPrx&); - Ice::ObjectPrx getServerProxy(); - void setServerProxy(const Ice::ObjectPrx&); + std::vector<IceInternal::EndpointIPtr> getClientEndpoints(); + std::vector<IceInternal::EndpointIPtr> getServerEndpoints(); void addProxy(const Ice::ObjectPrx&); void setAdapter(const Ice::ObjectAdapterPtr&); Ice::ObjectAdapterPtr getAdapter() const; @@ -66,8 +65,8 @@ public: private: const Ice::RouterPrx _router; - Ice::ObjectPrx _clientProxy; - Ice::ObjectPrx _serverProxy; + std::vector<IceInternal::EndpointIPtr> _clientEndpoints; + std::vector<IceInternal::EndpointIPtr> _serverEndpoints; Ice::ObjectAdapterPtr _adapter; std::set<Ice::Identity> _identities; }; |