zeroc-ice 3.7.1 → 3.7.6

data/ext/ice/cpp/src/Ice/WSAcceptor.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
 
 #include <Ice/WSAcceptor.h>
 #include <Ice/WSTransceiver.h>

data/ext/ice/cpp/src/Ice/WSAcceptor.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
 
 #ifndef ICE_WS_ACCEPTOR_I_H
 #define ICE_WS_ACCEPTOR_I_H

data/ext/ice/cpp/src/Ice/WSConnector.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
 
 #include <Ice/WSConnector.h>
 #include <Ice/WSTransceiver.h>

data/ext/ice/cpp/src/Ice/WSConnector.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
 
 #ifndef ICE_WSCONNECTOR_I_H
 #define ICE_WSCONNECTOR_I_H

data/ext/ice/cpp/src/Ice/WSEndpoint.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
 
 #include <Ice/WSEndpoint.h>
 #include <Ice/WSAcceptor.h>

data/ext/ice/cpp/src/Ice/WSEndpoint.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
 
 #ifndef ICE_WS_ENDPOINT_I_H
 #define ICE_WS_ENDPOINT_I_H

data/ext/ice/cpp/src/Ice/WSTransceiver.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
 
 #include <Ice/WSTransceiver.h>
 #include <Ice/Endpoint.h>
@@ -593,11 +588,11 @@ IceInternal::WSTransceiver::read(Buffer& buf)
                 // no more than the payload length. The remaining of the buffer will be
                 // sent over in another frame.
                 //
-                size_t readSz = _readPayloadLength - (buf.i - _readStart); // Already read
+                size_t readSz = _readPayloadLength - static_cast<size_t>(buf.i - _readStart); // Already read
                 if(static_cast<size_t>(buf.b.end() - buf.i) > readSz)
                 {
                     size_t size = buf.b.size();
-                    buf.b.resize(buf.i - buf.b.begin() + readSz);
+                    buf.b.resize(static_cast<size_t>(buf.i - buf.b.begin()) + readSz);
                     s = _delegate->read(buf);
                     buf.b.resize(size);
                 }
@@ -1399,7 +1394,7 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
                 return false;
             }
 
-            size_t n = min(_readBuffer.i - _readI, buf.b.end() - buf.i);
+            size_t n = min(static_cast<size_t>(_readBuffer.i - _readI), static_cast<size_t>(buf.b.end() - buf.i));
 
             if(n > _readPayloadLength)
             {
@@ -1440,13 +1435,13 @@ IceInternal::WSTransceiver::postRead(Buffer& buf)
         // Unmask the data we just read.
         //
         IceInternal::Buffer::Container::iterator p = _readStart;
-        for(size_t n = _readStart - _readFrameStart; p < buf.i; ++p, ++n)
+        for(size_t n = static_cast<size_t>(_readStart - _readFrameStart); p < buf.i; ++p, ++n)
         {
             *p ^= _readMask[n % 4];
         }
     }
 
-    _readPayloadLength -= buf.i - _readStart;
+    _readPayloadLength -= static_cast<size_t>(buf.i - _readStart);
     _readStart = buf.i;
     if(_readPayloadLength == 0)
     {
@@ -1470,7 +1465,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
                 return false;
             }
 
-            assert(buf.i = buf.b.begin());
+            assert(buf.i == buf.b.begin());
             prepareWriteHeader(OP_DATA, buf.b.size());
 
             _writeState = WriteStatePayload;
@@ -1479,7 +1474,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
         {
             prepareWriteHeader(OP_PING, 0); // Don't send any payload
 
-            _writeBuffer.b.resize(_writeBuffer.i - _writeBuffer.b.begin());
+            _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             _writeState = WriteStateControlFrame;
             _writeBuffer.i = _writeBuffer.b.begin();
         }
@@ -1488,7 +1483,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
             prepareWriteHeader(OP_PONG, _pingPayload.size());
             if(_pingPayload.size() > static_cast<size_t>(_writeBuffer.b.end() - _writeBuffer.i))
             {
-                size_t pos = _writeBuffer.i - _writeBuffer.b.begin();
+                size_t pos = static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin());
                 _writeBuffer.b.resize(pos + _pingPayload.size());
                 _writeBuffer.i = _writeBuffer.b.begin() + pos;
             }
@@ -1496,7 +1491,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
             _writeBuffer.i += _pingPayload.size();
             _pingPayload.clear();
 
-            _writeBuffer.b.resize(_writeBuffer.i - _writeBuffer.b.begin());
+            _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             _writeState = WriteStateControlFrame;
             _writeBuffer.i = _writeBuffer.b.begin();
         }
@@ -1518,7 +1513,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
             }
 
             _writeState = WriteStateControlFrame;
-            _writeBuffer.b.resize(_writeBuffer.i - _writeBuffer.b.begin());
+            _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             _writeBuffer.i = _writeBuffer.b.begin();
         }
         else
@@ -1548,7 +1543,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
                 _writeBuffer.i = _writeBuffer.b.begin();
             }
 
-            size_t n = buf.i - buf.b.begin();
+            size_t n = static_cast<size_t>(buf.i - buf.b.begin());
             for(; n < buf.b.size() && _writeBuffer.i < _writeBuffer.b.end(); ++_writeBuffer.i, ++n)
             {
                 *_writeBuffer.i = buf.b[n] ^ _writeMask[n % 4];
@@ -1556,20 +1551,21 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
             _writePayloadLength = n;
             if(_writeBuffer.i < _writeBuffer.b.end())
             {
-                _writeBuffer.b.resize(_writeBuffer.i - _writeBuffer.b.begin());
+                _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             }
             _writeBuffer.i = _writeBuffer.b.begin();
         }
         else if(_writePayloadLength == 0)
         {
-            size_t n = min(_writeBuffer.b.end() - _writeBuffer.i, buf.b.end() - buf.i);
+            size_t n = min(static_cast<size_t>(_writeBuffer.b.end() - _writeBuffer.i),
+                           static_cast<size_t>(buf.b.end() - buf.i));
             memcpy(_writeBuffer.i, buf.i, n);
             _writeBuffer.i += n;
             buf.i += n;
             _writePayloadLength = n;
             if(_writeBuffer.i < _writeBuffer.b.end())
             {
-                _writeBuffer.b.resize(_writeBuffer.i - _writeBuffer.b.begin());
+                _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             }
             _writeBuffer.i = _writeBuffer.b.begin();
         }
@@ -1675,7 +1671,7 @@ IceInternal::WSTransceiver::readBuffered(IceInternal::Buffer::Container::size_ty
     }
     else
     {
-        IceInternal::Buffer::Container::size_type available = _readBuffer.i - _readI;
+        size_t available = static_cast<size_t>(_readBuffer.i - _readI);
         if(available < sz)
         {
             if(_readI != &_readBuffer.b[0])
@@ -1733,7 +1729,7 @@ IceInternal::WSTransceiver::prepareWriteHeader(Byte opCode, IceInternal::Buffer:
         // Use an extra 64 bits to encode the payload length.
         //
         *_writeBuffer.i++ = static_cast<Byte>(127);
-        ice_htonll(payloadLength, _writeBuffer.i);
+        ice_htonll(static_cast<Long>(payloadLength), _writeBuffer.i);
         _writeBuffer.i += 8;
     }
 

data/ext/ice/cpp/src/Ice/WSTransceiver.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
 
 #ifndef ICE_WS_TRANSCEIVER_I_H
 #define ICE_WS_TRANSCEIVER_I_H
@@ -140,7 +135,6 @@ private:
 
     std::vector<Ice::Byte> _pingPayload;
 };
-typedef IceUtil::Handle<WSTransceiver> WSTransceiverPtr;
 
 }
 

data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp

@@ -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.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -39,10 +34,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 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.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.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -44,10 +39,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 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -67,6 +62,11 @@ class LookupPrx;
 namespace IceDiscovery
 {
 
+/**
+ * The LookupReply interface is used by IceDiscovery clients to answer requests
+ * received on the Lookup interface.
+ * \headerfile IceDiscovery/IceDiscovery.h
+ */
 class LookupReply : public virtual ::Ice::Object
 {
 public:
@@ -101,11 +101,26 @@ public:
      */
     static const ::std::string& ice_staticId();
 
+    /**
+     * Reply to the findObjectById request.
+     * @param id The identity of the object.
+     * @param prx The proxy of the object.
+     * @param current The Current object for the invocation.
+     */
     virtual void foundObjectById(::Ice::Identity id, ::std::shared_ptr<::Ice::ObjectPrx> prx, const ::Ice::Current& current) = 0;
     /// \cond INTERNAL
     bool _iceD_foundObjectById(::IceInternal::Incoming&, const ::Ice::Current&);
     /// \endcond
 
+    /**
+     * Reply to the findAdpaterById request.
+     * @param id The adapter ID.
+     * @param prx The adapter proxy (a dummy proxy created by the adapter).
+     * The proxy provides the adapter endpoints.
+     * @param isReplicaGroup True if the adapter is also a member of a
+     * replica group.
+     * @param current The Current object for the invocation.
+     */
     virtual void foundAdapterById(::std::string id, ::std::shared_ptr<::Ice::ObjectPrx> prx, bool isReplicaGroup, const ::Ice::Current& current) = 0;
     /// \cond INTERNAL
     bool _iceD_foundAdapterById(::IceInternal::Incoming&, const ::Ice::Current&);
@@ -116,6 +131,11 @@ public:
     /// \endcond
 };
 
+/**
+ * The Lookup interface is used by IceDiscovery clients to look for objects
+ * and adapters using UDP multicast.
+ * \headerfile IceDiscovery/IceDiscovery.h
+ */
 class Lookup : public virtual ::Ice::Object
 {
 public:
@@ -150,11 +170,29 @@ public:
      */
     static const ::std::string& ice_staticId();
 
+    /**
+     * Request to find an Ice object
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The object identity.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching object is found.
+     * @param current The Current object for the invocation.
+     */
     virtual void findObjectById(::std::string domainId, ::Ice::Identity id, ::std::shared_ptr<LookupReplyPrx> reply, const ::Ice::Current& current) = 0;
     /// \cond INTERNAL
     bool _iceD_findObjectById(::IceInternal::Incoming&, const ::Ice::Current&);
     /// \endcond
 
+    /**
+     * Request to find an object adapter
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The adapter ID.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching adapter is found.
+     * @param current The Current object for the invocation.
+     */
     virtual void findAdapterById(::std::string domainId, ::std::string id, ::std::shared_ptr<LookupReplyPrx> reply, const ::Ice::Current& current) = 0;
     /// \cond INTERNAL
     bool _iceD_findAdapterById(::IceInternal::Incoming&, const ::Ice::Current&);
@@ -170,15 +208,33 @@ public:
 namespace IceDiscovery
 {
 
+/**
+ * The LookupReply interface is used by IceDiscovery clients to answer requests
+ * received on the Lookup interface.
+ * \headerfile IceDiscovery/IceDiscovery.h
+ */
 class LookupReplyPrx : public virtual ::Ice::Proxy<LookupReplyPrx, ::Ice::ObjectPrx>
 {
 public:
 
+    /**
+     * Reply to the findObjectById request.
+     * @param id The identity of the object.
+     * @param prx The proxy of the object.
+     * @param context The Context map to send with the invocation.
+     */
     void foundObjectById(const ::Ice::Identity& id, const ::std::shared_ptr<::Ice::ObjectPrx>& prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         _makePromiseOutgoing<void>(true, this, &LookupReplyPrx::_iceI_foundObjectById, id, prx, context).get();
     }
 
+    /**
+     * Reply to the findObjectById request.
+     * @param id The identity of the object.
+     * @param prx The proxy of the object.
+     * @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 foundObjectByIdAsync(const ::Ice::Identity& id, const ::std::shared_ptr<::Ice::ObjectPrx>& prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
         -> decltype(::std::declval<P<void>>().get_future())
@@ -186,6 +242,16 @@ public:
         return _makePromiseOutgoing<void, P>(false, this, &LookupReplyPrx::_iceI_foundObjectById, id, prx, context);
     }
 
+    /**
+     * Reply to the findObjectById request.
+     * @param id The identity of the object.
+     * @param prx The proxy of the object.
+     * @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()>
     foundObjectByIdAsync(const ::Ice::Identity& id, const ::std::shared_ptr<::Ice::ObjectPrx>& prx,
                          ::std::function<void()> response,
@@ -193,18 +259,37 @@ public:
                          ::std::function<void(bool)> sent = nullptr,
                          const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makeLamdaOutgoing<void>(response, ex, sent, this, &LookupReplyPrx::_iceI_foundObjectById, id, prx, context);
+        return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &IceDiscovery::LookupReplyPrx::_iceI_foundObjectById, id, prx, context);
     }
 
     /// \cond INTERNAL
     void _iceI_foundObjectById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::Ice::Identity&, const ::std::shared_ptr<::Ice::ObjectPrx>&, const ::Ice::Context&);
     /// \endcond
 
+    /**
+     * Reply to the findAdpaterById request.
+     * @param id The adapter ID.
+     * @param prx The adapter proxy (a dummy proxy created by the adapter).
+     * The proxy provides the adapter endpoints.
+     * @param isReplicaGroup True if the adapter is also a member of a
+     * replica group.
+     * @param context The Context map to send with the invocation.
+     */
     void foundAdapterById(const ::std::string& id, const ::std::shared_ptr<::Ice::ObjectPrx>& prx, bool isReplicaGroup, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         _makePromiseOutgoing<void>(true, this, &LookupReplyPrx::_iceI_foundAdapterById, id, prx, isReplicaGroup, context).get();
     }
 
+    /**
+     * Reply to the findAdpaterById request.
+     * @param id The adapter ID.
+     * @param prx The adapter proxy (a dummy proxy created by the adapter).
+     * The proxy provides the adapter endpoints.
+     * @param isReplicaGroup True if the adapter is also a member of a
+     * replica group.
+     * @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 foundAdapterByIdAsync(const ::std::string& id, const ::std::shared_ptr<::Ice::ObjectPrx>& prx, bool isReplicaGroup, const ::Ice::Context& context = ::Ice::noExplicitContext)
         -> decltype(::std::declval<P<void>>().get_future())
@@ -212,6 +297,19 @@ public:
         return _makePromiseOutgoing<void, P>(false, this, &LookupReplyPrx::_iceI_foundAdapterById, id, prx, isReplicaGroup, context);
     }
 
+    /**
+     * Reply to the findAdpaterById request.
+     * @param id The adapter ID.
+     * @param prx The adapter proxy (a dummy proxy created by the adapter).
+     * The proxy provides the adapter endpoints.
+     * @param isReplicaGroup True if the adapter is also a member of a
+     * replica group.
+     * @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()>
     foundAdapterByIdAsync(const ::std::string& id, const ::std::shared_ptr<::Ice::ObjectPrx>& prx, bool isReplicaGroup,
                           ::std::function<void()> response,
@@ -219,7 +317,7 @@ public:
                           ::std::function<void(bool)> sent = nullptr,
                           const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makeLamdaOutgoing<void>(response, ex, sent, this, &LookupReplyPrx::_iceI_foundAdapterById, id, prx, isReplicaGroup, context);
+        return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &IceDiscovery::LookupReplyPrx::_iceI_foundAdapterById, id, prx, isReplicaGroup, context);
     }
 
     /// \cond INTERNAL
@@ -242,15 +340,39 @@ protected:
     /// \endcond
 };
 
+/**
+ * The Lookup interface is used by IceDiscovery clients to look for objects
+ * and adapters using UDP multicast.
+ * \headerfile IceDiscovery/IceDiscovery.h
+ */
 class LookupPrx : public virtual ::Ice::Proxy<LookupPrx, ::Ice::ObjectPrx>
 {
 public:
 
+    /**
+     * Request to find an Ice object
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The object identity.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching object is found.
+     * @param context The Context map to send with the invocation.
+     */
     void findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::std::shared_ptr<LookupReplyPrx>& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         _makePromiseOutgoing<void>(true, this, &LookupPrx::_iceI_findObjectById, domainId, id, reply, context).get();
     }
 
+    /**
+     * Request to find an Ice object
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The object identity.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching object is found.
+     * @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 findObjectByIdAsync(const ::std::string& domainId, const ::Ice::Identity& id, const ::std::shared_ptr<LookupReplyPrx>& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
         -> decltype(::std::declval<P<void>>().get_future())
@@ -258,6 +380,19 @@ public:
         return _makePromiseOutgoing<void, P>(false, this, &LookupPrx::_iceI_findObjectById, domainId, id, reply, context);
     }
 
+    /**
+     * Request to find an Ice object
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The object identity.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching object is found.
+     * @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()>
     findObjectByIdAsync(const ::std::string& domainId, const ::Ice::Identity& id, const ::std::shared_ptr<LookupReplyPrx>& reply,
                         ::std::function<void()> response,
@@ -265,18 +400,37 @@ public:
                         ::std::function<void(bool)> sent = nullptr,
                         const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makeLamdaOutgoing<void>(response, ex, sent, this, &LookupPrx::_iceI_findObjectById, domainId, id, reply, context);
+        return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &IceDiscovery::LookupPrx::_iceI_findObjectById, domainId, id, reply, context);
     }
 
     /// \cond INTERNAL
     void _iceI_findObjectById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, const ::std::string&, const ::Ice::Identity&, const ::std::shared_ptr<LookupReplyPrx>&, const ::Ice::Context&);
     /// \endcond
 
+    /**
+     * Request to find an object adapter
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The adapter ID.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching adapter is found.
+     * @param context The Context map to send with the invocation.
+     */
     void findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::std::shared_ptr<LookupReplyPrx>& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         _makePromiseOutgoing<void>(true, this, &LookupPrx::_iceI_findAdapterById, domainId, id, reply, context).get();
     }
 
+    /**
+     * Request to find an object adapter
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The adapter ID.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching adapter is found.
+     * @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 findAdapterByIdAsync(const ::std::string& domainId, const ::std::string& id, const ::std::shared_ptr<LookupReplyPrx>& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
         -> decltype(::std::declval<P<void>>().get_future())
@@ -284,6 +438,19 @@ public:
         return _makePromiseOutgoing<void, P>(false, this, &LookupPrx::_iceI_findAdapterById, domainId, id, reply, context);
     }
 
+    /**
+     * Request to find an object adapter
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The adapter ID.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching adapter is found.
+     * @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()>
     findAdapterByIdAsync(const ::std::string& domainId, const ::std::string& id, const ::std::shared_ptr<LookupReplyPrx>& reply,
                          ::std::function<void()> response,
@@ -291,7 +458,7 @@ public:
                          ::std::function<void(bool)> sent = nullptr,
                          const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makeLamdaOutgoing<void>(response, ex, sent, this, &LookupPrx::_iceI_findAdapterById, domainId, id, reply, context);
+        return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &IceDiscovery::LookupPrx::_iceI_findAdapterById, domainId, id, reply, context);
     }
 
     /// \cond INTERNAL
@@ -346,14 +513,14 @@ namespace IceDiscovery
 
 class LookupReply;
 /// \cond INTERNAL
-void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceDiscovery::LookupReply>&);
-::IceProxy::Ice::Object* upCast(::IceProxy::IceDiscovery::LookupReply*);
+void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< LookupReply>&);
+::IceProxy::Ice::Object* upCast(LookupReply*);
 /// \endcond
 
 class Lookup;
 /// \cond INTERNAL
-void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceDiscovery::Lookup>&);
-::IceProxy::Ice::Object* upCast(::IceProxy::IceDiscovery::Lookup*);
+void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< Lookup>&);
+::IceProxy::Ice::Object* upCast(Lookup*);
 /// \endcond
 
 }
@@ -434,36 +601,87 @@ class LookupReply : public virtual ::Ice::Proxy<LookupReply, ::IceProxy::Ice::Ob
 {
 public:
 
+    /**
+     * Reply to the findObjectById request.
+     * @param id The identity of the object.
+     * @param prx The proxy of the object.
+     * @param context The Context map to send with the invocation.
+     */
     void foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         end_foundObjectById(_iceI_begin_foundObjectById(id, prx, context, ::IceInternal::dummyCallback, 0, true));
     }
 
+    /**
+     * Reply to the findObjectById request.
+     * @param id The identity of the object.
+     * @param prx The proxy of the object.
+     * @param context The Context map to send with the invocation.
+     * @return The asynchronous result object for the invocation.
+     */
     ::Ice::AsyncResultPtr begin_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         return _iceI_begin_foundObjectById(id, prx, context, ::IceInternal::dummyCallback, 0);
     }
 
+    /**
+     * Reply to the findObjectById request.
+     * @param id The identity of the object.
+     * @param prx The proxy of the object.
+     * @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_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_foundObjectById(id, prx, ::Ice::noExplicitContext, cb, cookie);
     }
 
+    /**
+     * Reply to the findObjectById request.
+     * @param id The identity of the object.
+     * @param prx The proxy of the object.
+     * @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_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::Ice::Context& context, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_foundObjectById(id, prx, context, cb, cookie);
     }
 
+    /**
+     * Reply to the findObjectById request.
+     * @param id The identity of the object.
+     * @param prx The proxy of the object.
+     * @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_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::IceDiscovery::Callback_LookupReply_foundObjectByIdPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_foundObjectById(id, prx, ::Ice::noExplicitContext, cb, cookie);
     }
 
+    /**
+     * Reply to the findObjectById request.
+     * @param id The identity of the object.
+     * @param prx The proxy of the object.
+     * @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_foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::Ice::Context& context, const ::IceDiscovery::Callback_LookupReply_foundObjectByIdPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_foundObjectById(id, prx, context, cb, cookie);
     }
 
+    /**
+     * Completes an invocation of begin_foundObjectById.
+     * @param result The asynchronous result object for the invocation.
+     */
     void end_foundObjectById(const ::Ice::AsyncResultPtr& result);
 
 private:
@@ -472,36 +690,105 @@ private:
 
 public:
 
+    /**
+     * Reply to the findAdpaterById request.
+     * @param id The adapter ID.
+     * @param prx The adapter proxy (a dummy proxy created by the adapter).
+     * The proxy provides the adapter endpoints.
+     * @param isReplicaGroup True if the adapter is also a member of a
+     * replica group.
+     * @param context The Context map to send with the invocation.
+     */
     void foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         end_foundAdapterById(_iceI_begin_foundAdapterById(id, prx, isReplicaGroup, context, ::IceInternal::dummyCallback, 0, true));
     }
 
+    /**
+     * Reply to the findAdpaterById request.
+     * @param id The adapter ID.
+     * @param prx The adapter proxy (a dummy proxy created by the adapter).
+     * The proxy provides the adapter endpoints.
+     * @param isReplicaGroup True if the adapter is also a member of a
+     * replica group.
+     * @param context The Context map to send with the invocation.
+     * @return The asynchronous result object for the invocation.
+     */
     ::Ice::AsyncResultPtr begin_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         return _iceI_begin_foundAdapterById(id, prx, isReplicaGroup, context, ::IceInternal::dummyCallback, 0);
     }
 
+    /**
+     * Reply to the findAdpaterById request.
+     * @param id The adapter ID.
+     * @param prx The adapter proxy (a dummy proxy created by the adapter).
+     * The proxy provides the adapter endpoints.
+     * @param isReplicaGroup True if the adapter is also a member of a
+     * replica group.
+     * @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_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_foundAdapterById(id, prx, isReplicaGroup, ::Ice::noExplicitContext, cb, cookie);
     }
 
+    /**
+     * Reply to the findAdpaterById request.
+     * @param id The adapter ID.
+     * @param prx The adapter proxy (a dummy proxy created by the adapter).
+     * The proxy provides the adapter endpoints.
+     * @param isReplicaGroup True if the adapter is also a member of a
+     * replica group.
+     * @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_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::Ice::Context& context, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_foundAdapterById(id, prx, isReplicaGroup, context, cb, cookie);
     }
 
+    /**
+     * Reply to the findAdpaterById request.
+     * @param id The adapter ID.
+     * @param prx The adapter proxy (a dummy proxy created by the adapter).
+     * The proxy provides the adapter endpoints.
+     * @param isReplicaGroup True if the adapter is also a member of a
+     * replica group.
+     * @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_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::IceDiscovery::Callback_LookupReply_foundAdapterByIdPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_foundAdapterById(id, prx, isReplicaGroup, ::Ice::noExplicitContext, cb, cookie);
     }
 
+    /**
+     * Reply to the findAdpaterById request.
+     * @param id The adapter ID.
+     * @param prx The adapter proxy (a dummy proxy created by the adapter).
+     * The proxy provides the adapter endpoints.
+     * @param isReplicaGroup True if the adapter is also a member of a
+     * replica group.
+     * @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_foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::Ice::Context& context, const ::IceDiscovery::Callback_LookupReply_foundAdapterByIdPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_foundAdapterById(id, prx, isReplicaGroup, context, cb, cookie);
     }
 
+    /**
+     * Completes an invocation of begin_foundAdapterById.
+     * @param result The asynchronous result object for the invocation.
+     */
     void end_foundAdapterById(const ::Ice::AsyncResultPtr& result);
 
 private:
@@ -527,36 +814,105 @@ class Lookup : public virtual ::Ice::Proxy<Lookup, ::IceProxy::Ice::Object>
 {
 public:
 
+    /**
+     * Request to find an Ice object
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The object identity.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching object is found.
+     * @param context The Context map to send with the invocation.
+     */
     void findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         end_findObjectById(_iceI_begin_findObjectById(domainId, id, reply, context, ::IceInternal::dummyCallback, 0, true));
     }
 
+    /**
+     * Request to find an Ice object
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The object identity.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching object is found.
+     * @param context The Context map to send with the invocation.
+     * @return The asynchronous result object for the invocation.
+     */
     ::Ice::AsyncResultPtr begin_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         return _iceI_begin_findObjectById(domainId, id, reply, context, ::IceInternal::dummyCallback, 0);
     }
 
+    /**
+     * Request to find an Ice object
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The object identity.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching object is found.
+     * @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_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_findObjectById(domainId, id, reply, ::Ice::noExplicitContext, cb, cookie);
     }
 
+    /**
+     * Request to find an Ice object
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The object identity.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching object is found.
+     * @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_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_findObjectById(domainId, id, reply, context, cb, cookie);
     }
 
+    /**
+     * Request to find an Ice object
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The object identity.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching object is found.
+     * @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_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::IceDiscovery::Callback_Lookup_findObjectByIdPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_findObjectById(domainId, id, reply, ::Ice::noExplicitContext, cb, cookie);
     }
 
+    /**
+     * Request to find an Ice object
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The object identity.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching object is found.
+     * @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_findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context, const ::IceDiscovery::Callback_Lookup_findObjectByIdPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_findObjectById(domainId, id, reply, context, cb, cookie);
     }
 
+    /**
+     * Completes an invocation of begin_findObjectById.
+     * @param result The asynchronous result object for the invocation.
+     */
     void end_findObjectById(const ::Ice::AsyncResultPtr& result);
 
 private:
@@ -565,36 +921,105 @@ private:
 
 public:
 
+    /**
+     * Request to find an object adapter
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The adapter ID.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching adapter is found.
+     * @param context The Context map to send with the invocation.
+     */
     void findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         end_findAdapterById(_iceI_begin_findAdapterById(domainId, id, reply, context, ::IceInternal::dummyCallback, 0, true));
     }
 
+    /**
+     * Request to find an object adapter
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The adapter ID.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching adapter is found.
+     * @param context The Context map to send with the invocation.
+     * @return The asynchronous result object for the invocation.
+     */
     ::Ice::AsyncResultPtr begin_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         return _iceI_begin_findAdapterById(domainId, id, reply, context, ::IceInternal::dummyCallback, 0);
     }
 
+    /**
+     * Request to find an object adapter
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The adapter ID.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching adapter is found.
+     * @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_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_findAdapterById(domainId, id, reply, ::Ice::noExplicitContext, cb, cookie);
     }
 
+    /**
+     * Request to find an object adapter
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The adapter ID.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching adapter is found.
+     * @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_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context, const ::Ice::CallbackPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_findAdapterById(domainId, id, reply, context, cb, cookie);
     }
 
+    /**
+     * Request to find an object adapter
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The adapter ID.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching adapter is found.
+     * @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_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::IceDiscovery::Callback_Lookup_findAdapterByIdPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_findAdapterById(domainId, id, reply, ::Ice::noExplicitContext, cb, cookie);
     }
 
+    /**
+     * Request to find an object adapter
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The adapter ID.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching adapter is found.
+     * @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_findAdapterById(const ::std::string& domainId, const ::std::string& id, const ::IceDiscovery::LookupReplyPrx& reply, const ::Ice::Context& context, const ::IceDiscovery::Callback_Lookup_findAdapterByIdPtr& cb, const ::Ice::LocalObjectPtr& cookie = 0)
     {
         return _iceI_begin_findAdapterById(domainId, id, reply, context, cb, cookie);
     }
 
+    /**
+     * Completes an invocation of begin_findAdapterById.
+     * @param result The asynchronous result object for the invocation.
+     */
     void end_findAdapterById(const ::Ice::AsyncResultPtr& result);
 
 private:
@@ -623,6 +1048,11 @@ protected:
 namespace IceDiscovery
 {
 
+/**
+ * The LookupReply interface is used by IceDiscovery clients to answer requests
+ * received on the Lookup interface.
+ * \headerfile IceDiscovery/IceDiscovery.h
+ */
 class LookupReply : public virtual ::Ice::Object
 {
 public:
@@ -632,6 +1062,12 @@ public:
 
     virtual ~LookupReply();
 
+#ifdef ICE_CPP11_COMPILER
+    LookupReply() = default;
+    LookupReply(const LookupReply&) = default;
+    LookupReply& operator=(const LookupReply&) = default;
+#endif
+
     /**
      * Determines whether this object supports an interface with the given Slice type ID.
      * @param id The fully-scoped Slice type ID.
@@ -660,11 +1096,26 @@ public:
      */
     static const ::std::string& ice_staticId();
 
+    /**
+     * Reply to the findObjectById request.
+     * @param id The identity of the object.
+     * @param prx The proxy of the object.
+     * @param current The Current object for the invocation.
+     */
     virtual void foundObjectById(const ::Ice::Identity& id, const ::Ice::ObjectPrx& prx, const ::Ice::Current& current = ::Ice::emptyCurrent) = 0;
     /// \cond INTERNAL
     bool _iceD_foundObjectById(::IceInternal::Incoming&, const ::Ice::Current&);
     /// \endcond
 
+    /**
+     * Reply to the findAdpaterById request.
+     * @param id The adapter ID.
+     * @param prx The adapter proxy (a dummy proxy created by the adapter).
+     * The proxy provides the adapter endpoints.
+     * @param isReplicaGroup True if the adapter is also a member of a
+     * replica group.
+     * @param current The Current object for the invocation.
+     */
     virtual void foundAdapterById(const ::std::string& id, const ::Ice::ObjectPrx& prx, bool isReplicaGroup, const ::Ice::Current& current = ::Ice::emptyCurrent) = 0;
     /// \cond INTERNAL
     bool _iceD_foundAdapterById(::IceInternal::Incoming&, const ::Ice::Current&);
@@ -694,6 +1145,11 @@ inline bool operator<(const LookupReply& lhs, const LookupReply& rhs)
 }
 /// \endcond
 
+/**
+ * The Lookup interface is used by IceDiscovery clients to look for objects
+ * and adapters using UDP multicast.
+ * \headerfile IceDiscovery/IceDiscovery.h
+ */
 class Lookup : public virtual ::Ice::Object
 {
 public:
@@ -703,6 +1159,12 @@ public:
 
     virtual ~Lookup();
 
+#ifdef ICE_CPP11_COMPILER
+    Lookup() = default;
+    Lookup(const Lookup&) = default;
+    Lookup& operator=(const Lookup&) = default;
+#endif
+
     /**
      * Determines whether this object supports an interface with the given Slice type ID.
      * @param id The fully-scoped Slice type ID.
@@ -731,11 +1193,29 @@ public:
      */
     static const ::std::string& ice_staticId();
 
+    /**
+     * Request to find an Ice object
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The object identity.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching object is found.
+     * @param current The Current object for the invocation.
+     */
     virtual void findObjectById(const ::std::string& domainId, const ::Ice::Identity& id, const LookupReplyPrx& reply, const ::Ice::Current& current = ::Ice::emptyCurrent) = 0;
     /// \cond INTERNAL
     bool _iceD_findObjectById(::IceInternal::Incoming&, const ::Ice::Current&);
     /// \endcond
 
+    /**
+     * Request to find an object adapter
+     * @param domainId The IceDiscovery domain identifier. An IceDiscovery client only
+     * replies to requests with a matching domain identifier.
+     * @param id The adapter ID.
+     * @param reply The proxy of the LookupReply interface that should be used to send
+     * the reply if a matching adapter is found.
+     * @param current The Current object for the invocation.
+     */
     virtual void findAdapterById(const ::std::string& domainId, const ::std::string& id, const LookupReplyPrx& reply, const ::Ice::Current& current = ::Ice::emptyCurrent) = 0;
     /// \cond INTERNAL
     bool _iceD_findAdapterById(::IceInternal::Incoming&, const ::Ice::Current&);