zeroc-ice 3.6.5 → 3.7.4

data/ext/ice/cpp/src/Ice/ReferenceFactory.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_REFERENCE_FACTORY_H
 #define ICE_REFERENCE_FACTORY_H
@@ -31,14 +26,14 @@ public:
     //
     // Create a direct reference.
     //
-    ReferencePtr create(const ::Ice::Identity&, const ::std::string&, const ReferencePtr&, 
+    ReferencePtr create(const ::Ice::Identity&, const ::std::string&, const ReferencePtr&,
                         const ::std::vector<EndpointIPtr>&);
-    
+
     //
     // Create an indirect reference.
     //
     ReferencePtr create(const ::Ice::Identity&, const ::std::string&, const ReferencePtr&, const std::string&);
-    
+
     //
     // Create a fixed reference.
     //
@@ -52,13 +47,13 @@ public:
     //
     // Create a reference by unmarshaling it from a stream.
     //
-    ReferencePtr create(const ::Ice::Identity&, BasicStream*);
+    ReferencePtr create(const ::Ice::Identity&, Ice::InputStream*);
 
-    ReferenceFactoryPtr setDefaultRouter(const ::Ice::RouterPrx&);
-    ::Ice::RouterPrx getDefaultRouter() const;
+    ReferenceFactoryPtr setDefaultRouter(const ::Ice::RouterPrxPtr&);
+    ::Ice::RouterPrxPtr getDefaultRouter() const;
 
-    ReferenceFactoryPtr setDefaultLocator(const ::Ice::LocatorPrx&);
-    ::Ice::LocatorPrx getDefaultLocator() const;
+    ReferenceFactoryPtr setDefaultLocator(const ::Ice::LocatorPrxPtr&);
+    ::Ice::LocatorPrxPtr getDefaultLocator() const;
 
 private:
 
@@ -66,14 +61,14 @@ private:
     friend class Instance;
 
     void checkForUnknownProperties(const std::string&);
-    RoutableReferencePtr create(const ::Ice::Identity&, const ::std::string&, Reference::Mode, bool, 
+    RoutableReferencePtr create(const ::Ice::Identity&, const ::std::string&, Reference::Mode, bool,
                                 const Ice::ProtocolVersion&, const Ice::EncodingVersion&,
                                 const std::vector<EndpointIPtr>&, const std::string&, const std::string&);
 
     const InstancePtr _instance;
     const ::Ice::CommunicatorPtr _communicator;
-    ::Ice::RouterPrx _defaultRouter;
-    ::Ice::LocatorPrx _defaultLocator;
+    ::Ice::RouterPrxPtr _defaultRouter;
+    ::Ice::LocatorPrxPtr _defaultLocator;
 };
 
 }

data/ext/ice/cpp/src/Ice/ReferenceFactoryF.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_REFERENCE_FACTORY_F_H
 #define ICE_REFERENCE_FACTORY_F_H

data/ext/ice/cpp/src/Ice/RegisterPluginsInit.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/RegisterPluginsInit.h>
 #include <Ice/CommunicatorF.h>
@@ -14,15 +9,30 @@
 extern "C"
 {
 
+Ice::Plugin* createStringConverter(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
 Ice::Plugin* createIceUDP(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
 Ice::Plugin* createIceTCP(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
-Ice::Plugin* createStringConverter(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
+Ice::Plugin* createIceWS(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
 
-};
+}
 
 IceInternal::RegisterPluginsInit::RegisterPluginsInit()
 {
-    Ice::registerPluginFactory("IceUDP", createIceUDP, true);
     Ice::registerPluginFactory("IceTCP", createIceTCP, true);
+
+    //
+    // 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) || defined(ICE_SWIFT)
+    Ice::registerPluginFactory("IceUDP", createIceUDP, true);
+    Ice::registerPluginFactory("IceWS", createIceWS, true);
+#endif
+
+    //
+    // Also include IceStringConverter in Gem/PyPI builds.
+    //
+#if defined(ICE_GEM) || defined(ICE_PYPI)
     Ice::registerPluginFactory("IceStringConverter", createStringConverter, false);
+#endif
 }

data/ext/ice/cpp/src/Ice/RegisterPluginsInit.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_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-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,614 +19,785 @@
 #include <Ice/RemoteLogger.h>
 #include <IceUtil/PushDisableWarnings.h>
 #include <Ice/LocalException.h>
-#include <Ice/ObjectFactory.h>
-#include <Ice/Outgoing.h>
+#include <Ice/ValueFactory.h>
 #include <Ice/OutgoingAsync.h>
-#include <Ice/BasicStream.h>
-#include <IceUtil/Iterator.h>
+#include <Ice/InputStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/LocalException.h>
 #include <IceUtil/PopDisableWarnings.h>
 
+#if defined(_MSC_VER)
+#   pragma warning(disable:4458) // declaration of ... hides class member
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #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
 {
 
-const ::std::string __Ice__RemoteLogger__init_name = "init";
-
-const ::std::string __Ice__RemoteLogger__log_name = "log";
-
-const ::std::string __Ice__LoggerAdmin__attachRemoteLogger_name = "attachRemoteLogger";
+const ::std::string iceC_Ice_RemoteLogger_ids[2] =
+{
+    "::Ice::Object",
+    "::Ice::RemoteLogger"
+};
+const ::std::string iceC_Ice_RemoteLogger_ops[] =
+{
+    "ice_id",
+    "ice_ids",
+    "ice_isA",
+    "ice_ping",
+    "init",
+    "log"
+};
+const ::std::string iceC_Ice_RemoteLogger_init_name = "init";
+const ::std::string iceC_Ice_RemoteLogger_log_name = "log";
 
-const ::std::string __Ice__LoggerAdmin__detachRemoteLogger_name = "detachRemoteLogger";
+const ::IceInternal::DefaultUserExceptionFactoryInit<::Ice::RemoteLoggerAlreadyAttachedException> iceC_Ice_RemoteLoggerAlreadyAttachedException_init("::Ice::RemoteLoggerAlreadyAttachedException");
 
-const ::std::string __Ice__LoggerAdmin__getLog_name = "getLog";
+const ::std::string iceC_Ice_LoggerAdmin_ids[2] =
+{
+    "::Ice::LoggerAdmin",
+    "::Ice::Object"
+};
+const ::std::string iceC_Ice_LoggerAdmin_ops[] =
+{
+    "attachRemoteLogger",
+    "detachRemoteLogger",
+    "getLog",
+    "ice_id",
+    "ice_ids",
+    "ice_isA",
+    "ice_ping"
+};
+const ::std::string iceC_Ice_LoggerAdmin_attachRemoteLogger_name = "attachRemoteLogger";
+const ::std::string iceC_Ice_LoggerAdmin_detachRemoteLogger_name = "detachRemoteLogger";
+const ::std::string iceC_Ice_LoggerAdmin_getLog_name = "getLog";
 
 }
 
-namespace
+Ice::RemoteLoggerAlreadyAttachedException::~RemoteLoggerAlreadyAttachedException()
 {
-
-const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::RemoteLoggerAlreadyAttachedException> __Ice__RemoteLoggerAlreadyAttachedException_init("::Ice::RemoteLoggerAlreadyAttachedException");
-
 }
 
-Ice::RemoteLoggerAlreadyAttachedException::~RemoteLoggerAlreadyAttachedException() throw()
+const ::std::string&
+Ice::RemoteLoggerAlreadyAttachedException::ice_staticId()
 {
+    static const ::std::string typeId = "::Ice::RemoteLoggerAlreadyAttachedException";
+    return typeId;
 }
 
-::std::string
-Ice::RemoteLoggerAlreadyAttachedException::ice_name() const
+bool
+Ice::RemoteLogger::ice_isA(::std::string s, const Current&) const
 {
-    return "Ice::RemoteLoggerAlreadyAttachedException";
+    return ::std::binary_search(iceC_Ice_RemoteLogger_ids, iceC_Ice_RemoteLogger_ids + 2, s);
 }
 
-Ice::RemoteLoggerAlreadyAttachedException*
-Ice::RemoteLoggerAlreadyAttachedException::ice_clone() const
+::std::vector<::std::string>
+Ice::RemoteLogger::ice_ids(const Current&) const
 {
-    return new RemoteLoggerAlreadyAttachedException(*this);
+    return ::std::vector<::std::string>(&iceC_Ice_RemoteLogger_ids[0], &iceC_Ice_RemoteLogger_ids[2]);
 }
 
-void
-Ice::RemoteLoggerAlreadyAttachedException::ice_throw() const
+::std::string
+Ice::RemoteLogger::ice_id(const Current&) const
 {
-    throw *this;
+    return ice_staticId();
 }
 
-void
-Ice::RemoteLoggerAlreadyAttachedException::__writeImpl(::IceInternal::BasicStream* __os) const
+const ::std::string&
+Ice::RemoteLogger::ice_staticId()
 {
-    __os->startWriteSlice("::Ice::RemoteLoggerAlreadyAttachedException", -1, true);
-    __os->endWriteSlice();
+    static const ::std::string typeId = "::Ice::RemoteLogger";
+    return typeId;
 }
 
-void
-Ice::RemoteLoggerAlreadyAttachedException::__readImpl(::IceInternal::BasicStream* __is)
+/// \cond INTERNAL
+bool
+Ice::RemoteLogger::_iceD_init(::IceInternal::Incoming& inS, const Current& current)
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    auto istr = inS.startReadParams();
+    ::std::string iceP_prefix;
+    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
 
-namespace Ice
+/// \cond INTERNAL
+bool
+Ice::RemoteLogger::_iceD_log(::IceInternal::Incoming& inS, const Current& current)
 {
-#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_STATIC_LIBS)
-template struct ICE_API StreamWriter< ::Ice::LogMessage, ::IceInternal::BasicStream>;
-template struct ICE_API StreamReader< ::Ice::LogMessage, ::IceInternal::BasicStream>;
-#endif
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    auto istr = inS.startReadParams();
+    LogMessage iceP_message;
+    istr->readAll(iceP_message);
+    inS.endReadParams();
+    this->log(::std::move(iceP_message), current);
+    inS.writeEmptyParams();
+    return true;
 }
-#ifdef __SUNPRO_CC
-class ICE_API IceProxy::Ice::RemoteLogger;
-#endif
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::RemoteLogger* p) { return p; }
+/// \endcond
 
-void
-::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::RemoteLogger>& v)
+/// \cond INTERNAL
+bool
+Ice::RemoteLogger::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
-    ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
-    if(!proxy)
+    ::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)
     {
-        v = 0;
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
-    else
+
+    switch(r.first - iceC_Ice_RemoteLogger_ops)
     {
-        v = new ::IceProxy::Ice::RemoteLogger;
-        v->__copyFrom(proxy);
+        case 0:
+        {
+            return _iceD_ice_id(in, current);
+        }
+        case 1:
+        {
+            return _iceD_ice_ids(in, current);
+        }
+        case 2:
+        {
+            return _iceD_ice_isA(in, current);
+        }
+        case 3:
+        {
+            return _iceD_ice_ping(in, current);
+        }
+        case 4:
+        {
+            return _iceD_init(in, current);
+        }
+        case 5:
+        {
+            return _iceD_log(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        }
     }
 }
+/// \endcond
 
-void
-IceProxy::Ice::RemoteLogger::init(const ::std::string& __p_prefix, const ::Ice::LogMessageSeq& __p_logMessages, const ::Ice::Context* __ctx)
+bool
+Ice::LoggerAdmin::ice_isA(::std::string s, const Current&) const
 {
-    ::IceInternal::Outgoing __og(this, __Ice__RemoteLogger__init_name, ::Ice::Normal, __ctx);
-    try
-    {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_prefix);
-        __os->write(__p_logMessages);
-        __og.endWriteParams();
-    }
-    catch(const ::Ice::LocalException& __ex)
-    {
-        __og.abort(__ex);
-    }
-    __invoke(__og);
+    return ::std::binary_search(iceC_Ice_LoggerAdmin_ids, iceC_Ice_LoggerAdmin_ids + 2, s);
 }
 
-::Ice::AsyncResultPtr
-IceProxy::Ice::RemoteLogger::begin_init(const ::std::string& __p_prefix, const ::Ice::LogMessageSeq& __p_logMessages, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+::std::vector<::std::string>
+Ice::LoggerAdmin::ice_ids(const Current&) const
 {
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__RemoteLogger__init_name, __del, __cookie);
-    try
+    return ::std::vector<::std::string>(&iceC_Ice_LoggerAdmin_ids[0], &iceC_Ice_LoggerAdmin_ids[2]);
+}
+
+::std::string
+Ice::LoggerAdmin::ice_id(const Current&) const
+{
+    return ice_staticId();
+}
+
+const ::std::string&
+Ice::LoggerAdmin::ice_staticId()
+{
+    static const ::std::string typeId = "::Ice::LoggerAdmin";
+    return typeId;
+}
+
+/// \cond INTERNAL
+bool
+Ice::LoggerAdmin::_iceD_attachRemoteLogger(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    auto istr = inS.startReadParams();
+    ::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();
+    this->attachRemoteLogger(::std::move(iceP_prx), ::std::move(iceP_messageTypes), ::std::move(iceP_traceCategories), iceP_messageMax, current);
+    inS.writeEmptyParams();
+    return true;
+}
+/// \endcond
+
+/// \cond INTERNAL
+bool
+Ice::LoggerAdmin::_iceD_detachRemoteLogger(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    auto istr = inS.startReadParams();
+    ::std::shared_ptr<RemoteLoggerPrx> iceP_prx;
+    istr->readAll(iceP_prx);
+    inS.endReadParams();
+    bool ret = this->detachRemoteLogger(::std::move(iceP_prx), current);
+    auto ostr = inS.startWriteParams();
+    ostr->writeAll(ret);
+    inS.endWriteParams();
+    return true;
+}
+/// \endcond
+
+/// \cond INTERNAL
+bool
+Ice::LoggerAdmin::_iceD_getLog(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    auto istr = inS.startReadParams();
+    LogMessageTypeSeq iceP_messageTypes;
+    StringSeq iceP_traceCategories;
+    int iceP_messageMax;
+    istr->readAll(iceP_messageTypes, iceP_traceCategories, iceP_messageMax);
+    inS.endReadParams();
+    ::std::string iceP_prefix;
+    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 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)
     {
-        __result->prepare(__Ice__RemoteLogger__init_name, ::Ice::Normal, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_prefix);
-        __os->write(__p_logMessages);
-        __result->endWriteParams();
-        __result->invoke();
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
-    catch(const ::Ice::Exception& __ex)
+
+    switch(r.first - iceC_Ice_LoggerAdmin_ops)
     {
-        __result->abort(__ex);
+        case 0:
+        {
+            return _iceD_attachRemoteLogger(in, current);
+        }
+        case 1:
+        {
+            return _iceD_detachRemoteLogger(in, current);
+        }
+        case 2:
+        {
+            return _iceD_getLog(in, current);
+        }
+        case 3:
+        {
+            return _iceD_ice_id(in, current);
+        }
+        case 4:
+        {
+            return _iceD_ice_ids(in, current);
+        }
+        case 5:
+        {
+            return _iceD_ice_isA(in, current);
+        }
+        case 6:
+        {
+            return _iceD_ice_ping(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        }
     }
-    return __result;
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-IceProxy::Ice::RemoteLogger::end_init(const ::Ice::AsyncResultPtr& __result)
+Ice::RemoteLoggerPrx::_iceI_init(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_prefix, const LogMessageSeq& iceP_logMessages, const Context& context)
 {
-    __end(__result, __Ice__RemoteLogger__init_name);
+    outAsync->invoke(iceC_Ice_RemoteLogger_init_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_prefix, iceP_logMessages);
+        },
+        nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-IceProxy::Ice::RemoteLogger::log(const ::Ice::LogMessage& __p_message, const ::Ice::Context* __ctx)
+Ice::RemoteLoggerPrx::_iceI_log(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const LogMessage& iceP_message, const Context& context)
 {
-    ::IceInternal::Outgoing __og(this, __Ice__RemoteLogger__log_name, ::Ice::Normal, __ctx);
-    try
-    {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_message);
-        __og.endWriteParams();
-    }
-    catch(const ::Ice::LocalException& __ex)
-    {
-        __og.abort(__ex);
-    }
-    __invoke(__og);
+    outAsync->invoke(iceC_Ice_RemoteLogger_log_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_message);
+        },
+        nullptr);
 }
+/// \endcond
 
-::Ice::AsyncResultPtr
-IceProxy::Ice::RemoteLogger::begin_log(const ::Ice::LogMessage& __p_message, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+/// \cond INTERNAL
+::std::shared_ptr<::Ice::ObjectPrx>
+Ice::RemoteLoggerPrx::_newInstance() const
 {
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__RemoteLogger__log_name, __del, __cookie);
-    try
-    {
-        __result->prepare(__Ice__RemoteLogger__log_name, ::Ice::Normal, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_message);
-        __result->endWriteParams();
-        __result->invoke();
-    }
-    catch(const ::Ice::Exception& __ex)
-    {
-        __result->abort(__ex);
-    }
-    return __result;
+    return ::IceInternal::createProxy<RemoteLoggerPrx>();
 }
+/// \endcond
 
+const ::std::string&
+Ice::RemoteLoggerPrx::ice_staticId()
+{
+    return RemoteLogger::ice_staticId();
+}
+
+/// \cond INTERNAL
 void
-IceProxy::Ice::RemoteLogger::end_log(const ::Ice::AsyncResultPtr& __result)
+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)
 {
-    __end(__result, __Ice__RemoteLogger__log_name);
+    _checkTwowayOnly(iceC_Ice_LoggerAdmin_attachRemoteLogger_name);
+    outAsync->invoke(iceC_Ice_LoggerAdmin_attachRemoteLogger_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax);
+        },
+        [](const UserException& ex)
+        {
+            try
+            {
+                ex.ice_throw();
+            }
+            catch(const RemoteLoggerAlreadyAttachedException&)
+            {
+                throw;
+            }
+            catch(const UserException&)
+            {
+            }
+        });
 }
+/// \endcond
+
+/// \cond INTERNAL
+void
+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,
+        [&](OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_prx);
+        },
+        nullptr);
+}
+/// \endcond
+
+/// \cond INTERNAL
+void
+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,
+        [&](OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_messageTypes, iceP_traceCategories, iceP_messageMax);
+        },
+        nullptr,
+        [](InputStream* istr)
+        {
+            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&
-IceProxy::Ice::RemoteLogger::ice_staticId()
+Ice::LoggerAdminPrx::ice_staticId()
 {
-    return ::Ice::RemoteLogger::ice_staticId();
+    return LoggerAdmin::ice_staticId();
 }
 
-::IceProxy::Ice::Object*
-IceProxy::Ice::RemoteLogger::__newInstance() const
+namespace Ice
 {
-    return new RemoteLogger;
 }
-#ifdef __SUNPRO_CC
-class ICE_API IceProxy::Ice::LoggerAdmin;
-#endif
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::LoggerAdmin* p) { return p; }
+
+#else // C++98 mapping
+
+namespace
+{
+
+const ::std::string iceC_Ice_RemoteLogger_init_name = "init";
+
+const ::std::string iceC_Ice_RemoteLogger_log_name = "log";
+
+const ::std::string iceC_Ice_LoggerAdmin_attachRemoteLogger_name = "attachRemoteLogger";
+
+const ::std::string iceC_Ice_LoggerAdmin_detachRemoteLogger_name = "detachRemoteLogger";
+
+const ::std::string iceC_Ice_LoggerAdmin_getLog_name = "getLog";
+
+}
+
+namespace
+{
+
+const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::RemoteLoggerAlreadyAttachedException> iceC_Ice_RemoteLoggerAlreadyAttachedException_init("::Ice::RemoteLoggerAlreadyAttachedException");
+
+}
+
+Ice::RemoteLoggerAlreadyAttachedException::~RemoteLoggerAlreadyAttachedException() throw()
+{
+}
+
+::std::string
+Ice::RemoteLoggerAlreadyAttachedException::ice_id() const
+{
+    return "::Ice::RemoteLoggerAlreadyAttachedException";
+}
+
+Ice::RemoteLoggerAlreadyAttachedException*
+Ice::RemoteLoggerAlreadyAttachedException::ice_clone() const
+{
+    return new RemoteLoggerAlreadyAttachedException(*this);
+}
 
 void
-::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::LoggerAdmin>& v)
+Ice::RemoteLoggerAlreadyAttachedException::ice_throw() const
+{
+    throw *this;
+}
+
+/// \cond STREAM
+void
+Ice::RemoteLoggerAlreadyAttachedException::_writeImpl(OutputStream* ostr) const
+{
+    ostr->startSlice("::Ice::RemoteLoggerAlreadyAttachedException", -1, true);
+    StreamWriter< RemoteLoggerAlreadyAttachedException, OutputStream>::write(ostr, *this);
+    ostr->endSlice();
+}
+
+void
+Ice::RemoteLoggerAlreadyAttachedException::_readImpl(InputStream* istr)
+{
+    istr->startSlice();
+    StreamReader< RemoteLoggerAlreadyAttachedException, InputStream>::read(istr, *this);
+    istr->endSlice();
+}
+/// \endcond
+
+/// \cond INTERNAL
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(RemoteLogger* p) { return p; }
+
+void
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< RemoteLogger>& v)
 {
     ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
+    istr->read(proxy);
     if(!proxy)
     {
         v = 0;
     }
     else
     {
-        v = new ::IceProxy::Ice::LoggerAdmin;
-        v->__copyFrom(proxy);
+        v = new RemoteLogger;
+        v->_copyFrom(proxy);
     }
 }
+/// \endcond
 
-void
-IceProxy::Ice::LoggerAdmin::attachRemoteLogger(const ::Ice::RemoteLoggerPrx& __p_prx, const ::Ice::LogMessageTypeSeq& __p_messageTypes, const ::Ice::StringSeq& __p_traceCategories, ::Ice::Int __p_messageMax, const ::Ice::Context* __ctx)
+::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)
 {
-    __checkTwowayOnly(__Ice__LoggerAdmin__attachRemoteLogger_name);
-    ::IceInternal::Outgoing __og(this, __Ice__LoggerAdmin__attachRemoteLogger_name, ::Ice::Normal, __ctx);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_RemoteLogger_init_name, del, cookie, sync);
     try
     {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_prx);
-        __os->write(__p_messageTypes);
-        __os->write(__p_traceCategories);
-        __os->write(__p_messageMax);
-        __og.endWriteParams();
-    }
-    catch(const ::Ice::LocalException& __ex)
-    {
-        __og.abort(__ex);
+        result->prepare(iceC_Ice_RemoteLogger_init_name, ::Ice::Normal, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_prefix);
+        ostr->write(iceP_logMessages);
+        result->endWriteParams();
+        result->invoke(iceC_Ice_RemoteLogger_init_name);
     }
-    if(!__og.invoke())
+    catch(const ::Ice::Exception& ex)
     {
-        try
-        {
-            __og.throwUserException();
-        }
-        catch(const ::Ice::RemoteLoggerAlreadyAttachedException&)
-        {
-            throw;
-        }
-        catch(const ::Ice::UserException& __ex)
-        {
-            ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
-            throw __uue;
-        }
+        result->abort(ex);
     }
+    return result;
+}
+
+void
+IceProxy::Ice::RemoteLogger::end_init(const ::Ice::AsyncResultPtr& result)
+{
+    _end(result, iceC_Ice_RemoteLogger_init_name);
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LoggerAdmin::begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& __p_prx, const ::Ice::LogMessageTypeSeq& __p_messageTypes, const ::Ice::StringSeq& __p_traceCategories, ::Ice::Int __p_messageMax, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::RemoteLogger::_iceI_begin_log(const ::Ice::LogMessage& iceP_message, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    __checkAsyncTwowayOnly(__Ice__LoggerAdmin__attachRemoteLogger_name);
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__LoggerAdmin__attachRemoteLogger_name, __del, __cookie);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_RemoteLogger_log_name, del, cookie, sync);
     try
     {
-        __result->prepare(__Ice__LoggerAdmin__attachRemoteLogger_name, ::Ice::Normal, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_prx);
-        __os->write(__p_messageTypes);
-        __os->write(__p_traceCategories);
-        __os->write(__p_messageMax);
-        __result->endWriteParams();
-        __result->invoke();
+        result->prepare(iceC_Ice_RemoteLogger_log_name, ::Ice::Normal, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_message);
+        result->endWriteParams();
+        result->invoke(iceC_Ice_RemoteLogger_log_name);
     }
-    catch(const ::Ice::Exception& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __result->abort(__ex);
+        result->abort(ex);
     }
-    return __result;
+    return result;
 }
 
-#ifdef ICE_CPP11
-
-::Ice::AsyncResultPtr
-IceProxy::Ice::LoggerAdmin::__begin_attachRemoteLogger(const ::Ice::RemoteLoggerPrx& __p_prx, const ::Ice::LogMessageTypeSeq& __p_messageTypes, const ::Ice::StringSeq& __p_traceCategories, ::Ice::Int __p_messageMax, const ::Ice::Context* __ctx, const ::IceInternal::Function<void ()>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+void
+IceProxy::Ice::RemoteLogger::end_log(const ::Ice::AsyncResultPtr& result)
 {
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
-    {
-    public:
-
-        Cpp11CB(const ::std::function<void ()>& responseFunc, const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc, const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
-        {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
-        }
+    _end(result, iceC_Ice_RemoteLogger_log_name);
+}
 
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
-        {
-            ::Ice::LoggerAdminPrx __proxy = ::Ice::LoggerAdminPrx::uncheckedCast(__result->getProxy());
-            try
-            {
-                __proxy->end_attachRemoteLogger(__result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response();
-            }
-        }
-    
-    private:
-        
-        ::std::function<void ()> _response;
-    };
-    return begin_attachRemoteLogger(__p_prx, __p_messageTypes, __p_traceCategories, __p_messageMax, __ctx, new Cpp11CB(__response, __exception, __sent));
+/// \cond INTERNAL
+::IceProxy::Ice::Object*
+IceProxy::Ice::RemoteLogger::_newInstance() const
+{
+    return new RemoteLogger;
 }
-#endif
+/// \endcond
 
-void
-IceProxy::Ice::LoggerAdmin::end_attachRemoteLogger(const ::Ice::AsyncResultPtr& __result)
+const ::std::string&
+IceProxy::Ice::RemoteLogger::ice_staticId()
 {
-    ::Ice::AsyncResult::__check(__result, this, __Ice__LoggerAdmin__attachRemoteLogger_name);
-    if(!__result->__wait())
-    {
-        try
-        {
-            __result->__throwUserException();
-        }
-        catch(const ::Ice::RemoteLoggerAlreadyAttachedException&)
-        {
-            throw;
-        }
-        catch(const ::Ice::UserException& __ex)
-        {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
-        }
-    }
-    __result->__readEmptyParams();
+    return ::Ice::RemoteLogger::ice_staticId();
 }
 
-bool
-IceProxy::Ice::LoggerAdmin::detachRemoteLogger(const ::Ice::RemoteLoggerPrx& __p_prx, const ::Ice::Context* __ctx)
+/// \cond INTERNAL
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(LoggerAdmin* p) { return p; }
+
+void
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< LoggerAdmin>& v)
 {
-    __checkTwowayOnly(__Ice__LoggerAdmin__detachRemoteLogger_name);
-    ::IceInternal::Outgoing __og(this, __Ice__LoggerAdmin__detachRemoteLogger_name, ::Ice::Normal, __ctx);
-    try
-    {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_prx);
-        __og.endWriteParams();
-    }
-    catch(const ::Ice::LocalException& __ex)
+    ::Ice::ObjectPrx proxy;
+    istr->read(proxy);
+    if(!proxy)
     {
-        __og.abort(__ex);
+        v = 0;
     }
-    if(!__og.invoke())
+    else
     {
-        try
-        {
-            __og.throwUserException();
-        }
-        catch(const ::Ice::UserException& __ex)
-        {
-            ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
-            throw __uue;
-        }
+        v = new LoggerAdmin;
+        v->_copyFrom(proxy);
     }
-    bool __ret;
-    ::IceInternal::BasicStream* __is = __og.startReadParams();
-    __is->read(__ret);
-    __og.endReadParams();
-    return __ret;
 }
+/// \endcond
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LoggerAdmin::begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& __p_prx, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+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)
 {
-    __checkAsyncTwowayOnly(__Ice__LoggerAdmin__detachRemoteLogger_name);
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__LoggerAdmin__detachRemoteLogger_name, __del, __cookie);
+    _checkTwowayOnly(iceC_Ice_LoggerAdmin_attachRemoteLogger_name, sync);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_LoggerAdmin_attachRemoteLogger_name, del, cookie, sync);
     try
     {
-        __result->prepare(__Ice__LoggerAdmin__detachRemoteLogger_name, ::Ice::Normal, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_prx);
-        __result->endWriteParams();
-        __result->invoke();
+        result->prepare(iceC_Ice_LoggerAdmin_attachRemoteLogger_name, ::Ice::Normal, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_prx);
+        ostr->write(iceP_messageTypes);
+        ostr->write(iceP_traceCategories);
+        ostr->write(iceP_messageMax);
+        result->endWriteParams();
+        result->invoke(iceC_Ice_LoggerAdmin_attachRemoteLogger_name);
     }
-    catch(const ::Ice::Exception& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __result->abort(__ex);
+        result->abort(ex);
     }
-    return __result;
+    return result;
 }
 
-#ifdef ICE_CPP11
-
-::Ice::AsyncResultPtr
-IceProxy::Ice::LoggerAdmin::__begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& __p_prx, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (bool)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+void
+IceProxy::Ice::LoggerAdmin::end_attachRemoteLogger(const ::Ice::AsyncResultPtr& result)
 {
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_LoggerAdmin_attachRemoteLogger_name);
+    if(!result->_waitForResponse())
     {
-    public:
-
-        Cpp11CB(const ::std::function<void (bool)>& responseFunc, const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc, const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
-        {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
-        }
-
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+        try
         {
-            ::Ice::LoggerAdminPrx __proxy = ::Ice::LoggerAdminPrx::uncheckedCast(__result->getProxy());
-            bool __ret;
-            try
-            {
-                __ret = __proxy->end_detachRemoteLogger(__result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response(__ret);
-            }
+            result->_throwUserException();
         }
-    
-    private:
-        
-        ::std::function<void (bool)> _response;
-    };
-    return begin_detachRemoteLogger(__p_prx, __ctx, new Cpp11CB(__response, __exception, __sent));
-}
-#endif
-
-bool
-IceProxy::Ice::LoggerAdmin::end_detachRemoteLogger(const ::Ice::AsyncResultPtr& __result)
-{
-    ::Ice::AsyncResult::__check(__result, this, __Ice__LoggerAdmin__detachRemoteLogger_name);
-    bool __ret;
-    if(!__result->__wait())
-    {
-        try
+        catch(const ::Ice::RemoteLoggerAlreadyAttachedException&)
         {
-            __result->__throwUserException();
+            throw;
         }
-        catch(const ::Ice::UserException& __ex)
+        catch(const ::Ice::UserException& ex)
         {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+            throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
         }
     }
-    ::IceInternal::BasicStream* __is = __result->__startReadParams();
-    __is->read(__ret);
-    __result->__endReadParams();
-    return __ret;
+    result->_readEmptyParams();
 }
 
-::Ice::LogMessageSeq
-IceProxy::Ice::LoggerAdmin::getLog(const ::Ice::LogMessageTypeSeq& __p_messageTypes, const ::Ice::StringSeq& __p_traceCategories, ::Ice::Int __p_messageMax, ::std::string& __p_prefix, const ::Ice::Context* __ctx)
+::Ice::AsyncResultPtr
+IceProxy::Ice::LoggerAdmin::_iceI_begin_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& iceP_prx, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
-    __checkTwowayOnly(__Ice__LoggerAdmin__getLog_name);
-    ::IceInternal::Outgoing __og(this, __Ice__LoggerAdmin__getLog_name, ::Ice::Normal, __ctx);
+    _checkTwowayOnly(iceC_Ice_LoggerAdmin_detachRemoteLogger_name, sync);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_LoggerAdmin_detachRemoteLogger_name, del, cookie, sync);
     try
     {
-        ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_messageTypes);
-        __os->write(__p_traceCategories);
-        __os->write(__p_messageMax);
-        __og.endWriteParams();
+        result->prepare(iceC_Ice_LoggerAdmin_detachRemoteLogger_name, ::Ice::Normal, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_prx);
+        result->endWriteParams();
+        result->invoke(iceC_Ice_LoggerAdmin_detachRemoteLogger_name);
     }
-    catch(const ::Ice::LocalException& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __og.abort(__ex);
+        result->abort(ex);
     }
-    if(!__og.invoke())
+    return result;
+}
+
+bool
+IceProxy::Ice::LoggerAdmin::end_detachRemoteLogger(const ::Ice::AsyncResultPtr& result)
+{
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_LoggerAdmin_detachRemoteLogger_name);
+    bool ret;
+    if(!result->_waitForResponse())
     {
         try
         {
-            __og.throwUserException();
+            result->_throwUserException();
         }
-        catch(const ::Ice::UserException& __ex)
+        catch(const ::Ice::UserException& ex)
         {
-            ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
-            throw __uue;
+            throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
         }
     }
-    ::Ice::LogMessageSeq __ret;
-    ::IceInternal::BasicStream* __is = __og.startReadParams();
-    __is->read(__p_prefix);
-    __is->read(__ret);
-    __og.endReadParams();
-    return __ret;
+    ::Ice::InputStream* istr = result->_startReadParams();
+    istr->read(ret);
+    result->_endReadParams();
+    return ret;
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::LoggerAdmin::begin_getLog(const ::Ice::LogMessageTypeSeq& __p_messageTypes, const ::Ice::StringSeq& __p_traceCategories, ::Ice::Int __p_messageMax, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::LoggerAdmin::_iceI_begin_getLog(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)
 {
-    __checkAsyncTwowayOnly(__Ice__LoggerAdmin__getLog_name);
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__LoggerAdmin__getLog_name, __del, __cookie);
+    _checkTwowayOnly(iceC_Ice_LoggerAdmin_getLog_name, sync);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_LoggerAdmin_getLog_name, del, cookie, sync);
     try
     {
-        __result->prepare(__Ice__LoggerAdmin__getLog_name, ::Ice::Normal, __ctx);
-        ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(__p_messageTypes);
-        __os->write(__p_traceCategories);
-        __os->write(__p_messageMax);
-        __result->endWriteParams();
-        __result->invoke();
+        result->prepare(iceC_Ice_LoggerAdmin_getLog_name, ::Ice::Normal, context);
+        ::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
+        ostr->write(iceP_messageTypes);
+        ostr->write(iceP_traceCategories);
+        ostr->write(iceP_messageMax);
+        result->endWriteParams();
+        result->invoke(iceC_Ice_LoggerAdmin_getLog_name);
     }
-    catch(const ::Ice::Exception& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __result->abort(__ex);
+        result->abort(ex);
     }
-    return __result;
+    return result;
 }
 
-#ifdef ICE_CPP11
-
-::Ice::AsyncResultPtr
-IceProxy::Ice::LoggerAdmin::__begin_getLog(const ::Ice::LogMessageTypeSeq& __p_messageTypes, const ::Ice::StringSeq& __p_traceCategories, ::Ice::Int __p_messageMax, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::LogMessageSeq&, const ::std::string&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+::Ice::LogMessageSeq
+IceProxy::Ice::LoggerAdmin::end_getLog(::std::string& iceP_prefix, const ::Ice::AsyncResultPtr& result)
 {
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_LoggerAdmin_getLog_name);
+    ::Ice::LogMessageSeq ret;
+    if(!result->_waitForResponse())
     {
-    public:
-
-        Cpp11CB(const ::std::function<void (const ::Ice::LogMessageSeq&, const ::std::string&)>& responseFunc, const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc, const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
+        try
         {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
+            result->_throwUserException();
         }
-
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+        catch(const ::Ice::UserException& ex)
         {
-            ::Ice::LoggerAdminPrx __proxy = ::Ice::LoggerAdminPrx::uncheckedCast(__result->getProxy());
-            ::std::string __p_prefix;
-            ::Ice::LogMessageSeq __ret;
-            try
-            {
-                __ret = __proxy->end_getLog(__p_prefix, __result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response(__ret, __p_prefix);
-            }
+            throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
         }
-    
-    private:
-        
-        ::std::function<void (const ::Ice::LogMessageSeq&, const ::std::string&)> _response;
-    };
-    return begin_getLog(__p_messageTypes, __p_traceCategories, __p_messageMax, __ctx, new Cpp11CB(__response, __exception, __sent));
+    }
+    ::Ice::InputStream* istr = result->_startReadParams();
+    istr->read(iceP_prefix);
+    istr->read(ret);
+    result->_endReadParams();
+    return ret;
 }
-#endif
 
-::Ice::LogMessageSeq
-IceProxy::Ice::LoggerAdmin::end_getLog(::std::string& __p_prefix, const ::Ice::AsyncResultPtr& __result)
+void IceProxy::Ice::LoggerAdmin::_iceI_end_getLog(::std::string& iceP_prefix, ::Ice::LogMessageSeq& ret, const ::Ice::AsyncResultPtr& result)
 {
-    ::Ice::AsyncResult::__check(__result, this, __Ice__LoggerAdmin__getLog_name);
-    ::Ice::LogMessageSeq __ret;
-    if(!__result->__wait())
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_LoggerAdmin_getLog_name);
+    if(!result->_waitForResponse())
     {
         try
         {
-            __result->__throwUserException();
+            result->_throwUserException();
         }
-        catch(const ::Ice::UserException& __ex)
+        catch(const ::Ice::UserException& ex)
         {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+            throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
         }
     }
-    ::IceInternal::BasicStream* __is = __result->__startReadParams();
-    __is->read(__p_prefix);
-    __is->read(__ret);
-    __result->__endReadParams();
-    return __ret;
+    ::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()
 {
     return ::Ice::LoggerAdmin::ice_staticId();
 }
 
-::IceProxy::Ice::Object*
-IceProxy::Ice::LoggerAdmin::__newInstance() const
+Ice::RemoteLogger::~RemoteLogger()
 {
-    return new LoggerAdmin;
 }
 
-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
 {
-const ::std::string __Ice__RemoteLogger_ids[2] =
+const ::std::string iceC_Ice_RemoteLogger_ids[2] =
 {
     "::Ice::Object",
     "::Ice::RemoteLogger"
@@ -640,21 +806,21 @@ const ::std::string __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(__Ice__RemoteLogger_ids, __Ice__RemoteLogger_ids + 2, _s);
+    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>(&__Ice__RemoteLogger_ids[0], &__Ice__RemoteLogger_ids[2]);
+    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__RemoteLogger_ids[1];
+    return ice_staticId();
 }
 
 const ::std::string&
@@ -664,41 +830,45 @@ Ice::RemoteLogger::ice_staticId()
     static const ::std::string typeId = "::Ice::RemoteLogger";
     return typeId;
 #else
-    return __Ice__RemoteLogger_ids[1];
+    return iceC_Ice_RemoteLogger_ids[1];
 #endif
 }
 
-::Ice::DispatchStatus
-Ice::RemoteLogger::___init(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
+/// \cond INTERNAL
+bool
+Ice::RemoteLogger::_iceD_init(::IceInternal::Incoming& inS, const Current& current)
 {
-    __checkMode(::Ice::Normal, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::std::string __p_prefix;
-    ::Ice::LogMessageSeq __p_logMessages;
-    __is->read(__p_prefix);
-    __is->read(__p_logMessages);
-    __inS.endReadParams();
-    init(__p_prefix, __p_logMessages, __current);
-    __inS.__writeEmptyParams();
-    return ::Ice::DispatchOK;
+    _iceCheckMode(::Ice::Normal, current.mode);
+    InputStream* istr = inS.startReadParams();
+    ::std::string iceP_prefix;
+    LogMessageSeq iceP_logMessages;
+    istr->read(iceP_prefix);
+    istr->read(iceP_logMessages);
+    inS.endReadParams();
+    this->init(iceP_prefix, iceP_logMessages, current);
+    inS.writeEmptyParams();
+    return true;
 }
+/// \endcond
 
-::Ice::DispatchStatus
-Ice::RemoteLogger::___log(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
+/// \cond INTERNAL
+bool
+Ice::RemoteLogger::_iceD_log(::IceInternal::Incoming& inS, const Current& current)
 {
-    __checkMode(::Ice::Normal, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::LogMessage __p_message;
-    __is->read(__p_message);
-    __inS.endReadParams();
-    log(__p_message, __current);
-    __inS.__writeEmptyParams();
-    return ::Ice::DispatchOK;
+    _iceCheckMode(::Ice::Normal, current.mode);
+    InputStream* istr = inS.startReadParams();
+    LogMessage iceP_message;
+    istr->read(iceP_message);
+    inS.endReadParams();
+    this->log(iceP_message, current);
+    inS.writeEmptyParams();
+    return true;
 }
+/// \endcond
 
 namespace
 {
-const ::std::string __Ice__RemoteLogger_all[] =
+const ::std::string iceC_Ice_RemoteLogger_all[] =
 {
     "ice_id",
     "ice_ids",
@@ -710,76 +880,93 @@ const ::std::string __Ice__RemoteLogger_all[] =
 
 }
 
-::Ice::DispatchStatus
-Ice::RemoteLogger::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+/// \cond INTERNAL
+bool
+Ice::RemoteLogger::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
-    ::std::pair< const ::std::string*, const ::std::string*> r = ::std::equal_range(__Ice__RemoteLogger_all, __Ice__RemoteLogger_all + 6, current.operation);
+    ::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 - __Ice__RemoteLogger_all)
+    switch(r.first - iceC_Ice_RemoteLogger_all)
     {
         case 0:
         {
-            return ___ice_id(in, current);
+            return _iceD_ice_id(in, current);
         }
         case 1:
         {
-            return ___ice_ids(in, current);
+            return _iceD_ice_ids(in, current);
         }
         case 2:
         {
-            return ___ice_isA(in, current);
+            return _iceD_ice_isA(in, current);
         }
         case 3:
         {
-            return ___ice_ping(in, current);
+            return _iceD_ice_ping(in, current);
         }
         case 4:
         {
-            return ___init(in, current);
+            return _iceD_init(in, current);
         }
         case 5:
         {
-            return ___log(in, current);
+            return _iceD_log(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
-
-    assert(false);
-    throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
 }
+/// \endcond
 
+/// \cond STREAM
 void
-Ice::RemoteLogger::__writeImpl(::IceInternal::BasicStream* __os) const
+Ice::RemoteLogger::_iceWriteImpl(OutputStream* ostr) const
 {
-    __os->startWriteSlice(ice_staticId(), -1, true);
-    __os->endWriteSlice();
+    ostr->startSlice(ice_staticId(), -1, true);
+    StreamWriter< RemoteLogger, OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-Ice::RemoteLogger::__readImpl(::IceInternal::BasicStream* __is)
+Ice::RemoteLogger::_iceReadImpl(InputStream* istr)
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    istr->startSlice();
+    StreamReader< RemoteLogger, InputStream>::read(istr, *this);
+    istr->endSlice();
 }
+/// \endcond
 
-void ICE_API 
-Ice::__patch(RemoteLoggerPtr& handle, const ::Ice::ObjectPtr& v)
+/// \cond INTERNAL
+void
+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_API ::Ice::Object* Ice::upCast(::Ice::LoggerAdmin* p) { return p; }
+Ice::LoggerAdmin::~LoggerAdmin()
+{
+}
+
+/// \cond INTERNAL
+ICE_API ::Ice::Object* Ice::upCast(LoggerAdmin* p) { return p; }
+
+/// \endcond
 
 namespace
 {
-const ::std::string __Ice__LoggerAdmin_ids[2] =
+const ::std::string iceC_Ice_LoggerAdmin_ids[2] =
 {
     "::Ice::LoggerAdmin",
     "::Ice::Object"
@@ -788,21 +975,21 @@ const ::std::string __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(__Ice__LoggerAdmin_ids, __Ice__LoggerAdmin_ids + 2, _s);
+    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>(&__Ice__LoggerAdmin_ids[0], &__Ice__LoggerAdmin_ids[2]);
+    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__LoggerAdmin_ids[0];
+    return ice_staticId();
 }
 
 const ::std::string&
@@ -812,76 +999,74 @@ Ice::LoggerAdmin::ice_staticId()
     static const ::std::string typeId = "::Ice::LoggerAdmin";
     return typeId;
 #else
-    return __Ice__LoggerAdmin_ids[0];
+    return iceC_Ice_LoggerAdmin_ids[0];
 #endif
 }
 
-::Ice::DispatchStatus
-Ice::LoggerAdmin::___attachRemoteLogger(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
-    __checkMode(::Ice::Normal, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::RemoteLoggerPrx __p_prx;
-    ::Ice::LogMessageTypeSeq __p_messageTypes;
-    ::Ice::StringSeq __p_traceCategories;
-    ::Ice::Int __p_messageMax;
-    __is->read(__p_prx);
-    __is->read(__p_messageTypes);
-    __is->read(__p_traceCategories);
-    __is->read(__p_messageMax);
-    __inS.endReadParams();
-    try
-    {
-        attachRemoteLogger(__p_prx, __p_messageTypes, __p_traceCategories, __p_messageMax, __current);
-        __inS.__writeEmptyParams();
-        return ::Ice::DispatchOK;
-    }
-    catch(const ::Ice::RemoteLoggerAlreadyAttachedException& __ex)
-    {
-        __inS.__writeUserException(__ex, ::Ice::DefaultFormat);
-    }
-    return ::Ice::DispatchUserException;
-}
-
-::Ice::DispatchStatus
-Ice::LoggerAdmin::___detachRemoteLogger(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
-    __checkMode(::Ice::Normal, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::RemoteLoggerPrx __p_prx;
-    __is->read(__p_prx);
-    __inS.endReadParams();
-    bool __ret = detachRemoteLogger(__p_prx, __current);
-    ::IceInternal::BasicStream* __os = __inS.__startWriteParams(::Ice::DefaultFormat);
-    __os->write(__ret);
-    __inS.__endWriteParams(true);
-    return ::Ice::DispatchOK;
-}
-
-::Ice::DispatchStatus
-Ice::LoggerAdmin::___getLog(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
-{
-    __checkMode(::Ice::Normal, __current.mode);
-    ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::LogMessageTypeSeq __p_messageTypes;
-    ::Ice::StringSeq __p_traceCategories;
-    ::Ice::Int __p_messageMax;
-    __is->read(__p_messageTypes);
-    __is->read(__p_traceCategories);
-    __is->read(__p_messageMax);
-    __inS.endReadParams();
-    ::std::string __p_prefix;
-    ::Ice::LogMessageSeq __ret = getLog(__p_messageTypes, __p_traceCategories, __p_messageMax, __p_prefix, __current);
-    ::IceInternal::BasicStream* __os = __inS.__startWriteParams(::Ice::DefaultFormat);
-    __os->write(__p_prefix);
-    __os->write(__ret);
-    __inS.__endWriteParams(true);
-    return ::Ice::DispatchOK;
+/// \cond INTERNAL
+bool
+Ice::LoggerAdmin::_iceD_attachRemoteLogger(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::Normal, current.mode);
+    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);
+    istr->read(iceP_messageMax);
+    inS.endReadParams();
+    this->attachRemoteLogger(iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax, current);
+    inS.writeEmptyParams();
+    return true;
+}
+/// \endcond
+
+/// \cond INTERNAL
+bool
+Ice::LoggerAdmin::_iceD_detachRemoteLogger(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::Normal, current.mode);
+    InputStream* istr = inS.startReadParams();
+    RemoteLoggerPrx iceP_prx;
+    istr->read(iceP_prx);
+    inS.endReadParams();
+    bool ret = this->detachRemoteLogger(iceP_prx, current);
+    OutputStream* ostr = inS.startWriteParams();
+    ostr->write(ret);
+    inS.endWriteParams();
+    return true;
+}
+/// \endcond
+
+/// \cond INTERNAL
+bool
+Ice::LoggerAdmin::_iceD_getLog(::IceInternal::Incoming& inS, const Current& current)
+{
+    _iceCheckMode(::Ice::Normal, current.mode);
+    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;
+    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
 {
-const ::std::string __Ice__LoggerAdmin_all[] =
+const ::std::string iceC_Ice_LoggerAdmin_all[] =
 {
     "attachRemoteLogger",
     "detachRemoteLogger",
@@ -894,71 +1079,87 @@ const ::std::string __Ice__LoggerAdmin_all[] =
 
 }
 
-::Ice::DispatchStatus
-Ice::LoggerAdmin::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+/// \cond INTERNAL
+bool
+Ice::LoggerAdmin::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
-    ::std::pair< const ::std::string*, const ::std::string*> r = ::std::equal_range(__Ice__LoggerAdmin_all, __Ice__LoggerAdmin_all + 7, current.operation);
+    ::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 - __Ice__LoggerAdmin_all)
+    switch(r.first - iceC_Ice_LoggerAdmin_all)
     {
         case 0:
         {
-            return ___attachRemoteLogger(in, current);
+            return _iceD_attachRemoteLogger(in, current);
         }
         case 1:
         {
-            return ___detachRemoteLogger(in, current);
+            return _iceD_detachRemoteLogger(in, current);
         }
         case 2:
         {
-            return ___getLog(in, current);
+            return _iceD_getLog(in, current);
         }
         case 3:
         {
-            return ___ice_id(in, current);
+            return _iceD_ice_id(in, current);
         }
         case 4:
         {
-            return ___ice_ids(in, current);
+            return _iceD_ice_ids(in, current);
         }
         case 5:
         {
-            return ___ice_isA(in, current);
+            return _iceD_ice_isA(in, current);
         }
         case 6:
         {
-            return ___ice_ping(in, current);
+            return _iceD_ice_ping(in, current);
+        }
+        default:
+        {
+            assert(false);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
-
-    assert(false);
-    throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
 }
+/// \endcond
 
+/// \cond STREAM
 void
-Ice::LoggerAdmin::__writeImpl(::IceInternal::BasicStream* __os) const
+Ice::LoggerAdmin::_iceWriteImpl(OutputStream* ostr) const
 {
-    __os->startWriteSlice(ice_staticId(), -1, true);
-    __os->endWriteSlice();
+    ostr->startSlice(ice_staticId(), -1, true);
+    StreamWriter< LoggerAdmin, OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-Ice::LoggerAdmin::__readImpl(::IceInternal::BasicStream* __is)
+Ice::LoggerAdmin::_iceReadImpl(InputStream* istr)
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    istr->startSlice();
+    StreamReader< LoggerAdmin, InputStream>::read(istr, *this);
+    istr->endSlice();
 }
+/// \endcond
 
-void ICE_API 
-Ice::__patch(LoggerAdminPtr& handle, const ::Ice::ObjectPtr& v)
+/// \cond INTERNAL
+void
+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
+{
+}
+
+#endif