1 files changed, 12 insertions, 12 deletions

diff --git a/cpp/src/IceDiscovery/LocatorI.h b/cpp/src/IceDiscovery/LocatorI.h
index 6b3428b15c9..230d8c4e7c9 100644
--- a/cpp/src/IceDiscovery/LocatorI.h
+++ b/cpp/src/IceDiscovery/LocatorI.h
@@ -26,36 +26,36 @@ public:
     
     virtual void 
     setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr&, const std::string&, 
-                                const Ice::ObjectPrx&, const Ice::Current&);
+                                const Ice::ObjectPrxPtr&, const Ice::Current&);
 
     virtual void
     setReplicatedAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr&,
-                                          const std::string&, const std::string&, const Ice::ObjectPrx&, 
+                                          const std::string&, const std::string&, const Ice::ObjectPrxPtr&, 
                                           const Ice::Current&);
 
     virtual void 
     setServerProcessProxy_async(const Ice::AMD_LocatorRegistry_setServerProcessProxyPtr&, const std::string&, 
-                                const Ice::ProcessPrx&, const Ice::Current&);
+                                const Ice::ProcessPrxPtr&, const Ice::Current&);
 
-    Ice::ObjectPrx findObject(const Ice::Identity&) const;
-    Ice::ObjectPrx findAdapter(const std::string&, bool&) const;
+    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&);
 
     virtual void 
     findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&, 
@@ -65,12 +65,12 @@ public:
     findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&, 
                           const Ice::Current&) const;
 
-    virtual Ice::LocatorRegistryPrx getRegistry(const Ice::Current&) const;
+    virtual Ice::LocatorRegistryPrxPtr getRegistry(const Ice::Current&) const;
 
 private:
     
     LookupIPtr _lookup;
-    Ice::LocatorRegistryPrx _registry;
+    Ice::LocatorRegistryPrxPtr _registry;
 };
 
 };