zeroc-ice 3.6.5 → 3.7.0

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -27,23 +27,31 @@
 #include <Ice/Protocol.h>
 #include <Ice/Properties.h>
 
-namespace IceInternal
+namespace Ice
 {
 
-class BasicStream;
+class OutputStream;
+
+}
+
+namespace IceInternal
+{
 
 class Reference : public IceUtil::Shared
 {
 public:
 
-    class GetConnectionCallback : virtual public IceUtil::Shared
+    class GetConnectionCallback
+#ifndef ICE_CPP11_MAPPING
+        : public virtual IceUtil::Shared
+#endif
     {
     public:
 
         virtual void setConnection(const Ice::ConnectionIPtr&, bool) = 0;
         virtual void setException(const Ice::LocalException&) = 0;
     };
-    typedef IceUtil::Handle<GetConnectionCallback> GetConnectionCallbackPtr;
+    ICE_DEFINE_PTR(GetConnectionCallbackPtr, GetConnectionCallback);
 
     enum Mode
     {
@@ -67,7 +75,6 @@ public:
 
     Ice::CommunicatorPtr getCommunicator() const;
 
-
     virtual std::vector<EndpointIPtr> getEndpoints() const = 0;
     virtual std::string getAdapterId() const = 0;
     virtual LocatorInfoPtr getLocatorInfo() const { return 0; }
@@ -95,8 +102,8 @@ public:
 
     virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const = 0;
     virtual ReferencePtr changeAdapterId(const std::string&) const = 0;
-    virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const = 0;
-    virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const = 0;
+    virtual ReferencePtr changeLocator(const Ice::LocatorPrxPtr&) const = 0;
+    virtual ReferencePtr changeRouter(const Ice::RouterPrxPtr&) const = 0;
     virtual ReferencePtr changeCollocationOptimized(bool) const = 0;
     virtual ReferencePtr changeLocatorCacheTimeout(int) const = 0;
     virtual ReferencePtr changeCacheConnection(bool) const = 0;
@@ -108,6 +115,8 @@ public:
 
     int hash() const; // Conceptually const.
 
+    bool getCompressOverride(bool&) const;
+
     //
     // Utility methods.
     //
@@ -117,7 +126,7 @@ public:
     //
     // Marshal the reference.
     //
-    virtual void streamWrite(BasicStream*) const;
+    virtual void streamWrite(Ice::OutputStream*) const;
 
     //
     // Convert the reference to its string form.
@@ -132,11 +141,10 @@ public:
     //
     // Get a suitable connection for this reference.
     //
-    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const = 0;
+    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const = 0;
     virtual BatchRequestQueuePtr getBatchRequestQueue() const = 0;
 
     virtual bool operator==(const Reference&) const;
-    virtual bool operator!=(const Reference&) const;
     virtual bool operator<(const Reference&) const;
 
     virtual ReferencePtr clone() const = 0;
@@ -190,8 +198,8 @@ public:
 
     virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const;
     virtual ReferencePtr changeAdapterId(const std::string&) const;
-    virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const;
-    virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const;
+    virtual ReferencePtr changeLocator(const Ice::LocatorPrxPtr&) const;
+    virtual ReferencePtr changeRouter(const Ice::RouterPrxPtr&) const;
     virtual ReferencePtr changeCollocationOptimized(bool) const;
     virtual ReferencePtr changeCacheConnection(bool) const;
     virtual ReferencePtr changePreferSecure(bool) const;
@@ -204,15 +212,13 @@ public:
     virtual bool isIndirect() const;
     virtual bool isWellKnown() const;
 
-    virtual void streamWrite(BasicStream*) const;
-    virtual std::string toString() const;
+    virtual void streamWrite(Ice::OutputStream*) const;
     virtual Ice::PropertyDict toProperty(const std::string&) const;
 
-    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const;
+    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const;
     virtual BatchRequestQueuePtr getBatchRequestQueue() const;
 
     virtual bool operator==(const Reference&) const;
-    virtual bool operator!=(const Reference&) const;
     virtual bool operator<(const Reference&) const;
 
     virtual ReferencePtr clone() const;
@@ -248,8 +254,8 @@ public:
     virtual ReferencePtr changeCompress(bool) const;
     virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const;
     virtual ReferencePtr changeAdapterId(const std::string&) const;
-    virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const;
-    virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const;
+    virtual ReferencePtr changeLocator(const Ice::LocatorPrxPtr&) const;
+    virtual ReferencePtr changeRouter(const Ice::RouterPrxPtr&) const;
     virtual ReferencePtr changeCollocationOptimized(bool) const;
     virtual ReferencePtr changeCacheConnection(bool) const;
     virtual ReferencePtr changePreferSecure(bool) const;
@@ -262,17 +268,16 @@ public:
     virtual bool isIndirect() const;
     virtual bool isWellKnown() const;
 
-    virtual void streamWrite(BasicStream*) const;
+    virtual void streamWrite(Ice::OutputStream*) const;
     virtual std::string toString() const;
     virtual Ice::PropertyDict toProperty(const std::string&) const;
 
     virtual bool operator==(const Reference&) const;
-    virtual bool operator!=(const Reference&) const;
     virtual bool operator<(const Reference&) const;
 
     virtual ReferencePtr clone() const;
 
-    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const;
+    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const;
     virtual BatchRequestQueuePtr getBatchRequestQueue() const;
 
     void getConnection(const GetConnectionCallbackPtr&) const;

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -20,11 +20,11 @@
 #include <Ice/LocatorInfo.h>
 #include <Ice/Locator.h>
 #include <Ice/LoggerUtil.h>
-#include <Ice/BasicStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/Properties.h>
 #include <Ice/DefaultsAndOverrides.h>
 #include <Ice/PropertyNames.h>
-#include <IceUtil/StringUtil.h>
+#include <Ice/StringUtil.h>
 
 using namespace std;
 using namespace Ice;
@@ -155,7 +155,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
     //
     // Parsing the identity may raise IdentityParseException.
     //
-    Identity ident = _instance->stringToIdentity(idstr);
+    Identity ident = Ice::stringToIdentity(idstr);
+
     if(ident.name.empty())
     {
         //
@@ -279,7 +280,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
 
                 try
                 {
-                    facet = IceUtilInternal::unescapeString(argument, 0, argument.size());
+                    facet = unescapeString(argument, 0, argument.size(), "");
                 }
                 catch(const IceUtil::IllegalArgumentException& e)
                 {
@@ -288,7 +289,6 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
                     throw ex;
                 }
 
-                facet = UTF8ToNative(facet, _instance->getStringConverter());
                 break;
             }
 
@@ -479,7 +479,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
 
                 string es = s.substr(beg, end - beg);
                 EndpointIPtr endp = _instance->endpointFactoryManager()->create(es, false);
-                if(endp != 0)
+                if(endp != ICE_NULLPTR)
                 {
                     endpoints.push_back(endp);
                 }
@@ -554,7 +554,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
 
             try
             {
-                adapter = IceUtilInternal::unescapeString(adapterstr, 0, adapterstr.size());
+                adapter = unescapeString(adapterstr, 0, adapterstr.size(), "");
             }
             catch(const IceUtil::IllegalArgumentException& e)
             {
@@ -569,8 +569,6 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
                 throw ex;
             }
 
-            adapter = UTF8ToNative(adapter, _instance->getStringConverter());
-
             return create(ident, facet, mode, secure, protocol, encoding, endpoints, adapter, propertyPrefix);
             break;
         }
@@ -586,7 +584,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
 }
 
 ReferencePtr
-IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
+IceInternal::ReferenceFactory::create(const Identity& ident, InputStream* s)
 {
     //
     // Don't read the identity here. Operations calling this
@@ -626,7 +624,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
 
     Ice::ProtocolVersion protocol;
     Ice::EncodingVersion encoding;
-    if(s->getReadEncoding() != Ice::Encoding_1_0)
+    if(s->getEncoding() != Ice::Encoding_1_0)
     {
         s->read(protocol);
         s->read(encoding);
@@ -660,7 +658,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
 }
 
 ReferenceFactoryPtr
-IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrx& defaultRouter)
+IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrxPtr& defaultRouter)
 {
     if(defaultRouter == _defaultRouter)
     {
@@ -673,14 +671,14 @@ IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrx& defaultRouter)
     return factory;
 }
 
-RouterPrx
+RouterPrxPtr
 IceInternal::ReferenceFactory::getDefaultRouter() const
 {
     return _defaultRouter;
 }
 
 ReferenceFactoryPtr
-IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrx& defaultLocator)
+IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrxPtr& defaultLocator)
 {
     if(defaultLocator == _defaultLocator)
     {
@@ -693,7 +691,7 @@ IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrx& defaultLocato
     return factory;
 }
 
-LocatorPrx
+LocatorPrxPtr
 IceInternal::ReferenceFactory::getDefaultLocator() const
 {
     return _defaultLocator;
@@ -815,7 +813,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
         string property;
 
         property = propertyPrefix + ".Locator";
-        LocatorPrx locator = LocatorPrx::uncheckedCast(_communicator->propertyToProxy(property));
+        LocatorPrxPtr locator = ICE_UNCHECKED_CAST(LocatorPrx, _communicator->propertyToProxy(property));
         if(locator)
         {
             if(locator->ice_getEncodingVersion() != encoding)
@@ -829,7 +827,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
         }
 
         property = propertyPrefix + ".Router";
-        RouterPrx router = RouterPrx::uncheckedCast(_communicator->propertyToProxy(property));
+        RouterPrxPtr router = ICE_UNCHECKED_CAST(RouterPrx, _communicator->propertyToProxy(property));
         if(router)
         {
             if(propertyPrefix.size() > 7 && propertyPrefix.substr(propertyPrefix.size() - 7, 7) == ".Router")
@@ -859,11 +857,11 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
             string type = properties->getProperty(property);
             if(type == "Random")
             {
-                endpointSelection = Random;
+                endpointSelection = ICE_ENUM(EndpointSelectionType, Random);
             }
             else if(type == "Ordered")
             {
-                endpointSelection = Ordered;
+                endpointSelection = ICE_ENUM(EndpointSelectionType, Ordered);
             }
             else
             {
@@ -934,4 +932,3 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
                                  invocationTimeout,
                                  ctx);
 }
-

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -31,14 +31,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 +52,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 +66,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,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -14,15 +14,29 @@
 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 builds.
+    //
+#if !defined(ICE_STATIC_LIBS) || defined(ICE_GEM) || defined(ICE_PYPI)
+    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,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.0
 //
 // <auto-generated>
 //
@@ -24,595 +24,705 @@
 #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
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 5
+#   if ICE_INT_VERSION % 100 < 0
 #       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 __Ice__LoggerAdmin__detachRemoteLogger_name = "detachRemoteLogger";
-
-const ::std::string __Ice__LoggerAdmin__getLog_name = "getLog";
+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 ::IceInternal::DefaultUserExceptionFactoryInit<::Ice::RemoteLoggerAlreadyAttachedException> iceC_Ice_RemoteLoggerAlreadyAttachedException_init("::Ice::RemoteLoggerAlreadyAttachedException");
 
-namespace
+const ::std::string iceC_Ice_LoggerAdmin_ids[2] =
 {
-
-const ::IceInternal::DefaultUserExceptionFactoryInit< ::Ice::RemoteLoggerAlreadyAttachedException> __Ice__RemoteLoggerAlreadyAttachedException_init("::Ice::RemoteLoggerAlreadyAttachedException");
+    "::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";
 
 }
 
-Ice::RemoteLoggerAlreadyAttachedException::~RemoteLoggerAlreadyAttachedException() throw()
+Ice::RemoteLoggerAlreadyAttachedException::~RemoteLoggerAlreadyAttachedException()
 {
 }
 
-::std::string
-Ice::RemoteLoggerAlreadyAttachedException::ice_name() const
+const ::std::string&
+Ice::RemoteLoggerAlreadyAttachedException::ice_staticId()
 {
-    return "Ice::RemoteLoggerAlreadyAttachedException";
+    static const ::std::string typeId = "::Ice::RemoteLoggerAlreadyAttachedException";
+    return typeId;
 }
 
-Ice::RemoteLoggerAlreadyAttachedException*
-Ice::RemoteLoggerAlreadyAttachedException::ice_clone() const
+bool
+Ice::RemoteLogger::ice_isA(::std::string s, const ::Ice::Current&) const
 {
-    return new RemoteLoggerAlreadyAttachedException(*this);
+    return ::std::binary_search(iceC_Ice_RemoteLogger_ids, iceC_Ice_RemoteLogger_ids + 2, s);
 }
 
-void
-Ice::RemoteLoggerAlreadyAttachedException::ice_throw() const
+::std::vector<::std::string>
+Ice::RemoteLogger::ice_ids(const ::Ice::Current&) const
 {
-    throw *this;
+    return ::std::vector<::std::string>(&iceC_Ice_RemoteLogger_ids[0], &iceC_Ice_RemoteLogger_ids[2]);
 }
 
-void
-Ice::RemoteLoggerAlreadyAttachedException::__writeImpl(::IceInternal::BasicStream* __os) const
+::std::string
+Ice::RemoteLogger::ice_id(const ::Ice::Current&) const
 {
-    __os->startWriteSlice("::Ice::RemoteLoggerAlreadyAttachedException", -1, true);
-    __os->endWriteSlice();
+    return ice_staticId();
 }
 
-void
-Ice::RemoteLoggerAlreadyAttachedException::__readImpl(::IceInternal::BasicStream* __is)
+const ::std::string&
+Ice::RemoteLogger::ice_staticId()
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    static const ::std::string typeId = "::Ice::RemoteLogger";
+    return typeId;
 }
 
-namespace Ice
+bool
+Ice::RemoteLogger::_iceD_init(::IceInternal::Incoming& inS, const ::Ice::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();
+    ::std::string iceP_prefix;
+    ::Ice::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;
 }
-#ifdef __SUNPRO_CC
-class ICE_API IceProxy::Ice::RemoteLogger;
-#endif
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::RemoteLogger* p) { return p; }
 
-void
-::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::RemoteLogger>& v)
+bool
+Ice::RemoteLogger::_iceD_log(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
-    ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
-    if(!proxy)
-    {
-        v = 0;
-    }
-    else
-    {
-        v = new ::IceProxy::Ice::RemoteLogger;
-        v->__copyFrom(proxy);
-    }
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    auto istr = inS.startReadParams();
+    ::Ice::LogMessage iceP_message;
+    istr->readAll(iceP_message);
+    inS.endReadParams();
+    this->log(::std::move(iceP_message), current);
+    inS.writeEmptyParams();
+    return true;
 }
 
-void
-IceProxy::Ice::RemoteLogger::init(const ::std::string& __p_prefix, const ::Ice::LogMessageSeq& __p_logMessages, const ::Ice::Context* __ctx)
+bool
+Ice::RemoteLogger::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
 {
-    ::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)
+    ::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)
     {
-        __og.abort(__ex);
+        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
-    __invoke(__og);
-}
 
-::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)
-{
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__RemoteLogger__init_name, __del, __cookie);
-    try
+    switch(r.first - iceC_Ice_RemoteLogger_ops)
     {
-        __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();
-    }
-    catch(const ::Ice::Exception& __ex)
-    {
-        __result->abort(__ex);
+        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 ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        }
     }
-    return __result;
 }
 
-void
-IceProxy::Ice::RemoteLogger::end_init(const ::Ice::AsyncResultPtr& __result)
+bool
+Ice::LoggerAdmin::ice_isA(::std::string s, const ::Ice::Current&) const
 {
-    __end(__result, __Ice__RemoteLogger__init_name);
+    return ::std::binary_search(iceC_Ice_LoggerAdmin_ids, iceC_Ice_LoggerAdmin_ids + 2, s);
 }
 
-void
-IceProxy::Ice::RemoteLogger::log(const ::Ice::LogMessage& __p_message, const ::Ice::Context* __ctx)
+::std::vector<::std::string>
+Ice::LoggerAdmin::ice_ids(const ::Ice::Current&) const
 {
-    ::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);
+    return ::std::vector<::std::string>(&iceC_Ice_LoggerAdmin_ids[0], &iceC_Ice_LoggerAdmin_ids[2]);
 }
 
-::Ice::AsyncResultPtr
-IceProxy::Ice::RemoteLogger::begin_log(const ::Ice::LogMessage& __p_message, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+::std::string
+Ice::LoggerAdmin::ice_id(const ::Ice::Current&) 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 ice_staticId();
 }
 
-void
-IceProxy::Ice::RemoteLogger::end_log(const ::Ice::AsyncResultPtr& __result)
+const ::std::string&
+Ice::LoggerAdmin::ice_staticId()
 {
-    __end(__result, __Ice__RemoteLogger__log_name);
+    static const ::std::string typeId = "::Ice::LoggerAdmin";
+    return typeId;
 }
 
-const ::std::string&
-IceProxy::Ice::RemoteLogger::ice_staticId()
+bool
+Ice::LoggerAdmin::_iceD_attachRemoteLogger(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
-    return ::Ice::RemoteLogger::ice_staticId();
+    _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;
+    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;
 }
 
-::IceProxy::Ice::Object*
-IceProxy::Ice::RemoteLogger::__newInstance() const
+bool
+Ice::LoggerAdmin::_iceD_detachRemoteLogger(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
-    return new RemoteLogger;
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    auto istr = inS.startReadParams();
+    ::std::shared_ptr<::Ice::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;
 }
-#ifdef __SUNPRO_CC
-class ICE_API IceProxy::Ice::LoggerAdmin;
-#endif
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::LoggerAdmin* p) { return p; }
 
-void
-::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::LoggerAdmin>& v)
+bool
+Ice::LoggerAdmin::_iceD_getLog(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
-    ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
-    if(!proxy)
-    {
-        v = 0;
-    }
-    else
-    {
-        v = new ::IceProxy::Ice::LoggerAdmin;
-        v->__copyFrom(proxy);
-    }
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
+    auto istr = inS.startReadParams();
+    ::Ice::LogMessageTypeSeq iceP_messageTypes;
+    ::Ice::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);
+    auto ostr = inS.startWriteParams();
+    ostr->writeAll(iceP_prefix, ret);
+    inS.endWriteParams();
+    return true;
 }
 
-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)
+bool
+Ice::LoggerAdmin::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
 {
-    __checkTwowayOnly(__Ice__LoggerAdmin__attachRemoteLogger_name);
-    ::IceInternal::Outgoing __og(this, __Ice__LoggerAdmin__attachRemoteLogger_name, ::Ice::Normal, __ctx);
-    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)
+    ::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)
     {
-        __og.abort(__ex);
+        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
-    if(!__og.invoke())
+
+    switch(r.first - iceC_Ice_LoggerAdmin_ops)
     {
-        try
+        case 0:
         {
-            __og.throwUserException();
+            return _iceD_attachRemoteLogger(in, current);
         }
-        catch(const ::Ice::RemoteLoggerAlreadyAttachedException&)
+        case 1:
         {
-            throw;
+            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);
         }
-        catch(const ::Ice::UserException& __ex)
+        default:
         {
-            ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
-            throw __uue;
+            assert(false);
+            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
 }
 
-::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)
+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)
 {
-    __checkAsyncTwowayOnly(__Ice__LoggerAdmin__attachRemoteLogger_name);
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__LoggerAdmin__attachRemoteLogger_name, __del, __cookie);
-    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();
-    }
-    catch(const ::Ice::Exception& __ex)
-    {
-        __result->abort(__ex);
-    }
-    return __result;
+    outAsync->invoke(iceC_Ice_RemoteLogger_init_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](::Ice::OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_prefix, iceP_logMessages);
+        },
+        nullptr);
 }
 
-#ifdef ICE_CPP11
+void
+Ice::RemoteLoggerPrx::_iceI_log(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::Ice::LogMessage& iceP_message, const ::Ice::Context& context)
+{
+    outAsync->invoke(iceC_Ice_RemoteLogger_log_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](::Ice::OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_message);
+        },
+        nullptr);
+}
 
-::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)
+::std::shared_ptr<::Ice::ObjectPrx>
+Ice::RemoteLoggerPrx::_newInstance() const
 {
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
-    {
-    public:
+    return ::IceInternal::createProxy<RemoteLoggerPrx>();
+}
 
-        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);
-        }
+const ::std::string&
+Ice::RemoteLoggerPrx::ice_staticId()
+{
+    return Ice::RemoteLogger::ice_staticId();
+}
 
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
+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)
+{
+    _checkTwowayOnly(iceC_Ice_LoggerAdmin_attachRemoteLogger_name);
+    outAsync->invoke(iceC_Ice_LoggerAdmin_attachRemoteLogger_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](::Ice::OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_prx, iceP_messageTypes, iceP_traceCategories, iceP_messageMax);
+        },
+        [](const ::Ice::UserException& ex)
         {
-            ::Ice::LoggerAdminPrx __proxy = ::Ice::LoggerAdminPrx::uncheckedCast(__result->getProxy());
             try
             {
-                __proxy->end_attachRemoteLogger(__result);
+                ex.ice_throw();
             }
-            catch(const ::Ice::Exception& ex)
+            catch(const ::Ice::RemoteLoggerAlreadyAttachedException&)
             {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
+                throw;
             }
-            if(_response != nullptr)
+            catch(const ::Ice::UserException&)
             {
-                _response();
             }
-        }
-    
-    private:
-        
-        ::std::function<void ()> _response;
-    };
-    return begin_attachRemoteLogger(__p_prx, __p_messageTypes, __p_traceCategories, __p_messageMax, __ctx, new Cpp11CB(__response, __exception, __sent));
+        });
 }
-#endif
 
 void
-IceProxy::Ice::LoggerAdmin::end_attachRemoteLogger(const ::Ice::AsyncResultPtr& __result)
+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::AsyncResult::__check(__result, this, __Ice__LoggerAdmin__attachRemoteLogger_name);
-    if(!__result->__wait())
-    {
-        try
+    _checkTwowayOnly(iceC_Ice_LoggerAdmin_detachRemoteLogger_name);
+    outAsync->invoke(iceC_Ice_LoggerAdmin_detachRemoteLogger_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](::Ice::OutputStream* ostr)
         {
-            __result->__throwUserException();
-        }
-        catch(const ::Ice::RemoteLoggerAlreadyAttachedException&)
+            ostr->writeAll(iceP_prx);
+        },
+        nullptr);
+}
+
+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)
+{
+    _checkTwowayOnly(iceC_Ice_LoggerAdmin_getLog_name);
+    outAsync->invoke(iceC_Ice_LoggerAdmin_getLog_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](::Ice::OutputStream* ostr)
         {
-            throw;
-        }
-        catch(const ::Ice::UserException& __ex)
+            ostr->writeAll(iceP_messageTypes, iceP_traceCategories, iceP_messageMax);
+        },
+        nullptr,
+        [](::Ice::InputStream* istr)
         {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
-        }
-    }
-    __result->__readEmptyParams();
+            ::Ice::LoggerAdmin::GetLogResult v;
+            istr->readAll(v.prefix, v.returnValue);
+            return v;
+        });
 }
 
-bool
-IceProxy::Ice::LoggerAdmin::detachRemoteLogger(const ::Ice::RemoteLoggerPrx& __p_prx, const ::Ice::Context* __ctx)
+::std::shared_ptr<::Ice::ObjectPrx>
+Ice::LoggerAdminPrx::_newInstance() const
 {
-    __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)
+    return ::IceInternal::createProxy<LoggerAdminPrx>();
+}
+
+const ::std::string&
+Ice::LoggerAdminPrx::ice_staticId()
+{
+    return Ice::LoggerAdmin::ice_staticId();
+}
+
+namespace Ice
+{
+}
+
+#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
+Ice::RemoteLoggerAlreadyAttachedException::ice_throw() const
+{
+    throw *this;
+}
+
+void
+Ice::RemoteLoggerAlreadyAttachedException::_writeImpl(::Ice::OutputStream* ostr) const
+{
+    ostr->startSlice("::Ice::RemoteLoggerAlreadyAttachedException", -1, true);
+    Ice::StreamWriter< ::Ice::RemoteLoggerAlreadyAttachedException, ::Ice::OutputStream>::write(ostr, *this);
+    ostr->endSlice();
+}
+
+void
+Ice::RemoteLoggerAlreadyAttachedException::_readImpl(::Ice::InputStream* istr)
+{
+    istr->startSlice();
+    Ice::StreamReader< ::Ice::RemoteLoggerAlreadyAttachedException, ::Ice::InputStream>::read(istr, *this);
+    istr->endSlice();
+}
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::RemoteLogger* p) { return p; }
+
+void
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::Ice::RemoteLogger>& v)
+{
+    ::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 ::IceProxy::Ice::RemoteLogger;
+        v->_copyFrom(proxy);
     }
-    bool __ret;
-    ::IceInternal::BasicStream* __is = __og.startReadParams();
-    __is->read(__ret);
-    __og.endReadParams();
-    return __ret;
 }
 
 ::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::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)
 {
-    __checkAsyncTwowayOnly(__Ice__LoggerAdmin__detachRemoteLogger_name);
-    ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__LoggerAdmin__detachRemoteLogger_name, __del, __cookie);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_RemoteLogger_init_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_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);
     }
-    catch(const ::Ice::Exception& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __result->abort(__ex);
+        result->abort(ex);
     }
-    return __result;
+    return result;
 }
 
-#ifdef ICE_CPP11
+void
+IceProxy::Ice::RemoteLogger::end_init(const ::Ice::AsyncResultPtr& result)
+{
+    _end(result, iceC_Ice_RemoteLogger_init_name);
+}
 
 ::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)
+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)
 {
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_RemoteLogger_log_name, del, cookie, sync);
+    try
+    {
+        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)
     {
-    public:
+        result->abort(ex);
+    }
+    return result;
+}
 
-        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);
-        }
+void
+IceProxy::Ice::RemoteLogger::end_log(const ::Ice::AsyncResultPtr& result)
+{
+    _end(result, iceC_Ice_RemoteLogger_log_name);
+}
 
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
-        {
-            ::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);
-            }
-        }
-    
-    private:
-        
-        ::std::function<void (bool)> _response;
-    };
-    return begin_detachRemoteLogger(__p_prx, __ctx, new Cpp11CB(__response, __exception, __sent));
+::IceProxy::Ice::Object*
+IceProxy::Ice::RemoteLogger::_newInstance() const
+{
+    return new RemoteLogger;
 }
-#endif
 
-bool
-IceProxy::Ice::LoggerAdmin::end_detachRemoteLogger(const ::Ice::AsyncResultPtr& __result)
+const ::std::string&
+IceProxy::Ice::RemoteLogger::ice_staticId()
 {
-    ::Ice::AsyncResult::__check(__result, this, __Ice__LoggerAdmin__detachRemoteLogger_name);
-    bool __ret;
-    if(!__result->__wait())
+    return ::Ice::RemoteLogger::ice_staticId();
+}
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::LoggerAdmin* p) { return p; }
+
+void
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::Ice::LoggerAdmin>& v)
+{
+    ::Ice::ObjectPrx proxy;
+    istr->read(proxy);
+    if(!proxy)
     {
-        try
-        {
-            __result->__throwUserException();
-        }
-        catch(const ::Ice::UserException& __ex)
-        {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
-        }
+        v = 0;
+    }
+    else
+    {
+        v = new ::IceProxy::Ice::LoggerAdmin;
+        v->_copyFrom(proxy);
     }
-    ::IceInternal::BasicStream* __is = __result->__startReadParams();
-    __is->read(__ret);
-    __result->__endReadParams();
-    return __ret;
 }
 
-::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_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)
 {
-    __checkTwowayOnly(__Ice__LoggerAdmin__getLog_name);
-    ::IceInternal::Outgoing __og(this, __Ice__LoggerAdmin__getLog_name, ::Ice::Normal, __ctx);
+    _checkTwowayOnly(iceC_Ice_LoggerAdmin_attachRemoteLogger_name, sync);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_LoggerAdmin_attachRemoteLogger_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_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::LocalException& __ex)
+    catch(const ::Ice::Exception& ex)
     {
-        __og.abort(__ex);
+        result->abort(ex);
     }
-    if(!__og.invoke())
+    return result;
+}
+
+void
+IceProxy::Ice::LoggerAdmin::end_attachRemoteLogger(const ::Ice::AsyncResultPtr& result)
+{
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_LoggerAdmin_attachRemoteLogger_name);
+    if(!result->_waitForResponse())
     {
         try
         {
-            __og.throwUserException();
+            result->_throwUserException();
+        }
+        catch(const ::Ice::RemoteLoggerAlreadyAttachedException&)
+        {
+            throw;
         }
-        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;
+    result->_readEmptyParams();
 }
 
 ::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_detachRemoteLogger(const ::Ice::RemoteLoggerPrx& iceP_prx, 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_detachRemoteLogger_name, sync);
+    ::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_LoggerAdmin_detachRemoteLogger_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_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::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)
+bool
+IceProxy::Ice::LoggerAdmin::end_detachRemoteLogger(const ::Ice::AsyncResultPtr& result)
 {
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_LoggerAdmin_detachRemoteLogger_name);
+    bool 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(ret);
+    result->_endReadParams();
+    return ret;
+}
+
+::Ice::AsyncResultPtr
+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)
+{
+    _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(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)
+    {
+        result->abort(ex);
+    }
+    return result;
 }
-#endif
 
 ::Ice::LogMessageSeq
-IceProxy::Ice::LoggerAdmin::end_getLog(::std::string& __p_prefix, const ::Ice::AsyncResultPtr& __result)
+IceProxy::Ice::LoggerAdmin::end_getLog(::std::string& iceP_prefix, 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);
+    ::Ice::LogMessageSeq ret;
+    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();
+    return ret;
+}
+
+::IceProxy::Ice::Object*
+IceProxy::Ice::LoggerAdmin::_newInstance() const
+{
+    return new LoggerAdmin;
 }
 
 const ::std::string&
@@ -621,17 +731,16 @@ 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; }
 
+
 namespace
 {
-const ::std::string __Ice__RemoteLogger_ids[2] =
+const ::std::string iceC_Ice_RemoteLogger_ids[2] =
 {
     "::Ice::Object",
     "::Ice::RemoteLogger"
@@ -640,21 +749,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 ::Ice::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
 {
-    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
 {
-    return __Ice__RemoteLogger_ids[1];
+    return ice_staticId();
 }
 
 const ::std::string&
@@ -664,41 +773,41 @@ 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)
+bool
+Ice::RemoteLogger::_iceD_init(::IceInternal::Incoming& inS, const ::Ice::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);
+    ::Ice::InputStream* istr = inS.startReadParams();
+    ::std::string iceP_prefix;
+    ::Ice::LogMessageSeq iceP_logMessages;
+    istr->read(iceP_prefix);
+    istr->read(iceP_logMessages);
+    inS.endReadParams();
+    this->init(iceP_prefix, iceP_logMessages, current);
+    inS.writeEmptyParams();
+    return true;
 }
 
-::Ice::DispatchStatus
-Ice::RemoteLogger::___log(::IceInternal::Incoming& __inS, const ::Ice::Current& __current)
+bool
+Ice::RemoteLogger::_iceD_log(::IceInternal::Incoming& inS, const ::Ice::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);
+    ::Ice::InputStream* istr = inS.startReadParams();
+    ::Ice::LogMessage iceP_message;
+    istr->read(iceP_message);
+    inS.endReadParams();
+    this->log(iceP_message, current);
+    inS.writeEmptyParams();
+    return true;
 }
 
 namespace
 {
-const ::std::string __Ice__RemoteLogger_all[] =
+const ::std::string iceC_Ice_RemoteLogger_all[] =
 {
     "ice_id",
     "ice_ids",
@@ -710,63 +819,67 @@ const ::std::string __Ice__RemoteLogger_all[] =
 
 }
 
-::Ice::DispatchStatus
-Ice::RemoteLogger::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+bool
+Ice::RemoteLogger::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::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);
     }
 
-    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 ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
-
-    assert(false);
-    throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
 }
 
 void
-Ice::RemoteLogger::__writeImpl(::IceInternal::BasicStream* __os) const
+Ice::RemoteLogger::_iceWriteImpl(::Ice::OutputStream* ostr) const
 {
-    __os->startWriteSlice(ice_staticId(), -1, true);
-    __os->endWriteSlice();
+    ostr->startSlice(ice_staticId(), -1, true);
+    Ice::StreamWriter< ::Ice::RemoteLogger, ::Ice::OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-Ice::RemoteLogger::__readImpl(::IceInternal::BasicStream* __is)
+Ice::RemoteLogger::_iceReadImpl(::Ice::InputStream* istr)
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    istr->startSlice();
+    Ice::StreamReader< ::Ice::RemoteLogger, ::Ice::InputStream>::read(istr, *this);
+    istr->endSlice();
 }
 
-void ICE_API 
-Ice::__patch(RemoteLoggerPtr& handle, const ::Ice::ObjectPtr& v)
+void
+Ice::_icePatchObjectPtr(RemoteLoggerPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::Ice::RemoteLoggerPtr::dynamicCast(v);
     if(v && !handle)
@@ -775,11 +888,16 @@ Ice::__patch(RemoteLoggerPtr& handle, const ::Ice::ObjectPtr& v)
     }
 }
 
+Ice::LoggerAdmin::~LoggerAdmin()
+{
+}
+
 ICE_API ::Ice::Object* Ice::upCast(::Ice::LoggerAdmin* p) { return p; }
 
+
 namespace
 {
-const ::std::string __Ice__LoggerAdmin_ids[2] =
+const ::std::string iceC_Ice_LoggerAdmin_ids[2] =
 {
     "::Ice::LoggerAdmin",
     "::Ice::Object"
@@ -788,21 +906,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 ::Ice::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
 {
-    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
 {
-    return __Ice__LoggerAdmin_ids[0];
+    return ice_staticId();
 }
 
 const ::std::string&
@@ -812,76 +930,68 @@ 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;
+bool
+Ice::LoggerAdmin::_iceD_attachRemoteLogger(::IceInternal::Incoming& inS, const ::Ice::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;
+    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;
+}
+
+bool
+Ice::LoggerAdmin::_iceD_detachRemoteLogger(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+{
+    _iceCheckMode(::Ice::Normal, current.mode);
+    ::Ice::InputStream* istr = inS.startReadParams();
+    ::Ice::RemoteLoggerPrx iceP_prx;
+    istr->read(iceP_prx);
+    inS.endReadParams();
+    bool ret = this->detachRemoteLogger(iceP_prx, current);
+    ::Ice::OutputStream* ostr = inS.startWriteParams();
+    ostr->write(ret);
+    inS.endWriteParams();
+    return true;
+}
+
+bool
+Ice::LoggerAdmin::_iceD_getLog(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+{
+    _iceCheckMode(::Ice::Normal, current.mode);
+    ::Ice::InputStream* istr = inS.startReadParams();
+    ::Ice::LogMessageTypeSeq iceP_messageTypes;
+    ::Ice::StringSeq iceP_traceCategories;
+    ::Ice::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();
+    ostr->write(iceP_prefix);
+    ostr->write(ret);
+    inS.endWriteParams();
+    return true;
 }
 
 namespace
 {
-const ::std::string __Ice__LoggerAdmin_all[] =
+const ::std::string iceC_Ice_LoggerAdmin_all[] =
 {
     "attachRemoteLogger",
     "detachRemoteLogger",
@@ -894,67 +1004,71 @@ const ::std::string __Ice__LoggerAdmin_all[] =
 
 }
 
-::Ice::DispatchStatus
-Ice::LoggerAdmin::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+bool
+Ice::LoggerAdmin::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::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);
     }
 
-    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 ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
-
-    assert(false);
-    throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
 }
 
 void
-Ice::LoggerAdmin::__writeImpl(::IceInternal::BasicStream* __os) const
+Ice::LoggerAdmin::_iceWriteImpl(::Ice::OutputStream* ostr) const
 {
-    __os->startWriteSlice(ice_staticId(), -1, true);
-    __os->endWriteSlice();
+    ostr->startSlice(ice_staticId(), -1, true);
+    Ice::StreamWriter< ::Ice::LoggerAdmin, ::Ice::OutputStream>::write(ostr, *this);
+    ostr->endSlice();
 }
 
 void
-Ice::LoggerAdmin::__readImpl(::IceInternal::BasicStream* __is)
+Ice::LoggerAdmin::_iceReadImpl(::Ice::InputStream* istr)
 {
-    __is->startReadSlice();
-    __is->endReadSlice();
+    istr->startSlice();
+    Ice::StreamReader< ::Ice::LoggerAdmin, ::Ice::InputStream>::read(istr, *this);
+    istr->endSlice();
 }
 
-void ICE_API 
-Ice::__patch(LoggerAdminPtr& handle, const ::Ice::ObjectPtr& v)
+void
+Ice::_icePatchObjectPtr(LoggerAdminPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::Ice::LoggerAdminPtr::dynamicCast(v);
     if(v && !handle)
@@ -962,3 +1076,9 @@ Ice::__patch(LoggerAdminPtr& handle, const ::Ice::ObjectPtr& v)
         IceInternal::Ex::throwUOE(::Ice::LoggerAdmin::ice_staticId(), v);
     }
 }
+
+namespace Ice
+{
+}
+
+#endif