zeroc-ice 3.6.5 → 3.7.4

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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.6.5
+// Ice version 3.7.4
 //
 // <auto-generated>
 //
@@ -24,33 +19,362 @@
 #include <IceUtil/PushDisableWarnings.h>
 #include <Ice/ProxyF.h>
 #include <Ice/ObjectF.h>
+#include <Ice/ValueF.h>
 #include <Ice/Exception.h>
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
+#include <Ice/Comparable.h>
 #include <Ice/Proxy.h>
+#include <Ice/Object.h>
 #include <Ice/GCObject.h>
-#include <Ice/AsyncResult.h>
+#include <Ice/Value.h>
 #include <Ice/Incoming.h>
 #include <Ice/IncomingAsync.h>
 #include <Ice/FactoryTableInit.h>
 #include <IceUtil/ScopedArray.h>
-#include <IceUtil/Optional.h>
-#include <Ice/StreamF.h>
+#include <Ice/Optional.h>
+#include <Ice/ExceptionHelpers.h>
 #include <Ice/Locator.h>
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 306
+#   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 < 5
+#   if ICE_INT_VERSION % 100 < 4
 #       error Ice patch level mismatch!
 #   endif
 #endif
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace IceLocatorDiscovery
+{
+
+class LookupReply;
+class LookupReplyPrx;
+class Lookup;
+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;
+
+    /**
+     * 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();
+
+    /**
+     * 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;
+
+    /**
+     * 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();
+
+    /**
+     * 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
+};
+
+}
+
+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:
+
+    /**
+     * 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, &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>& prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
+        -> decltype(::std::declval<P<void>>().get_future())
+    {
+        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>& 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)
+    {
+        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:
+
+    /**
+     * 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, &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& 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, &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& 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)
+    {
+        return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &IceLocatorDiscovery::LookupPrx::_iceI_findLocator, instanceName, reply, 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
+{
+
+using LookupReplyPtr = ::std::shared_ptr<LookupReply>;
+using LookupReplyPrxPtr = ::std::shared_ptr<LookupReplyPrx>;
+
+using LookupPtr = ::std::shared_ptr<Lookup>;
+using LookupPrxPtr = ::std::shared_ptr<LookupPrx>;
+
+}
+/// \endcond
+
+#else // C++98 mapping
+
 namespace IceProxy
 {
 
@@ -58,12 +382,16 @@ namespace IceLocatorDiscovery
 {
 
 class LookupReply;
-void __read(::IceInternal::BasicStream*, ::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 __read(::IceInternal::BasicStream*, ::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
 
 }
 
@@ -73,31 +401,53 @@ 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;
-void __patch(LookupReplyPtr&, const ::Ice::ObjectPtr&);
+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;
-void __patch(LookupPtr&, const ::Ice::ObjectPtr&);
+typedef LookupPrx LookupPrxPtr;
+/// \cond INTERNAL
+void _icePatchObjectPtr(LookupPtr&, const ::Ice::ObjectPtr&);
+/// \endcond
 
 }
 
+/// \cond INTERNAL
 namespace IceAsync
 {
 
 }
+/// \endcond
 
 namespace IceLocatorDiscovery
 {
 
-class Callback_LookupReply_foundLocator_Base : virtual public ::IceInternal::CallbackBase { };
+/**
+ * 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;
 
-class Callback_Lookup_findLocator_Base : virtual public ::IceInternal::CallbackBase { };
+/**
+ * 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;
 
 }
@@ -108,374 +458,228 @@ namespace IceProxy
 namespace IceLocatorDiscovery
 {
 
-class LookupReply : virtual public ::IceProxy::Ice::Object
+class LookupReply : public virtual ::Ice::Proxy<LookupReply, ::IceProxy::Ice::Object>
 {
 public:
 
-    void foundLocator(const ::Ice::LocatorPrx& __p_prx)
-    {
-        foundLocator(__p_prx, 0);
-    }
-    void foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx)
-    {
-        foundLocator(__p_prx, &__ctx);
-    }
-#ifdef ICE_CPP11
-    ::Ice::AsyncResultPtr
-    begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
-    {
-        return begin_foundLocator(__p_prx, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
-    }
-    ::Ice::AsyncResultPtr
-    begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
-    {
-        return begin_foundLocator(__p_prx, 0, ::Ice::newCallback(__completed, __sent), 0);
-    }
-    ::Ice::AsyncResultPtr
-    begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
-    {
-        return begin_foundLocator(__p_prx, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
-    }
-    ::Ice::AsyncResultPtr
-    begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
-    {
-        return begin_foundLocator(__p_prx, &__ctx, ::Ice::newCallback(__completed, __sent));
-    }
-#endif
-
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx)
-    {
-        return begin_foundLocator(__p_prx, 0, ::IceInternal::__dummyCallback, 0);
-    }
-
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx)
-    {
-        return begin_foundLocator(__p_prx, &__ctx, ::IceInternal::__dummyCallback, 0);
-    }
-
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
-    {
-        return begin_foundLocator(__p_prx, 0, __del, __cookie);
-    }
-
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
-    {
-        return begin_foundLocator(__p_prx, &__ctx, __del, __cookie);
-    }
-
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
-    {
-        return begin_foundLocator(__p_prx, 0, __del, __cookie);
-    }
+    /**
+     * 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(prx, context, ::IceInternal::dummyCallback, 0, true));
+    }
+
+    /**
+     * 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(prx, context, ::IceInternal::dummyCallback, 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(prx, ::Ice::noExplicitContext, cb, cookie);
+    }
+
+    /**
+     * 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(prx, context, cb, cookie);
+    }
+
+    /**
+     * 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(prx, ::Ice::noExplicitContext, cb, cookie);
+    }
+
+    /**
+     * 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(prx, context, cb, cookie);
+    }
+
+    /**
+     * Completes an invocation of begin_foundLocator.
+     * @param result The asynchronous result object for the invocation.
+     */
+    void end_foundLocator(const ::Ice::AsyncResultPtr& result);
 
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx& __p_prx, const ::Ice::Context& __ctx, const ::IceLocatorDiscovery::Callback_LookupReply_foundLocatorPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
-    {
-        return begin_foundLocator(__p_prx, &__ctx, __del, __cookie);
-    }
-
-    void end_foundLocator(const ::Ice::AsyncResultPtr&);
-    
 private:
 
-    void foundLocator(const ::Ice::LocatorPrx&, const ::Ice::Context*);
-    ::Ice::AsyncResultPtr begin_foundLocator(const ::Ice::LocatorPrx&, const ::Ice::Context*, const ::IceInternal::CallbackBasePtr&, const ::Ice::LocalObjectPtr& __cookie = 0);
-    
+    ::Ice::AsyncResultPtr _iceI_begin_foundLocator(const ::Ice::LocatorPrx&, const ::Ice::Context&, const ::IceInternal::CallbackBasePtr&, const ::Ice::LocalObjectPtr& cookie = 0, bool sync = false);
+
 public:
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_context(const ::Ice::Context& __context) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_context(__context).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_adapterId(const ::std::string& __id) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_endpoints(const ::Ice::EndpointSeq& __endpoints) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_endpoints(__endpoints).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_locatorCacheTimeout(int __timeout) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_locatorCacheTimeout(__timeout).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_connectionCached(bool __cached) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_connectionCached(__cached).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_endpointSelection(::Ice::EndpointSelectionType __est) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_endpointSelection(__est).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_secure(bool __secure) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_preferSecure(bool __preferSecure) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_preferSecure(__preferSecure).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_router(const ::Ice::RouterPrx& __router) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_router(__router).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_locator(const ::Ice::LocatorPrx& __locator) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_collocationOptimized(bool __co) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_collocationOptimized(__co).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_invocationTimeout(int __timeout) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_invocationTimeout(__timeout).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_twoway() const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_twoway().get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_oneway() const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_oneway().get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_batchOneway() const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_batchOneway().get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_datagram() const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_datagram().get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_batchDatagram() const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_compress(bool __compress) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_compress(__compress).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_timeout(int __timeout) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_connectionId(const ::std::string& __id) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_connectionId(__id).get());
-    }
-    
-    ::IceInternal::ProxyHandle<LookupReply> ice_encodingVersion(const ::Ice::EncodingVersion& __v) const
-    {
-        return dynamic_cast<LookupReply*>(::IceProxy::Ice::Object::ice_encodingVersion(__v).get());
-    }
-    
+
+    /**
+     * Obtains the Slice type ID corresponding to this interface.
+     * @return A fully-scoped type ID.
+     */
     static const ::std::string& ice_staticId();
 
-private: 
-    virtual ::IceProxy::Ice::Object* __newInstance() const;
+protected:
+    /// \cond INTERNAL
+
+    virtual ::IceProxy::Ice::Object* _newInstance() const;
+    /// \endcond
 };
 
-class Lookup : virtual public ::IceProxy::Ice::Object
+class Lookup : public virtual ::Ice::Proxy<Lookup, ::IceProxy::Ice::Object>
 {
 public:
 
-    void findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply)
-    {
-        findLocator(__p_instanceName, __p_reply, 0);
-    }
-    void findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx)
-    {
-        findLocator(__p_instanceName, __p_reply, &__ctx);
-    }
-#ifdef ICE_CPP11
-    ::Ice::AsyncResultPtr
-    begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
-    {
-        return begin_findLocator(__p_instanceName, __p_reply, 0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent));
-    }
-    ::Ice::AsyncResultPtr
-    begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
-    {
-        return begin_findLocator(__p_instanceName, __p_reply, 0, ::Ice::newCallback(__completed, __sent), 0);
-    }
-    ::Ice::AsyncResultPtr
-    begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = ::IceInternal::Function<void (const ::Ice::Exception&)>(), const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>())
-    {
-        return begin_findLocator(__p_instanceName, __p_reply, &__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0);
-    }
-    ::Ice::AsyncResultPtr
-    begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed, const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
-    {
-        return begin_findLocator(__p_instanceName, __p_reply, &__ctx, ::Ice::newCallback(__completed, __sent));
-    }
-#endif
-
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply)
-    {
-        return begin_findLocator(__p_instanceName, __p_reply, 0, ::IceInternal::__dummyCallback, 0);
-    }
-
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx)
-    {
-        return begin_findLocator(__p_instanceName, __p_reply, &__ctx, ::IceInternal::__dummyCallback, 0);
-    }
-
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
-    {
-        return begin_findLocator(__p_instanceName, __p_reply, 0, __del, __cookie);
-    }
-
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
-    {
-        return begin_findLocator(__p_instanceName, __p_reply, &__ctx, __del, __cookie);
-    }
-
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
-    {
-        return begin_findLocator(__p_instanceName, __p_reply, 0, __del, __cookie);
-    }
-
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string& __p_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& __p_reply, const ::Ice::Context& __ctx, const ::IceLocatorDiscovery::Callback_Lookup_findLocatorPtr& __del, const ::Ice::LocalObjectPtr& __cookie = 0)
-    {
-        return begin_findLocator(__p_instanceName, __p_reply, &__ctx, __del, __cookie);
-    }
+    /**
+     * 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(instanceName, reply, context, ::IceInternal::dummyCallback, 0, true));
+    }
+
+    /**
+     * 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(instanceName, reply, context, ::IceInternal::dummyCallback, 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(instanceName, reply, ::Ice::noExplicitContext, cb, cookie);
+    }
+
+    /**
+     * 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(instanceName, reply, context, cb, cookie);
+    }
+
+    /**
+     * 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(instanceName, reply, ::Ice::noExplicitContext, cb, cookie);
+    }
+
+    /**
+     * 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(instanceName, reply, context, cb, cookie);
+    }
+
+    /**
+     * Completes an invocation of begin_findLocator.
+     * @param result The asynchronous result object for the invocation.
+     */
+    void end_findLocator(const ::Ice::AsyncResultPtr& result);
 
-    void end_findLocator(const ::Ice::AsyncResultPtr&);
-    
 private:
 
-    void findLocator(const ::std::string&, const ::IceLocatorDiscovery::LookupReplyPrx&, const ::Ice::Context*);
-    ::Ice::AsyncResultPtr begin_findLocator(const ::std::string&, const ::IceLocatorDiscovery::LookupReplyPrx&, const ::Ice::Context*, const ::IceInternal::CallbackBasePtr&, const ::Ice::LocalObjectPtr& __cookie = 0);
-    
+    ::Ice::AsyncResultPtr _iceI_begin_findLocator(const ::std::string&, const ::IceLocatorDiscovery::LookupReplyPrx&, const ::Ice::Context&, const ::IceInternal::CallbackBasePtr&, const ::Ice::LocalObjectPtr& cookie = 0, bool sync = false);
+
 public:
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_context(const ::Ice::Context& __context) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_context(__context).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_adapterId(const ::std::string& __id) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_endpoints(const ::Ice::EndpointSeq& __endpoints) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_endpoints(__endpoints).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_locatorCacheTimeout(int __timeout) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_locatorCacheTimeout(__timeout).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_connectionCached(bool __cached) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_connectionCached(__cached).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_endpointSelection(::Ice::EndpointSelectionType __est) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_endpointSelection(__est).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_secure(bool __secure) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_secure(__secure).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_preferSecure(bool __preferSecure) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_preferSecure(__preferSecure).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_router(const ::Ice::RouterPrx& __router) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_router(__router).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_locator(const ::Ice::LocatorPrx& __locator) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_locator(__locator).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_collocationOptimized(bool __co) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_collocationOptimized(__co).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_invocationTimeout(int __timeout) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_invocationTimeout(__timeout).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_twoway() const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_twoway().get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_oneway() const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_oneway().get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_batchOneway() const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_batchOneway().get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_datagram() const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_datagram().get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_batchDatagram() const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_batchDatagram().get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_compress(bool __compress) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_compress(__compress).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_timeout(int __timeout) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_connectionId(const ::std::string& __id) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_connectionId(__id).get());
-    }
-    
-    ::IceInternal::ProxyHandle<Lookup> ice_encodingVersion(const ::Ice::EncodingVersion& __v) const
-    {
-        return dynamic_cast<Lookup*>(::IceProxy::Ice::Object::ice_encodingVersion(__v).get());
-    }
-    
+
+    /**
+     * Obtains the Slice type ID corresponding to this interface.
+     * @return A fully-scoped type ID.
+     */
     static const ::std::string& ice_staticId();
 
-private: 
-    virtual ::IceProxy::Ice::Object* __newInstance() const;
+protected:
+    /// \cond INTERNAL
+
+    virtual ::IceProxy::Ice::Object* _newInstance() const;
+    /// \endcond
 };
 
 }
@@ -485,79 +689,187 @@ private:
 namespace IceLocatorDiscovery
 {
 
-class LookupReply : virtual public ::Ice::Object
+/**
+ * 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:
 
     typedef LookupReplyPrx ProxyType;
     typedef LookupReplyPtr PointerType;
 
-    virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
-    virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
-    virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
+    virtual ~LookupReply();
+
+    /**
+     * 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::Current()) = 0;
-    ::Ice::DispatchStatus ___foundLocator(::IceInternal::Incoming&, const ::Ice::Current&);
-
-    virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
+    /**
+     * 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:
-    virtual void __writeImpl(::IceInternal::BasicStream*) const;
-    virtual void __readImpl(::IceInternal::BasicStream*);
-    using ::Ice::Object::__writeImpl;
-    using ::Ice::Object::__readImpl;
+
+    /// \cond STREAM
+    virtual void _iceWriteImpl(::Ice::OutputStream*) const;
+    virtual void _iceReadImpl(::Ice::InputStream*);
+    /// \endcond
 };
 
-inline bool operator==(const LookupReply& l, const LookupReply& r)
+/// \cond INTERNAL
+inline bool operator==(const LookupReply& lhs, const LookupReply& rhs)
 {
-    return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
+    return static_cast<const ::Ice::Object&>(lhs) == static_cast<const ::Ice::Object&>(rhs);
 }
 
-inline bool operator<(const LookupReply& l, const LookupReply& r)
+inline bool operator<(const LookupReply& lhs, const LookupReply& rhs)
 {
-    return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
+    return static_cast<const ::Ice::Object&>(lhs) < static_cast<const ::Ice::Object&>(rhs);
 }
-
-class Lookup : virtual public ::Ice::Object
+/// \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:
 
     typedef LookupPrx ProxyType;
     typedef LookupPtr PointerType;
 
-    virtual bool ice_isA(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;
-    virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::Current()) const;
-    virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;
+    virtual ~Lookup();
+
+    /**
+     * 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::Current()) = 0;
-    ::Ice::DispatchStatus ___findLocator(::IceInternal::Incoming&, const ::Ice::Current&);
-
-    virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);
+    /**
+     * 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:
-    virtual void __writeImpl(::IceInternal::BasicStream*) const;
-    virtual void __readImpl(::IceInternal::BasicStream*);
-    using ::Ice::Object::__writeImpl;
-    using ::Ice::Object::__readImpl;
+
+    /// \cond STREAM
+    virtual void _iceWriteImpl(::Ice::OutputStream*) const;
+    virtual void _iceReadImpl(::Ice::InputStream*);
+    /// \endcond
 };
 
-inline bool operator==(const Lookup& l, const Lookup& r)
+/// \cond INTERNAL
+inline bool operator==(const Lookup& lhs, const Lookup& rhs)
 {
-    return static_cast<const ::Ice::Object&>(l) == static_cast<const ::Ice::Object&>(r);
+    return static_cast<const ::Ice::Object&>(lhs) == static_cast<const ::Ice::Object&>(rhs);
 }
 
-inline bool operator<(const Lookup& l, const Lookup& r)
+inline bool operator<(const Lookup& lhs, const Lookup& rhs)
 {
-    return static_cast<const ::Ice::Object&>(l) < static_cast<const ::Ice::Object&>(r);
+    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>
 {
@@ -575,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>
 {
@@ -616,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>
 {
@@ -657,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>
 {
@@ -698,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)
 {
@@ -724,5 +1179,7 @@ newCallback_Lookup_findLocator(T* instance, void (T::*excb)(const ::Ice::Excepti
 
 }
 
+#endif
+
 #include <IceUtil/PopDisableWarnings.h>
 #endif