1 files changed, 47 insertions, 11 deletions

diff --git a/cpp/src/IceDiscovery/LocatorI.h b/cpp/src/IceDiscovery/LocatorI.h
index 329c469daca..4f17f79a187 100644
--- a/cpp/src/IceDiscovery/LocatorI.h
+++ b/cpp/src/IceDiscovery/LocatorI.h
@@ -24,6 +24,29 @@ public:
 
     LocatorRegistryI(const Ice::CommunicatorPtr&);
     
+#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&);
+#else
     virtual void 
     setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr&, const std::string&, 
                                 const Ice::ObjectPrx&, const Ice::Current&);
@@ -36,27 +59,40 @@ public:
     virtual void 
     setServerProcessProxy_async(const Ice::AMD_LocatorRegistry_setServerProcessProxyPtr&, const std::string&, 
                                 const Ice::ProcessPrx&, const Ice::Current&);
-
-    Ice::ObjectPrx findObject(const Ice::Identity&) const;
-    Ice::ObjectPrx findAdapter(const std::string&, bool&) const;
+#endif
+    Ice::ObjectPrxPtr findObject(const Ice::Identity&) const;
+    Ice::ObjectPrxPtr findAdapter(const std::string&, bool&) const;
 
 private:
 
-    const Ice::ObjectPrx _wellKnownProxy;
-    std::map<std::string, Ice::ObjectPrx> _adapters;
+    const Ice::ObjectPrxPtr _wellKnownProxy;
+    std::map<std::string, Ice::ObjectPrxPtr> _adapters;
     std::map<std::string, std::set<std::string> > _replicaGroups;
 };
-typedef IceInternal::Handle<LocatorRegistryI> LocatorRegistryIPtr;
+ICE_DEFINE_PTR(LocatorRegistryIPtr, LocatorRegistryI);
 
 class LookupI;
-typedef IceInternal::Handle<LookupI> LookupIPtr;
+ICE_DEFINE_PTR(LookupIPtr, LookupI);
 
 class LocatorI : public Ice::Locator
 {
 public:
 
-    LocatorI(const LookupIPtr&, const Ice::LocatorRegistryPrx&);
+    LocatorI(const LookupIPtr&, const Ice::LocatorRegistryPrxPtr&);
 
+#ifdef ICE_CPP11_MAPPING
+    virtual void 
+    findObjectById_async(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, 
+                          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&, 
                          const Ice::Current&) const;
@@ -64,13 +100,13 @@ public:
     virtual void 
     findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&, 
                           const Ice::Current&) const;
-
-    virtual Ice::LocatorRegistryPrx getRegistry(const Ice::Current&) const;
+#endif
+    virtual Ice::LocatorRegistryPrxPtr getRegistry(const Ice::Current&) const;
 
 private:
     
     LookupIPtr _lookup;
-    Ice::LocatorRegistryPrx _registry;
+    Ice::LocatorRegistryPrxPtr _registry;
 };
 
 };