zeroc-ice 3.7.0 → 3.7.5

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/RegisterPluginsInit.h>
 #include <Ice/CommunicatorF.h>
@@ -26,9 +21,10 @@ IceInternal::RegisterPluginsInit::RegisterPluginsInit()
     Ice::registerPluginFactory("IceTCP", createIceTCP, true);
 
     //
-    // Only include the UDP and WS transport plugins with non-static builds or Gem/PyPI builds.
+    // Only include the UDP and WS transport plugins with non-static builds or Gem/PyPI/Swift
+    // builds.
     //
-#if !defined(ICE_STATIC_LIBS) || defined(ICE_GEM) || defined(ICE_PYPI)
+#if !defined(ICE_STATIC_LIBS) || defined(ICE_GEM) || defined(ICE_PYPI) || defined(ICE_SWIFT)
     Ice::registerPluginFactory("IceUDP", createIceUDP, true);
     Ice::registerPluginFactory("IceWS", createIceWS, true);
 #endif

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_REGISTER_PLUGINS_INIT_H
 #define ICE_REGISTER_PLUGINS_INIT_H

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.0
+// Ice version 3.7.5
 //
 // <auto-generated>
 //
@@ -43,10 +38,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 5
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -108,19 +103,19 @@ Ice::RemoteLoggerAlreadyAttachedException::ice_staticId()
 }
 
 bool
-Ice::RemoteLogger::ice_isA(::std::string s, const ::Ice::Current&) const
+Ice::RemoteLogger::ice_isA(::std::string s, const Current&) const
 {
     return ::std::binary_search(iceC_Ice_RemoteLogger_ids, iceC_Ice_RemoteLogger_ids + 2, s);
 }
 
 ::std::vector<::std::string>
-Ice::RemoteLogger::ice_ids(const ::Ice::Current&) const
+Ice::RemoteLogger::ice_ids(const Current&) const
 {
     return ::std::vector<::std::string>(&iceC_Ice_RemoteLogger_ids[0], &iceC_Ice_RemoteLogger_ids[2]);
 }
 
 ::std::string
-Ice::RemoteLogger::ice_id(const ::Ice::Current&) const
+Ice::RemoteLogger::ice_id(const Current&) const
 {
     return ice_staticId();
 }
@@ -132,40 +127,45 @@ Ice::RemoteLogger::ice_staticId()
     return typeId;
 }
 
+/// \cond INTERNAL
 bool
-Ice::RemoteLogger::_iceD_init(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::RemoteLogger::_iceD_init(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
     auto istr = inS.startReadParams();
     ::std::string iceP_prefix;
-    ::Ice::LogMessageSeq iceP_logMessages;
+    LogMessageSeq iceP_logMessages;
     istr->readAll(iceP_prefix, iceP_logMessages);
     inS.endReadParams();
     this->init(::std::move(iceP_prefix), ::std::move(iceP_logMessages), current);
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::RemoteLogger::_iceD_log(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::RemoteLogger::_iceD_log(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
     auto istr = inS.startReadParams();
-    ::Ice::LogMessage iceP_message;
+    LogMessage iceP_message;
     istr->readAll(iceP_message);
     inS.endReadParams();
     this->log(::std::move(iceP_message), current);
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::RemoteLogger::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+Ice::RemoteLogger::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
     ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_RemoteLogger_ops, iceC_Ice_RemoteLogger_ops + 6, current.operation);
     if(r.first == r.second)
     {
-        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
 
     switch(r.first - iceC_Ice_RemoteLogger_ops)
@@ -197,25 +197,26 @@ Ice::RemoteLogger::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Curren
         default:
         {
             assert(false);
-            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
 }
+/// \endcond
 
 bool
-Ice::LoggerAdmin::ice_isA(::std::string s, const ::Ice::Current&) const
+Ice::LoggerAdmin::ice_isA(::std::string s, const Current&) const
 {
     return ::std::binary_search(iceC_Ice_LoggerAdmin_ids, iceC_Ice_LoggerAdmin_ids + 2, s);
 }
 
 ::std::vector<::std::string>
-Ice::LoggerAdmin::ice_ids(const ::Ice::Current&) const
+Ice::LoggerAdmin::ice_ids(const Current&) const
 {
     return ::std::vector<::std::string>(&iceC_Ice_LoggerAdmin_ids[0], &iceC_Ice_LoggerAdmin_ids[2]);
 }
 
 ::std::string
-Ice::LoggerAdmin::ice_id(const ::Ice::Current&) const
+Ice::LoggerAdmin::ice_id(const Current&) const
 {
     return ice_staticId();
 }
@@ -227,14 +228,15 @@ Ice::LoggerAdmin::ice_staticId()
     return typeId;
 }
 
+/// \cond INTERNAL
 bool
-Ice::LoggerAdmin::_iceD_attachRemoteLogger(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::LoggerAdmin::_iceD_attachRemoteLogger(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
     auto istr = inS.startReadParams();
-    ::std::shared_ptr<::Ice::RemoteLoggerPrx> iceP_prx;
-    ::Ice::LogMessageTypeSeq iceP_messageTypes;
-    ::Ice::StringSeq iceP_traceCategories;
+    ::std::shared_ptr<RemoteLoggerPrx> iceP_prx;
+    LogMessageTypeSeq iceP_messageTypes;
+    StringSeq iceP_traceCategories;
     int iceP_messageMax;
     istr->readAll(iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax);
     inS.endReadParams();
@@ -242,13 +244,15 @@ Ice::LoggerAdmin::_iceD_attachRemoteLogger(::IceInternal::Incoming& inS, const :
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::LoggerAdmin::_iceD_detachRemoteLogger(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::LoggerAdmin::_iceD_detachRemoteLogger(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
     auto istr = inS.startReadParams();
-    ::std::shared_ptr<::Ice::RemoteLoggerPrx> iceP_prx;
+    ::std::shared_ptr<RemoteLoggerPrx> iceP_prx;
     istr->readAll(iceP_prx);
     inS.endReadParams();
     bool ret = this->detachRemoteLogger(::std::move(iceP_prx), current);
@@ -257,32 +261,36 @@ Ice::LoggerAdmin::_iceD_detachRemoteLogger(::IceInternal::Incoming& inS, const :
     inS.endWriteParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::LoggerAdmin::_iceD_getLog(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::LoggerAdmin::_iceD_getLog(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
     auto istr = inS.startReadParams();
-    ::Ice::LogMessageTypeSeq iceP_messageTypes;
-    ::Ice::StringSeq iceP_traceCategories;
+    LogMessageTypeSeq iceP_messageTypes;
+    StringSeq iceP_traceCategories;
     int iceP_messageMax;
     istr->readAll(iceP_messageTypes, iceP_traceCategories, iceP_messageMax);
     inS.endReadParams();
     ::std::string iceP_prefix;
-    ::Ice::LogMessageSeq ret = this->getLog(::std::move(iceP_messageTypes), ::std::move(iceP_traceCategories), iceP_messageMax, iceP_prefix, current);
+    LogMessageSeq ret = this->getLog(::std::move(iceP_messageTypes), ::std::move(iceP_traceCategories), iceP_messageMax, iceP_prefix, current);
     auto ostr = inS.startWriteParams();
     ostr->writeAll(iceP_prefix, ret);
     inS.endWriteParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::LoggerAdmin::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+Ice::LoggerAdmin::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
     ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_LoggerAdmin_ops, iceC_Ice_LoggerAdmin_ops + 7, current.operation);
     if(r.first == r.second)
     {
-        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
 
     switch(r.first - iceC_Ice_LoggerAdmin_ops)
@@ -318,110 +326,125 @@ Ice::LoggerAdmin::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current
         default:
         {
             assert(false);
-            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::RemoteLoggerPrx::_iceI_init(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_prefix, const ::Ice::LogMessageSeq& iceP_logMessages, const ::Ice::Context& context)
+Ice::RemoteLoggerPrx::_iceI_init(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_prefix, const LogMessageSeq& iceP_logMessages, const Context& context)
 {
     outAsync->invoke(iceC_Ice_RemoteLogger_init_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
-        [&](::Ice::OutputStream* ostr)
+        [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_prefix, iceP_logMessages);
         },
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::RemoteLoggerPrx::_iceI_log(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::Ice::LogMessage& iceP_message, const ::Ice::Context& context)
+Ice::RemoteLoggerPrx::_iceI_log(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const LogMessage& iceP_message, const Context& context)
 {
     outAsync->invoke(iceC_Ice_RemoteLogger_log_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
-        [&](::Ice::OutputStream* ostr)
+        [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_message);
         },
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 ::std::shared_ptr<::Ice::ObjectPrx>
 Ice::RemoteLoggerPrx::_newInstance() const
 {
     return ::IceInternal::createProxy<RemoteLoggerPrx>();
 }
+/// \endcond
 
 const ::std::string&
 Ice::RemoteLoggerPrx::ice_staticId()
 {
-    return Ice::RemoteLogger::ice_staticId();
+    return RemoteLogger::ice_staticId();
 }
 
+/// \cond INTERNAL
 void
-Ice::LoggerAdminPrx::_iceI_attachRemoteLogger(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::shared_ptr<::Ice::RemoteLoggerPrx>& iceP_prx, const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, int iceP_messageMax, const ::Ice::Context& context)
+Ice::LoggerAdminPrx::_iceI_attachRemoteLogger(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::shared_ptr<RemoteLoggerPrx>& iceP_prx, const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, int iceP_messageMax, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_LoggerAdmin_attachRemoteLogger_name);
     outAsync->invoke(iceC_Ice_LoggerAdmin_attachRemoteLogger_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
-        [&](::Ice::OutputStream* ostr)
+        [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax);
         },
-        [](const ::Ice::UserException& ex)
+        [](const UserException& ex)
         {
             try
             {
                 ex.ice_throw();
             }
-            catch(const ::Ice::RemoteLoggerAlreadyAttachedException&)
+            catch(const RemoteLoggerAlreadyAttachedException&)
             {
                 throw;
             }
-            catch(const ::Ice::UserException&)
+            catch(const UserException&)
             {
             }
         });
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::LoggerAdminPrx::_iceI_detachRemoteLogger(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<bool>>& outAsync, const ::std::shared_ptr<::Ice::RemoteLoggerPrx>& iceP_prx, const ::Ice::Context& context)
+Ice::LoggerAdminPrx::_iceI_detachRemoteLogger(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<bool>>& outAsync, const ::std::shared_ptr<RemoteLoggerPrx>& iceP_prx, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_LoggerAdmin_detachRemoteLogger_name);
     outAsync->invoke(iceC_Ice_LoggerAdmin_detachRemoteLogger_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
-        [&](::Ice::OutputStream* ostr)
+        [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_prx);
         },
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::LoggerAdminPrx::_iceI_getLog(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::LoggerAdmin::GetLogResult>>& outAsync, const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, int iceP_messageMax, const ::Ice::Context& context)
+Ice::LoggerAdminPrx::_iceI_getLog(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<LoggerAdmin::GetLogResult>>& outAsync, const LogMessageTypeSeq& iceP_messageTypes, const StringSeq& iceP_traceCategories, int iceP_messageMax, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_LoggerAdmin_getLog_name);
     outAsync->invoke(iceC_Ice_LoggerAdmin_getLog_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
-        [&](::Ice::OutputStream* ostr)
+        [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_messageTypes, iceP_traceCategories, iceP_messageMax);
         },
         nullptr,
-        [](::Ice::InputStream* istr)
+        [](InputStream* istr)
         {
-            ::Ice::LoggerAdmin::GetLogResult v;
+            LoggerAdmin::GetLogResult v;
             istr->readAll(v.prefix, v.returnValue);
             return v;
         });
 }
+/// \endcond
 
+/// \cond INTERNAL
 ::std::shared_ptr<::Ice::ObjectPrx>
 Ice::LoggerAdminPrx::_newInstance() const
 {
     return ::IceInternal::createProxy<LoggerAdminPrx>();
 }
+/// \endcond
 
 const ::std::string&
 Ice::LoggerAdminPrx::ice_staticId()
 {
-    return Ice::LoggerAdmin::ice_staticId();
+    return LoggerAdmin::ice_staticId();
 }
 
 namespace Ice
@@ -474,25 +497,29 @@ Ice::RemoteLoggerAlreadyAttachedException::ice_throw() const
     throw *this;
 }
 
+/// \cond STREAM
 void
-Ice::RemoteLoggerAlreadyAttachedException::_writeImpl(::Ice::OutputStream* ostr) const
+Ice::RemoteLoggerAlreadyAttachedException::_writeImpl(OutputStream* ostr) const
 {
     ostr->startSlice("::Ice::RemoteLoggerAlreadyAttachedException", -1, true);
-    Ice::StreamWriter< ::Ice::RemoteLoggerAlreadyAttachedException, ::Ice::OutputStream>::write(ostr, *this);
+    StreamWriter< RemoteLoggerAlreadyAttachedException, OutputStream>::write(ostr, *this);
     ostr->endSlice();
 }
 
 void
-Ice::RemoteLoggerAlreadyAttachedException::_readImpl(::Ice::InputStream* istr)
+Ice::RemoteLoggerAlreadyAttachedException::_readImpl(InputStream* istr)
 {
     istr->startSlice();
-    Ice::StreamReader< ::Ice::RemoteLoggerAlreadyAttachedException, ::Ice::InputStream>::read(istr, *this);
+    StreamReader< RemoteLoggerAlreadyAttachedException, InputStream>::read(istr, *this);
     istr->endSlice();
 }
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::RemoteLogger* p) { return p; }
+/// \endcond
+
+/// \cond INTERNAL
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(RemoteLogger* p) { return p; }
 
 void
-::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::Ice::RemoteLogger>& v)
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< RemoteLogger>& v)
 {
     ::Ice::ObjectPrx proxy;
     istr->read(proxy);
@@ -502,10 +529,11 @@ void
     }
     else
     {
-        v = new ::IceProxy::Ice::RemoteLogger;
+        v = new RemoteLogger;
         v->_copyFrom(proxy);
     }
 }
+/// \endcond
 
 ::Ice::AsyncResultPtr
 IceProxy::Ice::RemoteLogger::_iceI_begin_init(const ::std::string& iceP_prefix, const ::Ice::LogMessageSeq& iceP_logMessages, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
@@ -558,21 +586,25 @@ IceProxy::Ice::RemoteLogger::end_log(const ::Ice::AsyncResultPtr& result)
     _end(result, iceC_Ice_RemoteLogger_log_name);
 }
 
+/// \cond INTERNAL
 ::IceProxy::Ice::Object*
 IceProxy::Ice::RemoteLogger::_newInstance() const
 {
     return new RemoteLogger;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::Ice::RemoteLogger::ice_staticId()
 {
     return ::Ice::RemoteLogger::ice_staticId();
 }
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::LoggerAdmin* p) { return p; }
+
+/// \cond INTERNAL
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(LoggerAdmin* p) { return p; }
 
 void
-::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::Ice::LoggerAdmin>& v)
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< LoggerAdmin>& v)
 {
     ::Ice::ObjectPrx proxy;
     istr->read(proxy);
@@ -582,10 +614,11 @@ void
     }
     else
     {
-        v = new ::IceProxy::Ice::LoggerAdmin;
+        v = new LoggerAdmin;
         v->_copyFrom(proxy);
     }
 }
+/// \endcond
 
 ::Ice::AsyncResultPtr
 IceProxy::Ice::LoggerAdmin::_iceI_begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& iceP_prx, const ::Ice::LogMessageTypeSeq& iceP_messageTypes, const ::Ice::StringSeq& iceP_traceCategories, ::Ice::Int iceP_messageMax, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
@@ -719,11 +752,33 @@ IceProxy::Ice::LoggerAdmin::end_getLog(::std::string& iceP_prefix, const ::Ice::
     return ret;
 }
 
+void IceProxy::Ice::LoggerAdmin::_iceI_end_getLog(::std::string& iceP_prefix, ::Ice::LogMessageSeq& ret, const ::Ice::AsyncResultPtr& result)
+{
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_LoggerAdmin_getLog_name);
+    if(!result->_waitForResponse())
+    {
+        try
+        {
+            result->_throwUserException();
+        }
+        catch(const ::Ice::UserException& ex)
+        {
+            throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
+        }
+    }
+    ::Ice::InputStream* istr = result->_startReadParams();
+    istr->read(iceP_prefix);
+    istr->read(ret);
+    result->_endReadParams();
+}
+
+/// \cond INTERNAL
 ::IceProxy::Ice::Object*
 IceProxy::Ice::LoggerAdmin::_newInstance() const
 {
     return new LoggerAdmin;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::Ice::LoggerAdmin::ice_staticId()
@@ -735,8 +790,10 @@ Ice::RemoteLogger::~RemoteLogger()
 {
 }
 
-ICE_API ::Ice::Object* Ice::upCast(::Ice::RemoteLogger* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::Object* Ice::upCast(RemoteLogger* p) { return p; }
 
+/// \endcond
 
 namespace
 {
@@ -749,19 +806,19 @@ const ::std::string iceC_Ice_RemoteLogger_ids[2] =
 }
 
 bool
-Ice::RemoteLogger::ice_isA(const ::std::string& s, const ::Ice::Current&) const
+Ice::RemoteLogger::ice_isA(const ::std::string& s, const Current&) const
 {
     return ::std::binary_search(iceC_Ice_RemoteLogger_ids, iceC_Ice_RemoteLogger_ids + 2, s);
 }
 
 ::std::vector< ::std::string>
-Ice::RemoteLogger::ice_ids(const ::Ice::Current&) const
+Ice::RemoteLogger::ice_ids(const Current&) const
 {
     return ::std::vector< ::std::string>(&iceC_Ice_RemoteLogger_ids[0], &iceC_Ice_RemoteLogger_ids[2]);
 }
 
 const ::std::string&
-Ice::RemoteLogger::ice_id(const ::Ice::Current&) const
+Ice::RemoteLogger::ice_id(const Current&) const
 {
     return ice_staticId();
 }
@@ -777,13 +834,14 @@ Ice::RemoteLogger::ice_staticId()
 #endif
 }
 
+/// \cond INTERNAL
 bool
-Ice::RemoteLogger::_iceD_init(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::RemoteLogger::_iceD_init(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::Normal, current.mode);
-    ::Ice::InputStream* istr = inS.startReadParams();
+    InputStream* istr = inS.startReadParams();
     ::std::string iceP_prefix;
-    ::Ice::LogMessageSeq iceP_logMessages;
+    LogMessageSeq iceP_logMessages;
     istr->read(iceP_prefix);
     istr->read(iceP_logMessages);
     inS.endReadParams();
@@ -791,19 +849,22 @@ Ice::RemoteLogger::_iceD_init(::IceInternal::Incoming& inS, const ::Ice::Current
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::RemoteLogger::_iceD_log(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::RemoteLogger::_iceD_log(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::Normal, current.mode);
-    ::Ice::InputStream* istr = inS.startReadParams();
-    ::Ice::LogMessage iceP_message;
+    InputStream* istr = inS.startReadParams();
+    LogMessage iceP_message;
     istr->read(iceP_message);
     inS.endReadParams();
     this->log(iceP_message, current);
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
 namespace
 {
@@ -819,13 +880,14 @@ const ::std::string iceC_Ice_RemoteLogger_all[] =
 
 }
 
+/// \cond INTERNAL
 bool
-Ice::RemoteLogger::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+Ice::RemoteLogger::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
     ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_RemoteLogger_all, iceC_Ice_RemoteLogger_all + 6, current.operation);
     if(r.first == r.second)
     {
-        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
 
     switch(r.first - iceC_Ice_RemoteLogger_all)
@@ -857,43 +919,50 @@ Ice::RemoteLogger::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Curren
         default:
         {
             assert(false);
-            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
 }
+/// \endcond
 
+/// \cond STREAM
 void
-Ice::RemoteLogger::_iceWriteImpl(::Ice::OutputStream* ostr) const
+Ice::RemoteLogger::_iceWriteImpl(OutputStream* ostr) const
 {
     ostr->startSlice(ice_staticId(), -1, true);
-    Ice::StreamWriter< ::Ice::RemoteLogger, ::Ice::OutputStream>::write(ostr, *this);
+    StreamWriter< RemoteLogger, OutputStream>::write(ostr, *this);
     ostr->endSlice();
 }
 
 void
-Ice::RemoteLogger::_iceReadImpl(::Ice::InputStream* istr)
+Ice::RemoteLogger::_iceReadImpl(InputStream* istr)
 {
     istr->startSlice();
-    Ice::StreamReader< ::Ice::RemoteLogger, ::Ice::InputStream>::read(istr, *this);
+    StreamReader< RemoteLogger, InputStream>::read(istr, *this);
     istr->endSlice();
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::_icePatchObjectPtr(RemoteLoggerPtr& handle, const ::Ice::ObjectPtr& v)
+Ice::_icePatchObjectPtr(RemoteLoggerPtr& handle, const ObjectPtr& v)
 {
-    handle = ::Ice::RemoteLoggerPtr::dynamicCast(v);
+    handle = RemoteLoggerPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::Ice::RemoteLogger::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(RemoteLogger::ice_staticId(), v);
     }
 }
+/// \endcond
 
 Ice::LoggerAdmin::~LoggerAdmin()
 {
 }
 
-ICE_API ::Ice::Object* Ice::upCast(::Ice::LoggerAdmin* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::Object* Ice::upCast(LoggerAdmin* p) { return p; }
 
+/// \endcond
 
 namespace
 {
@@ -906,19 +975,19 @@ const ::std::string iceC_Ice_LoggerAdmin_ids[2] =
 }
 
 bool
-Ice::LoggerAdmin::ice_isA(const ::std::string& s, const ::Ice::Current&) const
+Ice::LoggerAdmin::ice_isA(const ::std::string& s, const Current&) const
 {
     return ::std::binary_search(iceC_Ice_LoggerAdmin_ids, iceC_Ice_LoggerAdmin_ids + 2, s);
 }
 
 ::std::vector< ::std::string>
-Ice::LoggerAdmin::ice_ids(const ::Ice::Current&) const
+Ice::LoggerAdmin::ice_ids(const Current&) const
 {
     return ::std::vector< ::std::string>(&iceC_Ice_LoggerAdmin_ids[0], &iceC_Ice_LoggerAdmin_ids[2]);
 }
 
 const ::std::string&
-Ice::LoggerAdmin::ice_id(const ::Ice::Current&) const
+Ice::LoggerAdmin::ice_id(const Current&) const
 {
     return ice_staticId();
 }
@@ -934,15 +1003,16 @@ Ice::LoggerAdmin::ice_staticId()
 #endif
 }
 
+/// \cond INTERNAL
 bool
-Ice::LoggerAdmin::_iceD_attachRemoteLogger(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::LoggerAdmin::_iceD_attachRemoteLogger(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::Normal, current.mode);
-    ::Ice::InputStream* istr = inS.startReadParams();
-    ::Ice::RemoteLoggerPrx iceP_prx;
-    ::Ice::LogMessageTypeSeq iceP_messageTypes;
-    ::Ice::StringSeq iceP_traceCategories;
-    ::Ice::Int iceP_messageMax;
+    InputStream* istr = inS.startReadParams();
+    RemoteLoggerPrx iceP_prx;
+    LogMessageTypeSeq iceP_messageTypes;
+    StringSeq iceP_traceCategories;
+    Int iceP_messageMax;
     istr->read(iceP_prx);
     istr->read(iceP_messageTypes);
     istr->read(iceP_traceCategories);
@@ -952,42 +1022,47 @@ Ice::LoggerAdmin::_iceD_attachRemoteLogger(::IceInternal::Incoming& inS, const :
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::LoggerAdmin::_iceD_detachRemoteLogger(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::LoggerAdmin::_iceD_detachRemoteLogger(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::Normal, current.mode);
-    ::Ice::InputStream* istr = inS.startReadParams();
-    ::Ice::RemoteLoggerPrx iceP_prx;
+    InputStream* istr = inS.startReadParams();
+    RemoteLoggerPrx iceP_prx;
     istr->read(iceP_prx);
     inS.endReadParams();
     bool ret = this->detachRemoteLogger(iceP_prx, current);
-    ::Ice::OutputStream* ostr = inS.startWriteParams();
+    OutputStream* ostr = inS.startWriteParams();
     ostr->write(ret);
     inS.endWriteParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::LoggerAdmin::_iceD_getLog(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::LoggerAdmin::_iceD_getLog(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::Normal, current.mode);
-    ::Ice::InputStream* istr = inS.startReadParams();
-    ::Ice::LogMessageTypeSeq iceP_messageTypes;
-    ::Ice::StringSeq iceP_traceCategories;
-    ::Ice::Int iceP_messageMax;
+    InputStream* istr = inS.startReadParams();
+    LogMessageTypeSeq iceP_messageTypes;
+    StringSeq iceP_traceCategories;
+    Int iceP_messageMax;
     istr->read(iceP_messageTypes);
     istr->read(iceP_traceCategories);
     istr->read(iceP_messageMax);
     inS.endReadParams();
     ::std::string iceP_prefix;
-    ::Ice::LogMessageSeq ret = this->getLog(iceP_messageTypes, iceP_traceCategories, iceP_messageMax, iceP_prefix, current);
-    ::Ice::OutputStream* ostr = inS.startWriteParams();
+    LogMessageSeq ret = this->getLog(iceP_messageTypes, iceP_traceCategories, iceP_messageMax, iceP_prefix, current);
+    OutputStream* ostr = inS.startWriteParams();
     ostr->write(iceP_prefix);
     ostr->write(ret);
     inS.endWriteParams();
     return true;
 }
+/// \endcond
 
 namespace
 {
@@ -1004,13 +1079,14 @@ const ::std::string iceC_Ice_LoggerAdmin_all[] =
 
 }
 
+/// \cond INTERNAL
 bool
-Ice::LoggerAdmin::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+Ice::LoggerAdmin::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
     ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_LoggerAdmin_all, iceC_Ice_LoggerAdmin_all + 7, current.operation);
     if(r.first == r.second)
     {
-        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
 
     switch(r.first - iceC_Ice_LoggerAdmin_all)
@@ -1046,36 +1122,41 @@ Ice::LoggerAdmin::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current
         default:
         {
             assert(false);
-            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
 }
+/// \endcond
 
+/// \cond STREAM
 void
-Ice::LoggerAdmin::_iceWriteImpl(::Ice::OutputStream* ostr) const
+Ice::LoggerAdmin::_iceWriteImpl(OutputStream* ostr) const
 {
     ostr->startSlice(ice_staticId(), -1, true);
-    Ice::StreamWriter< ::Ice::LoggerAdmin, ::Ice::OutputStream>::write(ostr, *this);
+    StreamWriter< LoggerAdmin, OutputStream>::write(ostr, *this);
     ostr->endSlice();
 }
 
 void
-Ice::LoggerAdmin::_iceReadImpl(::Ice::InputStream* istr)
+Ice::LoggerAdmin::_iceReadImpl(InputStream* istr)
 {
     istr->startSlice();
-    Ice::StreamReader< ::Ice::LoggerAdmin, ::Ice::InputStream>::read(istr, *this);
+    StreamReader< LoggerAdmin, InputStream>::read(istr, *this);
     istr->endSlice();
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::_icePatchObjectPtr(LoggerAdminPtr& handle, const ::Ice::ObjectPtr& v)
+Ice::_icePatchObjectPtr(LoggerAdminPtr& handle, const ObjectPtr& v)
 {
-    handle = ::Ice::LoggerAdminPtr::dynamicCast(v);
+    handle = LoggerAdminPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::Ice::LoggerAdmin::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(LoggerAdmin::ice_staticId(), v);
     }
 }
+/// \endcond
 
 namespace Ice
 {