diff options
Diffstat (limited to 'cpp/test/Ice/location/ServerLocator.h')
| -rw-r--r-- | cpp/test/Ice/location/ServerLocator.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/cpp/test/Ice/location/ServerLocator.h b/cpp/test/Ice/location/ServerLocator.h index 6def6f3b92c..15ed39a4897 100644 --- a/cpp/test/Ice/location/ServerLocator.h +++ b/cpp/test/Ice/location/ServerLocator.h @@ -19,22 +19,22 @@ class ServerLocatorRegistry : public Test::TestLocatorRegistry public: ServerLocatorRegistry(); - - + + #ifdef ICE_CPP11_MAPPING - virtual void setAdapterDirectProxy_async(std::string, std::shared_ptr<::Ice::ObjectPrx>, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); - virtual void setReplicatedAdapterDirectProxy_async(std::string, std::string, std::shared_ptr<Ice::ObjectPrx>, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); - - virtual void setServerProcessProxy_async(std::string, std::shared_ptr<Ice::ProcessPrx>, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void setAdapterDirectProxyAsync(std::string, std::shared_ptr<::Ice::ObjectPrx>, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); + virtual void setReplicatedAdapterDirectProxyAsync(std::string, std::string, std::shared_ptr<Ice::ObjectPrx>, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); + + virtual void setServerProcessProxyAsync(std::string, std::shared_ptr<Ice::ProcessPrx>, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); void addObject(std::shared_ptr<::Ice::ObjectPrx>, const ::Ice::Current&); #else virtual void setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr&, @@ -46,7 +46,7 @@ public: const ::std::string&, const ::Ice::ProcessPrx&, const ::Ice::Current&); void addObject(const ::Ice::ObjectPrx&, const ::Ice::Current&); #endif - + // // Internal method // @@ -55,7 +55,7 @@ public: void addObject(const ::Ice::ObjectPrxPtr&); private: - + ::std::map< ::std::string, ::Ice::ObjectPrxPtr> _adapters; ::std::map< ::Ice::Identity, ::Ice::ObjectPrxPtr> _objects; }; @@ -68,20 +68,20 @@ public: ServerLocator(const ::ServerLocatorRegistryPtr&, const ::Ice::LocatorRegistryPrxPtr&); #ifdef ICE_CPP11_MAPPING - virtual void findObjectById_async(::Ice::Identity, + virtual void findObjectByIdAsync(::Ice::Identity, std::function<void (const std::shared_ptr<Ice::ObjectPrx>&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&) const; - virtual void findAdapterById_async(::std::string, + virtual void findAdapterByIdAsync(::std::string, std::function<void (const std::shared_ptr<Ice::ObjectPrx>&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&) const; #else - virtual void findObjectById_async(const ::Ice::AMD_Locator_findObjectByIdPtr&, const ::Ice::Identity&, + virtual void findObjectById_async(const ::Ice::AMD_Locator_findObjectByIdPtr&, const ::Ice::Identity&, const ::Ice::Current&) const; - virtual void findAdapterById_async(const ::Ice::AMD_Locator_findAdapterByIdPtr&, const ::std::string&, + virtual void findAdapterById_async(const ::Ice::AMD_Locator_findAdapterByIdPtr&, const ::std::string&, const ::Ice::Current&) const; #endif virtual ::Ice::LocatorRegistryPrxPtr getRegistry(const ::Ice::Current&) const; @@ -89,7 +89,7 @@ public: virtual int getRequestCount(const Ice::Current&) const; private: - + ServerLocatorRegistryPtr _registry; ::Ice::LocatorRegistryPrxPtr _registryPrx; int _requestCount; |