zeroc-ice 3.7.0 → 3.7.5

data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.0
+// Ice version 3.7.5
 //
 // <auto-generated>
 //
@@ -46,10 +41,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 5
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -69,40 +64,124 @@ class LookupPrx;
 namespace IceLocatorDiscovery
 {
 
+/**
+ * The Ice lookup reply interface must be implemented by clients which
+ * are searching for Ice locators. Ice locator implementations invoke
+ * on this interface to provide their locator proxy.
+ * @see Lookup
+ * \headerfile IceLocatorDiscovery/IceLocatorDiscovery.h
+ */
 class LookupReply : public virtual ::Ice::Object
 {
 public:
 
     using ProxyType = LookupReplyPrx;
 
-    virtual bool ice_isA(::std::string, const ::Ice::Current&) const override;
-    virtual ::std::vector<::std::string> ice_ids(const ::Ice::Current&) const override;
-    virtual ::std::string ice_id(const ::Ice::Current&) const override;
-
+    /**
+     * Determines whether this object supports an interface with the given Slice type ID.
+     * @param id The fully-scoped Slice type ID.
+     * @param current The Current object for the invocation.
+     * @return True if this object supports the interface, false, otherwise.
+     */
+    virtual bool ice_isA(::std::string id, const ::Ice::Current& current) const override;
+
+    /**
+     * Obtains a list of the Slice type IDs representing the interfaces supported by this object.
+     * @param current The Current object for the invocation.
+     * @return A list of fully-scoped type IDs.
+     */
+    virtual ::std::vector<::std::string> ice_ids(const ::Ice::Current& current) const override;
+
+    /**
+     * Obtains a Slice type ID representing the most-derived interface supported by this object.
+     * @param current The Current object for the invocation.
+     * @return A fully-scoped type ID.
+     */
+    virtual ::std::string ice_id(const ::Ice::Current& current) const override;
+
+    /**
+     * Obtains the Slice type ID corresponding to this class.
+     * @return A fully-scoped type ID.
+     */
     static const ::std::string& ice_staticId();
 
-    virtual void foundLocator(::std::shared_ptr<::Ice::LocatorPrx>, const ::Ice::Current&) = 0;
+    /**
+     * This method is called by the implementation of the Lookup
+     * interface to reply to a findLocator request.
+     * @param prx The proxy of the locator.
+     * @param current The Current object for the invocation.
+     */
+    virtual void foundLocator(::std::shared_ptr<::Ice::LocatorPrx> prx, const ::Ice::Current& current) = 0;
+    /// \cond INTERNAL
     bool _iceD_foundLocator(::IceInternal::Incoming&, const ::Ice::Current&);
+    /// \endcond
 
+    /// \cond INTERNAL
     virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&) override;
+    /// \endcond
 };
 
+/**
+ * The Ice lookup interface is implemented by Ice locator
+ * implementations and can be used by clients to find available Ice
+ * locators on the network.
+ *
+ * Ice locator implementations provide a well-known `Ice/LocatorLookup'
+ * object accessible through UDP multicast. Clients typically make a
+ * multicast findLocator request to find the locator proxy.
+ * @see LookupReply
+ * \headerfile IceLocatorDiscovery/IceLocatorDiscovery.h
+ */
 class Lookup : public virtual ::Ice::Object
 {
 public:
 
     using ProxyType = LookupPrx;
 
-    virtual bool ice_isA(::std::string, const ::Ice::Current&) const override;
-    virtual ::std::vector<::std::string> ice_ids(const ::Ice::Current&) const override;
-    virtual ::std::string ice_id(const ::Ice::Current&) const override;
-
+    /**
+     * Determines whether this object supports an interface with the given Slice type ID.
+     * @param id The fully-scoped Slice type ID.
+     * @param current The Current object for the invocation.
+     * @return True if this object supports the interface, false, otherwise.
+     */
+    virtual bool ice_isA(::std::string id, const ::Ice::Current& current) const override;
+
+    /**
+     * Obtains a list of the Slice type IDs representing the interfaces supported by this object.
+     * @param current The Current object for the invocation.
+     * @return A list of fully-scoped type IDs.
+     */
+    virtual ::std::vector<::std::string> ice_ids(const ::Ice::Current& current) const override;
+
+    /**
+     * Obtains a Slice type ID representing the most-derived interface supported by this object.
+     * @param current The Current object for the invocation.
+     * @return A fully-scoped type ID.
+     */
+    virtual ::std::string ice_id(const ::Ice::Current& current) const override;
+
+    /**
+     * Obtains the Slice type ID corresponding to this class.
+     * @return A fully-scoped type ID.
+     */
     static const ::std::string& ice_staticId();
 
-    virtual void findLocator(::std::string, ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>, const ::Ice::Current&) = 0;
+    /**
+     * Find a locator proxy with the given instance name.
+     * @param instanceName Restrict the search to Ice registries
+     * configured with the given instance name. If empty, all the
+     * available registries will reply.
+     * @param reply The reply object to use to send the reply.
+     * @param current The Current object for the invocation.
+     */
+    virtual void findLocator(::std::string instanceName, ::std::shared_ptr<LookupReplyPrx> reply, const ::Ice::Current& current) = 0;
+    /// \cond INTERNAL
     bool _iceD_findLocator(::IceInternal::Incoming&, const ::Ice::Current&);
+    /// \endcond
 
+    /// \cond INTERNAL
     virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&) override;
+    /// \endcond
 };
 
 }
@@ -110,89 +189,178 @@ public:
 namespace IceLocatorDiscovery
 {
 
+/**
+ * The Ice lookup reply interface must be implemented by clients which
+ * are searching for Ice locators. Ice locator implementations invoke
+ * on this interface to provide their locator proxy.
+ * @see Lookup
+ * \headerfile IceLocatorDiscovery/IceLocatorDiscovery.h
+ */
 class LookupReplyPrx : public virtual ::Ice::Proxy<LookupReplyPrx, ::Ice::ObjectPrx>
 {
 public:
 
-    void foundLocator(const ::std::shared_ptr<::Ice::LocatorPrx>& iceP_prx, const ::Ice::Context& context = Ice::noExplicitContext)
+    /**
+     * This method is called by the implementation of the Lookup
+     * interface to reply to a findLocator request.
+     * @param prx The proxy of the locator.
+     * @param context The Context map to send with the invocation.
+     */
+    void foundLocator(const ::std::shared_ptr<::Ice::LocatorPrx>& prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        _makePromiseOutgoing<void>(true, this, &IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator, iceP_prx, context).get();
+        _makePromiseOutgoing<void>(true, this, &LookupReplyPrx::_iceI_foundLocator, prx, context).get();
     }
 
+    /**
+     * This method is called by the implementation of the Lookup
+     * interface to reply to a findLocator request.
+     * @param prx The proxy of the locator.
+     * @param context The Context map to send with the invocation.
+     * @return The future object for the invocation.
+     */
     template<template<typename> class P = ::std::promise>
-    auto foundLocatorAsync(const ::std::shared_ptr<::Ice::LocatorPrx>& iceP_prx, const ::Ice::Context& context = Ice::noExplicitContext)
+    auto foundLocatorAsync(const ::std::shared_ptr<::Ice::LocatorPrx>& prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
         -> decltype(::std::declval<P<void>>().get_future())
     {
-        return _makePromiseOutgoing<void, P>(false, this, &IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator, iceP_prx, context);
+        return _makePromiseOutgoing<void, P>(false, this, &LookupReplyPrx::_iceI_foundLocator, prx, context);
     }
 
+    /**
+     * This method is called by the implementation of the Lookup
+     * interface to reply to a findLocator request.
+     * @param prx The proxy of the locator.
+     * @param response The response callback.
+     * @param ex The exception callback.
+     * @param sent The sent callback.
+     * @param context The Context map to send with the invocation.
+     * @return A function that can be called to cancel the invocation locally.
+     */
     ::std::function<void()>
-    foundLocatorAsync(const ::std::shared_ptr<::Ice::LocatorPrx>& iceP_prx,
+    foundLocatorAsync(const ::std::shared_ptr<::Ice::LocatorPrx>& prx,
                       ::std::function<void()> response,
                       ::std::function<void(::std::exception_ptr)> ex = nullptr,
                       ::std::function<void(bool)> sent = nullptr,
-                      const ::Ice::Context& context = Ice::noExplicitContext)
+                      const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makeLamdaOutgoing<void>(response, ex, sent, this, &IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator, iceP_prx, context);
+        return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator, prx, context);
     }
 
+    /// \cond INTERNAL
     void _iceI_foundLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::std::shared_ptr<::Ice::LocatorPrx>&, const ::Ice::Context&);
+    /// \endcond
 
+    /**
+     * Obtains the Slice type ID of this interface.
+     * @return The fully-scoped type ID.
+     */
     static const ::std::string& ice_staticId();
 
 protected:
 
+    /// \cond INTERNAL
     LookupReplyPrx() = default;
     friend ::std::shared_ptr<LookupReplyPrx> IceInternal::createProxy<LookupReplyPrx>();
 
     virtual ::std::shared_ptr<::Ice::ObjectPrx> _newInstance() const override;
+    /// \endcond
 };
 
+/**
+ * The Ice lookup interface is implemented by Ice locator
+ * implementations and can be used by clients to find available Ice
+ * locators on the network.
+ *
+ * Ice locator implementations provide a well-known `Ice/LocatorLookup'
+ * object accessible through UDP multicast. Clients typically make a
+ * multicast findLocator request to find the locator proxy.
+ * @see LookupReply
+ * \headerfile IceLocatorDiscovery/IceLocatorDiscovery.h
+ */
 class LookupPrx : public virtual ::Ice::Proxy<LookupPrx, ::Ice::ObjectPrx>
 {
 public:
 
-    void findLocator(const ::std::string& iceP_instanceName, const ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>& iceP_reply, const ::Ice::Context& context = Ice::noExplicitContext)
+    /**
+     * Find a locator proxy with the given instance name.
+     * @param instanceName Restrict the search to Ice registries
+     * configured with the given instance name. If empty, all the
+     * available registries will reply.
+     * @param reply The reply object to use to send the reply.
+     * @param context The Context map to send with the invocation.
+     */
+    void findLocator(const ::std::string& instanceName, const ::std::shared_ptr<LookupReplyPrx>& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        _makePromiseOutgoing<void>(true, this, &IceLocatorDiscovery::LookupPrx::_iceI_findLocator, iceP_instanceName, iceP_reply, context).get();
+        _makePromiseOutgoing<void>(true, this, &LookupPrx::_iceI_findLocator, instanceName, reply, context).get();
     }
 
+    /**
+     * Find a locator proxy with the given instance name.
+     * @param instanceName Restrict the search to Ice registries
+     * configured with the given instance name. If empty, all the
+     * available registries will reply.
+     * @param reply The reply object to use to send the reply.
+     * @param context The Context map to send with the invocation.
+     * @return The future object for the invocation.
+     */
     template<template<typename> class P = ::std::promise>
-    auto findLocatorAsync(const ::std::string& iceP_instanceName, const ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>& iceP_reply, const ::Ice::Context& context = Ice::noExplicitContext)
+    auto findLocatorAsync(const ::std::string& instanceName, const ::std::shared_ptr<LookupReplyPrx>& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
         -> decltype(::std::declval<P<void>>().get_future())
     {
-        return _makePromiseOutgoing<void, P>(false, this, &IceLocatorDiscovery::LookupPrx::_iceI_findLocator, iceP_instanceName, iceP_reply, context);
+        return _makePromiseOutgoing<void, P>(false, this, &LookupPrx::_iceI_findLocator, instanceName, reply, context);
     }
 
+    /**
+     * Find a locator proxy with the given instance name.
+     * @param instanceName Restrict the search to Ice registries
+     * configured with the given instance name. If empty, all the
+     * available registries will reply.
+     * @param reply The reply object to use to send the reply.
+     * @param response The response callback.
+     * @param ex The exception callback.
+     * @param sent The sent callback.
+     * @param context The Context map to send with the invocation.
+     * @return A function that can be called to cancel the invocation locally.
+     */
     ::std::function<void()>
-    findLocatorAsync(const ::std::string& iceP_instanceName, const ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>& iceP_reply,
+    findLocatorAsync(const ::std::string& instanceName, const ::std::shared_ptr<LookupReplyPrx>& reply,
                      ::std::function<void()> response,
                      ::std::function<void(::std::exception_ptr)> ex = nullptr,
                      ::std::function<void(bool)> sent = nullptr,
-                     const ::Ice::Context& context = Ice::noExplicitContext)
+                     const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makeLamdaOutgoing<void>(response, ex, sent, this, &IceLocatorDiscovery::LookupPrx::_iceI_findLocator, iceP_instanceName, iceP_reply, context);
+        return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &IceLocatorDiscovery::LookupPrx::_iceI_findLocator, instanceName, reply, context);
     }
 
-    void _iceI_findLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::std::string&, const ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>&, const ::Ice::Context&);
+    /// \cond INTERNAL
+    void _iceI_findLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::std::string&, const ::std::shared_ptr<LookupReplyPrx>&, const ::Ice::Context&);
+    /// \endcond
 
+    /**
+     * Obtains the Slice type ID of this interface.
+     * @return The fully-scoped type ID.
+     */
     static const ::std::string& ice_staticId();
 
 protected:
 
+    /// \cond INTERNAL
     LookupPrx() = default;
     friend ::std::shared_ptr<LookupPrx> IceInternal::createProxy<LookupPrx>();
 
     virtual ::std::shared_ptr<::Ice::ObjectPrx> _newInstance() const override;
+    /// \endcond
 };
 
 }
 
+/// \cond STREAM
 namespace Ice
 {
 
 }
+/// \endcond
 
+/// \cond INTERNAL
 namespace IceLocatorDiscovery
 {
 
@@ -203,6 +371,7 @@ using LookupPtr = ::std::shared_ptr<Lookup>;
 using LookupPrxPtr = ::std::shared_ptr<LookupPrx>;
 
 }
+/// \endcond
 
 #else // C++98 mapping
 
@@ -213,12 +382,16 @@ namespace IceLocatorDiscovery
 {
 
 class LookupReply;
-void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::LookupReply>&);
-::IceProxy::Ice::Object* upCast(::IceProxy::IceLocatorDiscovery::LookupReply*);
+/// \cond INTERNAL
+void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< LookupReply>&);
+::IceProxy::Ice::Object* upCast(LookupReply*);
+/// \endcond
 
 class Lookup;
-void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::Lookup>&);
-::IceProxy::Ice::Object* upCast(::IceProxy::IceLocatorDiscovery::Lookup*);
+/// \cond INTERNAL
+void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< Lookup>&);
+::IceProxy::Ice::Object* upCast(Lookup*);
+/// \endcond
 
 }
 
@@ -228,32 +401,52 @@ namespace IceLocatorDiscovery
 {
 
 class LookupReply;
-::Ice::Object* upCast(::IceLocatorDiscovery::LookupReply*);
-typedef ::IceInternal::Handle< ::IceLocatorDiscovery::LookupReply> LookupReplyPtr;
+/// \cond INTERNAL
+::Ice::Object* upCast(LookupReply*);
+/// \endcond
+typedef ::IceInternal::Handle< LookupReply> LookupReplyPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::LookupReply> LookupReplyPrx;
 typedef LookupReplyPrx LookupReplyPrxPtr;
+/// \cond INTERNAL
 void _icePatchObjectPtr(LookupReplyPtr&, const ::Ice::ObjectPtr&);
+/// \endcond
 
 class Lookup;
-::Ice::Object* upCast(::IceLocatorDiscovery::Lookup*);
-typedef ::IceInternal::Handle< ::IceLocatorDiscovery::Lookup> LookupPtr;
+/// \cond INTERNAL
+::Ice::Object* upCast(Lookup*);
+/// \endcond
+typedef ::IceInternal::Handle< Lookup> LookupPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::Lookup> LookupPrx;
 typedef LookupPrx LookupPrxPtr;
+/// \cond INTERNAL
 void _icePatchObjectPtr(LookupPtr&, const ::Ice::ObjectPtr&);
+/// \endcond
 
 }
 
+/// \cond INTERNAL
 namespace IceAsync
 {
 
 }
+/// \endcond
 
 namespace IceLocatorDiscovery
 {
 
+/**
+ * Base class for asynchronous callback wrapper classes used for calls to
+ * IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
+ * Create a wrapper instance by calling ::IceLocatorDiscovery::newCallback_LookupReply_foundLocator.
+ */
 class Callback_LookupReply_foundLocator_Base : public virtual ::IceInternal::CallbackBase { };
 typedef ::IceUtil::Handle< Callback_LookupReply_foundLocator_Base> Callback_LookupReply_foundLocatorPtr;
 
+/**
+ * Base class for asynchronous callback wrapper classes used for calls to
+ * IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
+ * Create a wrapper instance by calling ::IceLocatorDiscovery::newCallback_Lookup_findLocator.
+ */
 class Callback_Lookup_findLocator_Base : public virtual ::IceInternal::CallbackBase { };
 typedef ::IceUtil::Handle< Callback_Lookup_findLocator_Base> Callback_Lookup_findLocatorPtr;
 
@@ -269,37 +462,88 @@ class LookupReply : public virtual ::Ice::Proxy<LookupReply, ::IceProxy::Ice::Ob
 {
 public:
 
-    void foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
+    /**
+     * This method is called by the implementation of the Lookup
+     * interface to reply to a findLocator request.
+     * @param prx The proxy of the locator.
+     * @param context The Context map to send with the invocation.
+     */
+    void foundLocator(const ::Ice::LocatorPrx& prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        end_foundLocator(_iceI_begin_foundLocator(iceP_prx, context, ::IceInternal::dummyCallback, 0, true));
+        end_foundLocator(_iceI_begin_foundLocator(prx, context, ::IceInternal::dummyCallback, 0, true));
     }
 
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
+    /**
+     * This method is called by the implementation of the Lookup
+     * interface to reply to a findLocator request.
+     * @param prx The proxy of the locator.
+     * @param context The Context map to send with the invocation.
+     * @return The asynchronous result object for the invocation.
+     */
+    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _iceI_begin_foundLocator(iceP_prx, context, ::IceInternal::dummyCallback, 0);
+        return _iceI_begin_foundLocator(prx, context, ::IceInternal::dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
+    /**
+     * This method is called by the implementation of the Lookup
+     * interface to reply to a findLocator request.
+     * @param prx The proxy of the locator.
+     * @param cb Asynchronous callback object.
+     * @param cookie User-defined data to associate with the invocation.
+     * @return The asynchronous result object for the invocation.
+     */
+    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& prx, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return _iceI_begin_foundLocator(iceP_prx, ::Ice::noExplicitContext, del, cookie);
+        return _iceI_begin_foundLocator(prx, ::Ice::noExplicitContext, cb, cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::Context& context, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
+    /**
+     * This method is called by the implementation of the Lookup
+     * interface to reply to a findLocator request.
+     * @param prx The proxy of the locator.
+     * @param context The Context map to send with the invocation.
+     * @param cb Asynchronous callback object.
+     * @param cookie User-defined data to associate with the invocation.
+     * @return The asynchronous result object for the invocation.
+     */
+    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& prx, const ::Ice::Context& context, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return _iceI_begin_foundLocator(iceP_prx, context, del, cookie);
+        return _iceI_begin_foundLocator(prx, context, cb, cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
+    /**
+     * This method is called by the implementation of the Lookup
+     * interface to reply to a findLocator request.
+     * @param prx The proxy of the locator.
+     * @param cb Asynchronous callback object.
+     * @param cookie User-defined data to associate with the invocation.
+     * @return The asynchronous result object for the invocation.
+     */
+    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& prx, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return _iceI_begin_foundLocator(iceP_prx, ::Ice::noExplicitContext, del, cookie);
+        return _iceI_begin_foundLocator(prx, ::Ice::noExplicitContext, cb, cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::Context& context, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
+    /**
+     * This method is called by the implementation of the Lookup
+     * interface to reply to a findLocator request.
+     * @param prx The proxy of the locator.
+     * @param context The Context map to send with the invocation.
+     * @param cb Asynchronous callback object.
+     * @param cookie User-defined data to associate with the invocation.
+     * @return The asynchronous result object for the invocation.
+     */
+    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& prx, const ::Ice::Context& context, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return _iceI_begin_foundLocator(iceP_prx, context, del, cookie);
+        return _iceI_begin_foundLocator(prx, context, cb, cookie);
     }
 
-    void end_foundLocator(const ::Ice::AsyncResultPtr&);
+    /**
+     * Completes an invocation of begin_foundLocator.
+     * @param result The asynchronous result object for the invocation.
+     */
+    void end_foundLocator(const ::Ice::AsyncResultPtr& result);
 
 private:
 
@@ -307,48 +551,117 @@ private:
 
 public:
 
+    /**
+     * Obtains the Slice type ID corresponding to this interface.
+     * @return A fully-scoped type ID.
+     */
     static const ::std::string& ice_staticId();
 
 protected:
+    /// \cond INTERNAL
 
     virtual ::IceProxy::Ice::Object* _newInstance() const;
+    /// \endcond
 };
 
 class Lookup : public virtual ::Ice::Proxy<Lookup, ::IceProxy::Ice::Object>
 {
 public:
 
-    void findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
+    /**
+     * Find a locator proxy with the given instance name.
+     * @param instanceName Restrict the search to Ice registries
+     * configured with the given instance name. If empty, all the
+     * available registries will reply.
+     * @param reply The reply object to use to send the reply.
+     * @param context The Context map to send with the invocation.
+     */
+    void findLocator(const ::std::string& instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        end_findLocator(_iceI_begin_findLocator(iceP_instanceName, iceP_reply, context, ::IceInternal::dummyCallback, 0, true));
+        end_findLocator(_iceI_begin_findLocator(instanceName, reply, context, ::IceInternal::dummyCallback, 0, true));
     }
 
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
+    /**
+     * Find a locator proxy with the given instance name.
+     * @param instanceName Restrict the search to Ice registries
+     * configured with the given instance name. If empty, all the
+     * available registries will reply.
+     * @param reply The reply object to use to send the reply.
+     * @param context The Context map to send with the invocation.
+     * @return The asynchronous result object for the invocation.
+     */
+    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _iceI_begin_findLocator(iceP_instanceName, iceP_reply, context, ::IceInternal::dummyCallback, 0);
+        return _iceI_begin_findLocator(instanceName, reply, context, ::IceInternal::dummyCallback, 0);
     }
 
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
+    /**
+     * Find a locator proxy with the given instance name.
+     * @param instanceName Restrict the search to Ice registries
+     * configured with the given instance name. If empty, all the
+     * available registries will reply.
+     * @param reply The reply object to use to send the reply.
+     * @param cb Asynchronous callback object.
+     * @param cookie User-defined data to associate with the invocation.
+     * @return The asynchronous result object for the invocation.
+     */
+    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& reply, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return _iceI_begin_findLocator(iceP_instanceName, iceP_reply, ::Ice::noExplicitContext, del, cookie);
+        return _iceI_begin_findLocator(instanceName, reply, ::Ice::noExplicitContext, cb, cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context, const ::Ice::CallbackPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
+    /**
+     * Find a locator proxy with the given instance name.
+     * @param instanceName Restrict the search to Ice registries
+     * configured with the given instance name. If empty, all the
+     * available registries will reply.
+     * @param reply The reply object to use to send the reply.
+     * @param context The Context map to send with the invocation.
+     * @param cb Asynchronous callback object.
+     * @param cookie User-defined data to associate with the invocation.
+     * @return The asynchronous result object for the invocation.
+     */
+    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return _iceI_begin_findLocator(iceP_instanceName, iceP_reply, context, del, cookie);
+        return _iceI_begin_findLocator(instanceName, reply, context, cb, cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
+    /**
+     * Find a locator proxy with the given instance name.
+     * @param instanceName Restrict the search to Ice registries
+     * configured with the given instance name. If empty, all the
+     * available registries will reply.
+     * @param reply The reply object to use to send the reply.
+     * @param cb Asynchronous callback object.
+     * @param cookie User-defined data to associate with the invocation.
+     * @return The asynchronous result object for the invocation.
+     */
+    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& reply, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return _iceI_begin_findLocator(iceP_instanceName, iceP_reply, ::Ice::noExplicitContext, del, cookie);
+        return _iceI_begin_findLocator(instanceName, reply, ::Ice::noExplicitContext, cb, cookie);
     }
 
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& del, const ::Ice::LocalObjectPtr& cookie = 0)
+    /**
+     * Find a locator proxy with the given instance name.
+     * @param instanceName Restrict the search to Ice registries
+     * configured with the given instance name. If empty, all the
+     * available registries will reply.
+     * @param reply The reply object to use to send the reply.
+     * @param context The Context map to send with the invocation.
+     * @param cb Asynchronous callback object.
+     * @param cookie User-defined data to associate with the invocation.
+     * @return The asynchronous result object for the invocation.
+     */
+    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
-        return _iceI_begin_findLocator(iceP_instanceName, iceP_reply, context, del, cookie);
+        return _iceI_begin_findLocator(instanceName, reply, context, cb, cookie);
     }
 
-    void end_findLocator(const ::Ice::AsyncResultPtr&);
+    /**
+     * Completes an invocation of begin_findLocator.
+     * @param result The asynchronous result object for the invocation.
+     */
+    void end_findLocator(const ::Ice::AsyncResultPtr& result);
 
 private:
 
@@ -356,11 +669,17 @@ private:
 
 public:
 
+    /**
+     * Obtains the Slice type ID corresponding to this interface.
+     * @return A fully-scoped type ID.
+     */
     static const ::std::string& ice_staticId();
 
 protected:
+    /// \cond INTERNAL
 
     virtual ::IceProxy::Ice::Object* _newInstance() const;
+    /// \endcond
 };
 
 }
@@ -370,6 +689,13 @@ protected:
 namespace IceLocatorDiscovery
 {
 
+/**
+ * The Ice lookup reply interface must be implemented by clients which
+ * are searching for Ice locators. Ice locator implementations invoke
+ * on this interface to provide their locator proxy.
+ * @see Lookup
+ * \headerfile IceLocatorDiscovery/IceLocatorDiscovery.h
+ */
 class LookupReply : public virtual ::Ice::Object
 {
 public:
@@ -379,23 +705,58 @@ public:
 
     virtual ~LookupReply();
 
-    virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::emptyCurrent) const;
-    virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::emptyCurrent) const;
-    virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::emptyCurrent) const;
-
+    /**
+     * Determines whether this object supports an interface with the given Slice type ID.
+     * @param id The fully-scoped Slice type ID.
+     * @param current The Current object for the invocation.
+     * @return True if this object supports the interface, false, otherwise.
+     */
+    virtual bool ice_isA(const ::std::string& id, const ::Ice::Current& current = ::Ice::emptyCurrent) const;
+
+    /**
+     * Obtains a list of the Slice type IDs representing the interfaces supported by this object.
+     * @param current The Current object for the invocation.
+     * @return A list of fully-scoped type IDs.
+     */
+    virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& current = ::Ice::emptyCurrent) const;
+
+    /**
+     * Obtains a Slice type ID representing the most-derived interface supported by this object.
+     * @param current The Current object for the invocation.
+     * @return A fully-scoped type ID.
+     */
+    virtual const ::std::string& ice_id(const ::Ice::Current& current = ::Ice::emptyCurrent) const;
+
+    /**
+     * Obtains the Slice type ID corresponding to this class.
+     * @return A fully-scoped type ID.
+     */
     static const ::std::string& ice_staticId();
 
-    virtual void foundLocator(const ::Ice::LocatorPrx&, const ::Ice::Current& = ::Ice::emptyCurrent) = 0;
+    /**
+     * This method is called by the implementation of the Lookup
+     * interface to reply to a findLocator request.
+     * @param prx The proxy of the locator.
+     * @param current The Current object for the invocation.
+     */
+    virtual void foundLocator(const ::Ice::LocatorPrx& prx, const ::Ice::Current& current = ::Ice::emptyCurrent) = 0;
+    /// \cond INTERNAL
     bool _iceD_foundLocator(::IceInternal::Incoming&, const ::Ice::Current&);
+    /// \endcond
 
+    /// \cond INTERNAL
     virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&);
+    /// \endcond
 
 protected:
 
+    /// \cond STREAM
     virtual void _iceWriteImpl(::Ice::OutputStream*) const;
     virtual void _iceReadImpl(::Ice::InputStream*);
+    /// \endcond
 };
 
+/// \cond INTERNAL
 inline bool operator==(const LookupReply& lhs, const LookupReply& rhs)
 {
     return static_cast<const ::Ice::Object&>(lhs) == static_cast<const ::Ice::Object&>(rhs);
@@ -405,7 +766,19 @@ inline bool operator<(const LookupReply& lhs, const LookupReply& rhs)
 {
     return static_cast<const ::Ice::Object&>(lhs) < static_cast<const ::Ice::Object&>(rhs);
 }
-
+/// \endcond
+
+/**
+ * The Ice lookup interface is implemented by Ice locator
+ * implementations and can be used by clients to find available Ice
+ * locators on the network.
+ *
+ * Ice locator implementations provide a well-known `Ice/LocatorLookup'
+ * object accessible through UDP multicast. Clients typically make a
+ * multicast findLocator request to find the locator proxy.
+ * @see LookupReply
+ * \headerfile IceLocatorDiscovery/IceLocatorDiscovery.h
+ */
 class Lookup : public virtual ::Ice::Object
 {
 public:
@@ -415,23 +788,60 @@ public:
 
     virtual ~Lookup();
 
-    virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::emptyCurrent) const;
-    virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::emptyCurrent) const;
-    virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::emptyCurrent) const;
-
+    /**
+     * Determines whether this object supports an interface with the given Slice type ID.
+     * @param id The fully-scoped Slice type ID.
+     * @param current The Current object for the invocation.
+     * @return True if this object supports the interface, false, otherwise.
+     */
+    virtual bool ice_isA(const ::std::string& id, const ::Ice::Current& current = ::Ice::emptyCurrent) const;
+
+    /**
+     * Obtains a list of the Slice type IDs representing the interfaces supported by this object.
+     * @param current The Current object for the invocation.
+     * @return A list of fully-scoped type IDs.
+     */
+    virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& current = ::Ice::emptyCurrent) const;
+
+    /**
+     * Obtains a Slice type ID representing the most-derived interface supported by this object.
+     * @param current The Current object for the invocation.
+     * @return A fully-scoped type ID.
+     */
+    virtual const ::std::string& ice_id(const ::Ice::Current& current = ::Ice::emptyCurrent) const;
+
+    /**
+     * Obtains the Slice type ID corresponding to this class.
+     * @return A fully-scoped type ID.
+     */
     static const ::std::string& ice_staticId();
 
-    virtual void findLocator(const ::std::string&, const ::IceLocatorDiscovery::LookupReplyPrx&, const ::Ice::Current& = ::Ice::emptyCurrent) = 0;
+    /**
+     * Find a locator proxy with the given instance name.
+     * @param instanceName Restrict the search to Ice registries
+     * configured with the given instance name. If empty, all the
+     * available registries will reply.
+     * @param reply The reply object to use to send the reply.
+     * @param current The Current object for the invocation.
+     */
+    virtual void findLocator(const ::std::string& instanceName, const LookupReplyPrx& reply, const ::Ice::Current& current = ::Ice::emptyCurrent) = 0;
+    /// \cond INTERNAL
     bool _iceD_findLocator(::IceInternal::Incoming&, const ::Ice::Current&);
+    /// \endcond
 
+    /// \cond INTERNAL
     virtual bool _iceDispatch(::IceInternal::Incoming&, const ::Ice::Current&);
+    /// \endcond
 
 protected:
 
+    /// \cond STREAM
     virtual void _iceWriteImpl(::Ice::OutputStream*) const;
     virtual void _iceReadImpl(::Ice::InputStream*);
+    /// \endcond
 };
 
+/// \cond INTERNAL
 inline bool operator==(const Lookup& lhs, const Lookup& rhs)
 {
     return static_cast<const ::Ice::Object&>(lhs) == static_cast<const ::Ice::Object&>(rhs);
@@ -441,17 +851,25 @@ inline bool operator<(const Lookup& lhs, const Lookup& rhs)
 {
     return static_cast<const ::Ice::Object&>(lhs) < static_cast<const ::Ice::Object&>(rhs);
 }
+/// \endcond
 
 }
 
+/// \cond STREAM
 namespace Ice
 {
 
 }
+/// \endcond
 
 namespace IceLocatorDiscovery
 {
 
+/**
+ * Type-safe asynchronous callback wrapper class used for calls to
+ * IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
+ * Create a wrapper instance by calling ::IceLocatorDiscovery::newCallback_LookupReply_foundLocator.
+ */
 template<class T>
 class CallbackNC_LookupReply_foundLocator : public Callback_LookupReply_foundLocator_Base, public ::IceInternal::OnewayCallbackNC<T>
 {
@@ -469,30 +887,65 @@ public:
     }
 };
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * @param instance The callback object.
+ * @param cb The success method of the callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
+ */
 template<class T> Callback_LookupReply_foundLocatorPtr
 newCallback_LookupReply_foundLocator(const IceUtil::Handle<T>& instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
 {
     return new CallbackNC_LookupReply_foundLocator<T>(instance, cb, excb, sentcb);
 }
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * @param instance The callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
+ */
 template<class T> Callback_LookupReply_foundLocatorPtr
 newCallback_LookupReply_foundLocator(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
 {
     return new CallbackNC_LookupReply_foundLocator<T>(instance, 0, excb, sentcb);
 }
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * @param instance The callback object.
+ * @param cb The success method of the callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
+ */
 template<class T> Callback_LookupReply_foundLocatorPtr
 newCallback_LookupReply_foundLocator(T* instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
 {
     return new CallbackNC_LookupReply_foundLocator<T>(instance, cb, excb, sentcb);
 }
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * @param instance The callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
+ */
 template<class T> Callback_LookupReply_foundLocatorPtr
 newCallback_LookupReply_foundLocator(T* instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
 {
     return new CallbackNC_LookupReply_foundLocator<T>(instance, 0, excb, sentcb);
 }
 
+/**
+ * Type-safe asynchronous callback wrapper class with cookie support used for calls to
+ * IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
+ * Create a wrapper instance by calling ::IceLocatorDiscovery::newCallback_LookupReply_foundLocator.
+ */
 template<class T, typename CT>
 class Callback_LookupReply_foundLocator : public Callback_LookupReply_foundLocator_Base, public ::IceInternal::OnewayCallback<T, CT>
 {
@@ -510,30 +963,69 @@ public:
     }
 };
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * Use this overload when your callback methods receive a cookie value.
+ * @param instance The callback object.
+ * @param cb The success method of the callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
+ */
 template<class T, typename CT> Callback_LookupReply_foundLocatorPtr
 newCallback_LookupReply_foundLocator(const IceUtil::Handle<T>& instance, void (T::*cb)(const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
 {
     return new Callback_LookupReply_foundLocator<T, CT>(instance, cb, excb, sentcb);
 }
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * Use this overload when your callback methods receive a cookie value.
+ * @param instance The callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
+ */
 template<class T, typename CT> Callback_LookupReply_foundLocatorPtr
 newCallback_LookupReply_foundLocator(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
 {
     return new Callback_LookupReply_foundLocator<T, CT>(instance, 0, excb, sentcb);
 }
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * Use this overload when your callback methods receive a cookie value.
+ * @param instance The callback object.
+ * @param cb The success method of the callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
+ */
 template<class T, typename CT> Callback_LookupReply_foundLocatorPtr
 newCallback_LookupReply_foundLocator(T* instance, void (T::*cb)(const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
 {
     return new Callback_LookupReply_foundLocator<T, CT>(instance, cb, excb, sentcb);
 }
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * Use this overload when your callback methods receive a cookie value.
+ * @param instance The callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::LookupReply::begin_foundLocator.
+ */
 template<class T, typename CT> Callback_LookupReply_foundLocatorPtr
 newCallback_LookupReply_foundLocator(T* instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
 {
     return new Callback_LookupReply_foundLocator<T, CT>(instance, 0, excb, sentcb);
 }
 
+/**
+ * Type-safe asynchronous callback wrapper class used for calls to
+ * IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
+ * Create a wrapper instance by calling ::IceLocatorDiscovery::newCallback_Lookup_findLocator.
+ */
 template<class T>
 class CallbackNC_Lookup_findLocator : public Callback_Lookup_findLocator_Base, public ::IceInternal::OnewayCallbackNC<T>
 {
@@ -551,30 +1043,65 @@ public:
     }
 };
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * @param instance The callback object.
+ * @param cb The success method of the callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
+ */
 template<class T> Callback_Lookup_findLocatorPtr
 newCallback_Lookup_findLocator(const IceUtil::Handle<T>& instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
 {
     return new CallbackNC_Lookup_findLocator<T>(instance, cb, excb, sentcb);
 }
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * @param instance The callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
+ */
 template<class T> Callback_Lookup_findLocatorPtr
 newCallback_Lookup_findLocator(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
 {
     return new CallbackNC_Lookup_findLocator<T>(instance, 0, excb, sentcb);
 }
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * @param instance The callback object.
+ * @param cb The success method of the callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
+ */
 template<class T> Callback_Lookup_findLocatorPtr
 newCallback_Lookup_findLocator(T* instance, void (T::*cb)(), void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
 {
     return new CallbackNC_Lookup_findLocator<T>(instance, cb, excb, sentcb);
 }
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * @param instance The callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
+ */
 template<class T> Callback_Lookup_findLocatorPtr
 newCallback_Lookup_findLocator(T* instance, void (T::*excb)(const ::Ice::Exception&), void (T::*sentcb)(bool) = 0)
 {
     return new CallbackNC_Lookup_findLocator<T>(instance, 0, excb, sentcb);
 }
 
+/**
+ * Type-safe asynchronous callback wrapper class with cookie support used for calls to
+ * IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
+ * Create a wrapper instance by calling ::IceLocatorDiscovery::newCallback_Lookup_findLocator.
+ */
 template<class T, typename CT>
 class Callback_Lookup_findLocator : public Callback_Lookup_findLocator_Base, public ::IceInternal::OnewayCallback<T, CT>
 {
@@ -592,24 +1119,58 @@ public:
     }
 };
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * Use this overload when your callback methods receive a cookie value.
+ * @param instance The callback object.
+ * @param cb The success method of the callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
+ */
 template<class T, typename CT> Callback_Lookup_findLocatorPtr
 newCallback_Lookup_findLocator(const IceUtil::Handle<T>& instance, void (T::*cb)(const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
 {
     return new Callback_Lookup_findLocator<T, CT>(instance, cb, excb, sentcb);
 }
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * Use this overload when your callback methods receive a cookie value.
+ * @param instance The callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
+ */
 template<class T, typename CT> Callback_Lookup_findLocatorPtr
 newCallback_Lookup_findLocator(const IceUtil::Handle<T>& instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
 {
     return new Callback_Lookup_findLocator<T, CT>(instance, 0, excb, sentcb);
 }
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * Use this overload when your callback methods receive a cookie value.
+ * @param instance The callback object.
+ * @param cb The success method of the callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
+ */
 template<class T, typename CT> Callback_Lookup_findLocatorPtr
 newCallback_Lookup_findLocator(T* instance, void (T::*cb)(const CT&), void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
 {
     return new Callback_Lookup_findLocator<T, CT>(instance, cb, excb, sentcb);
 }
 
+/**
+ * Creates a callback wrapper instance that delegates to your object.
+ * Use this overload when your callback methods receive a cookie value.
+ * @param instance The callback object.
+ * @param excb The exception method of the callback object.
+ * @param sentcb The sent method of the callback object.
+ * @return An object that can be passed to an asynchronous invocation of IceProxy::IceLocatorDiscovery::Lookup::begin_findLocator.
+ */
 template<class T, typename CT> Callback_Lookup_findLocatorPtr
 newCallback_Lookup_findLocator(T* instance, void (T::*excb)(const ::Ice::Exception&, const CT&), void (T::*sentcb)(bool, const CT&) = 0)
 {