zeroc-ice 3.7.0 → 3.7.1

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.
@@ -72,6 +72,10 @@ public:
     const InstancePtr& getInstance() const { return _instance; }
     const SharedContextPtr& getContext() const { return _context; }
     int getInvocationTimeout() const { return _invocationTimeout; }
+    IceUtil::Optional<bool> getCompress() const
+    {
+        return _overrideCompress ? IceUtil::Optional<bool>(_compress) : IceUtil::None;
+    }
 
     Ice::CommunicatorPtr getCommunicator() const;
 
@@ -85,6 +89,7 @@ public:
     virtual Ice::EndpointSelectionType getEndpointSelection() const = 0;
     virtual int getLocatorCacheTimeout() const = 0;
     virtual std::string getConnectionId() const = 0;
+    virtual IceUtil::Optional<int> getTimeout() const = 0;
 
     //
     // The change* methods (here and in derived classes) create
@@ -112,6 +117,7 @@ public:
 
     virtual ReferencePtr changeTimeout(int) const = 0;
     virtual ReferencePtr changeConnectionId(const std::string&) const = 0;
+    virtual ReferencePtr changeConnection(const Ice::ConnectionIPtr&) const = 0;
 
     int hash() const; // Conceptually const.
 
@@ -185,7 +191,8 @@ class FixedReference : public Reference
 public:
 
     FixedReference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&, const std::string&, Mode,
-                   bool, const Ice::EncodingVersion&, const Ice::ConnectionIPtr&);
+                   bool, const Ice::ProtocolVersion&, const Ice::EncodingVersion&, const Ice::ConnectionIPtr&,
+                   int, const Ice::Context&, const IceUtil::Optional<bool>&);
 
     virtual std::vector<EndpointIPtr> getEndpoints() const;
     virtual std::string getAdapterId() const;
@@ -195,6 +202,7 @@ public:
     virtual Ice::EndpointSelectionType getEndpointSelection() const;
     virtual int getLocatorCacheTimeout() const;
     virtual std::string getConnectionId() const;
+    virtual IceUtil::Optional<int> getTimeout() const;
 
     virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const;
     virtual ReferencePtr changeAdapterId(const std::string&) const;
@@ -208,6 +216,7 @@ public:
 
     virtual ReferencePtr changeTimeout(int) const;
     virtual ReferencePtr changeConnectionId(const std::string&) const;
+    virtual ReferencePtr changeConnection(const Ice::ConnectionIPtr&) const;
 
     virtual bool isIndirect() const;
     virtual bool isWellKnown() const;
@@ -249,6 +258,7 @@ public:
     virtual Ice::EndpointSelectionType getEndpointSelection() const;
     virtual int getLocatorCacheTimeout() const;
     virtual std::string getConnectionId() const;
+    virtual IceUtil::Optional<int> getTimeout() const;
 
     virtual ReferencePtr changeEncoding(const Ice::EncodingVersion&) const;
     virtual ReferencePtr changeCompress(bool) const;
@@ -264,6 +274,7 @@ public:
 
     virtual ReferencePtr changeTimeout(int) const;
     virtual ReferencePtr changeConnectionId(const std::string&) const;
+    virtual ReferencePtr changeConnection(const Ice::ConnectionIPtr&) const;
 
     virtual bool isIndirect() const;
     virtual bool isWellKnown() const;

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.
@@ -91,8 +91,12 @@ IceInternal::ReferenceFactory::create(const Identity& ident, const Ice::Connecti
                               "",  // Facet
                               connection->endpoint()->datagram() ? Reference::ModeDatagram : Reference::ModeTwoway,
                               connection->endpoint()->secure(),
+                              Ice::Protocol_1_0,
                               _instance->defaultsAndOverrides()->defaultEncoding,
-                              connection);
+                              connection,
+                              -1,
+                              Ice::Context(),
+                              IceUtil::Optional<bool>());
 }
 
 ReferencePtr
@@ -112,9 +116,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
     beg = s.find_first_not_of(delim, end);
     if(beg == string::npos)
     {
-        ProxyParseException ex(__FILE__, __LINE__);
-        ex.str = "no non-whitespace characters found in `" + s + "'";
-        throw ex;
+        throw ProxyParseException(__FILE__, __LINE__, "no non-whitespace characters found in `" + s + "'");
     }
 
     //
@@ -125,9 +127,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
     end = IceUtilInternal::checkQuote(s, beg);
     if(end == string::npos)
     {
-        ProxyParseException ex(__FILE__, __LINE__);
-        ex.str = "mismatched quotes around identity in `" + s + "'";
-        throw ex;
+        throw ProxyParseException(__FILE__, __LINE__, "mismatched quotes around identity in `" + s + "'");
     }
     else if(end == 0)
     {
@@ -147,9 +147,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
 
     if(beg == end)
     {
-        ProxyParseException ex(__FILE__, __LINE__);
-        ex.str = "no identity in `" + s + "'";
-        throw ex;
+        throw ProxyParseException(__FILE__, __LINE__, "no identity in `" + s + "'");
     }
 
     //
@@ -165,9 +163,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
         //
         if(!ident.category.empty())
         {
-            IllegalIdentityException e(__FILE__, __LINE__);
-            e.id = ident;
-            throw e;
+            throw IllegalIdentityException(__FILE__, __LINE__, ident);
         }
         //
         // Treat a stringified proxy containing two double
@@ -177,9 +173,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
         //
         else if(s.find_first_not_of(delim, end) != string::npos)
         {
-            ProxyParseException ex(__FILE__, __LINE__);
-            ex.str = "invalid characters after identity in `" + s + "'";
-            throw ex;
+            throw ProxyParseException(__FILE__, __LINE__, "invalid characters after identity in `" + s + "'");
         }
         else
         {
@@ -221,9 +215,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
         string option = s.substr(beg, end - beg);
         if(option.length() != 2 || option[0] != '-')
         {
-            ProxyParseException ex(__FILE__, __LINE__);
-            ex.str = "expected a proxy option but found `" + option + "' in `" + s + "'";
-            throw ex;
+            throw ProxyParseException(__FILE__, __LINE__, "expected a proxy option but found `" + option + "' in `" +
+                                      s + "'");
         }
 
         //
@@ -241,9 +234,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
                 end = IceUtilInternal::checkQuote(s, beg);
                 if(end == string::npos)
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "mismatched quotes around value for " + option + " option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "mismatched quotes around value for " + option +
+                                              " option in `" + s + "'");
                 }
                 else if(end == 0)
                 {
@@ -273,20 +265,16 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(argument.empty())
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "no argument provided for -f option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "no argument provided for -f option in `" + s + "'");
                 }
 
                 try
                 {
                     facet = unescapeString(argument, 0, argument.size(), "");
                 }
-                catch(const IceUtil::IllegalArgumentException& e)
+                catch(const IceUtil::IllegalArgumentException& ex)
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "invalid facet in `" + s + "': " + e.reason();
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "invalid facet in `" + s + "': " + ex.reason());
                 }
 
                 break;
@@ -296,9 +284,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(!argument.empty())
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "unexpected argument `" + argument + "' provided for -t option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "unexpected argument `" + argument +
+                                              "' provided for -t option in `" + s + "'");
                 }
                 mode = Reference::ModeTwoway;
                 break;
@@ -308,9 +295,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(!argument.empty())
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "unexpected argument `" + argument + "' provided for -o option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "unexpected argument `" + argument +
+                                              "' provided for -o option in `" + s + "'");
                 }
                 mode = Reference::ModeOneway;
                 break;
@@ -320,9 +306,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(!argument.empty())
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "unexpected argument `" + argument + "' provided for -O option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "unexpected argument `" + argument +
+                                              "' provided for -O option in `" + s + "'");
                 }
                 mode = Reference::ModeBatchOneway;
                 break;
@@ -332,9 +317,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(!argument.empty())
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "unexpected argument `" + argument + "' provided for -d option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "unexpected argument `" + argument +
+                                              "' provided for -d option in `" + s + "'");
                 }
                 mode = Reference::ModeDatagram;
                 break;
@@ -344,9 +328,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(!argument.empty())
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "unexpected argument `" + argument + "' provided for -D option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "unexpected argument `" + argument +
+                                              "' provided for -D option in `" + s + "'");
                 }
                 mode = Reference::ModeBatchDatagram;
                 break;
@@ -356,9 +339,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(!argument.empty())
                 {
-                    ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "unexpected argument `" + argument + "' provided for -s option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "unexpected argument `" + argument +
+                                              "' provided for -s option in `" + s + "'");
                 }
                 secure = true;
                 break;
@@ -368,20 +350,17 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(argument.empty())
                 {
-                    Ice::ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "no argument provided for -e option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "no argument provided for -e option in `" + s + "'");
                 }
 
                 try
                 {
                     encoding = Ice::stringToEncodingVersion(argument);
                 }
-                catch(const Ice::VersionParseException& e)
+                catch(const Ice::VersionParseException& ex)
                 {
-                    Ice::ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "invalid encoding version `" + argument + "' in `" + s + "':\n" + e.str;
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "invalid encoding version `" + argument + "' in `" +
+                                              s + "':\n" + ex.str);
                 }
                 break;
             }
@@ -390,29 +369,24 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             {
                 if(argument.empty())
                 {
-                    Ice::ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "no argument provided for -p option in `" + s + "'";
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "no argument provided for -p option in `" + s + "'");
                 }
 
                 try
                 {
                     protocol = Ice::stringToProtocolVersion(argument);
                 }
-                catch(const Ice::VersionParseException& e)
+                catch(const Ice::VersionParseException& ex)
                 {
-                    Ice::ProxyParseException ex(__FILE__, __LINE__);
-                    ex.str = "invalid protocol version `" + argument + "' in `" + s + "':\n" + e.str;
-                    throw ex;
+                    throw ProxyParseException(__FILE__, __LINE__, "invalid protocol version `" + argument + "' in `" +
+                                              s + "':\n" + ex.str);
                 }
                 break;
             }
 
             default:
             {
-                ProxyParseException ex(__FILE__, __LINE__);
-                ex.str = "unknown option `" + option + "' in `" + s + "'";
-                throw ex;
+                throw ProxyParseException(__FILE__, __LINE__, "unknown option `" + option + "' in `" + s + "'");
             }
         }
     }
@@ -491,9 +465,8 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             if(endpoints.size() == 0)
             {
                 assert(!unknownEndpoints.empty());
-                EndpointParseException ex(__FILE__, __LINE__);
-                ex.str = "invalid endpoint `" + unknownEndpoints.front() + "' in `" + s + "'";
-                throw ex;
+                throw EndpointParseException(__FILE__, __LINE__, "invalid endpoint `" + unknownEndpoints.front() +
+                                             "' in `" + s + "'");
             }
             else if(unknownEndpoints.size() != 0 &&
                     _instance->initializationData().properties->
@@ -515,18 +488,14 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             beg = s.find_first_not_of(delim, beg + 1);
             if(beg == string::npos)
             {
-                ProxyParseException ex(__FILE__, __LINE__);
-                ex.str = "missing adapter id in `" + s + "'";
-                throw ex;
+                throw ProxyParseException(__FILE__, __LINE__, "missing adapter id in `" + s + "'");
             }
 
             string adapterstr;
             end = IceUtilInternal::checkQuote(s, beg);
             if(end == string::npos)
             {
-                ProxyParseException ex(__FILE__, __LINE__);
-                ex.str = "mismatched quotes around adapter id in `" + s + "'";
-                throw ex;
+                throw ProxyParseException(__FILE__, __LINE__, "mismatched quotes around adapter id in `" + s + "'");
             }
             else if(end == 0)
             {
@@ -547,26 +516,21 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
             // Check for trailing whitespace.
             if(end != string::npos && s.find_first_not_of(delim, end) != string::npos)
             {
-                ProxyParseException ex(__FILE__, __LINE__);
-                ex.str = "invalid trailing characters after `" + s.substr(0, end + 1) + "' in `" + s + "'";
-                throw ex;
+                throw ProxyParseException(__FILE__, __LINE__, "invalid trailing characters after `" +
+                                          s.substr(0, end + 1) + "' in `" + s + "'");
             }
 
             try
             {
                 adapter = unescapeString(adapterstr, 0, adapterstr.size(), "");
             }
-            catch(const IceUtil::IllegalArgumentException& e)
+            catch(const IceUtil::IllegalArgumentException& ex)
             {
-                ProxyParseException ex(__FILE__, __LINE__);
-                ex.str = "invalid adapter id in `" + s + "': " + e.reason();
-                throw ex;
+                throw ProxyParseException(__FILE__, __LINE__, "invalid adapter id in `" + s + "': " + ex.reason());
             }
             if(adapter.size() == 0)
             {
-                ProxyParseException ex(__FILE__, __LINE__);
-                ex.str = "empty adapter id in `" + s + "'";
-                throw ex;
+                throw ProxyParseException(__FILE__, __LINE__, "empty adapter id in `" + s + "'");
             }
 
             return create(ident, facet, mode, secure, protocol, encoding, endpoints, adapter, propertyPrefix);
@@ -574,9 +538,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
         }
         default:
         {
-            ProxyParseException ex(__FILE__, __LINE__);
-            ex.str = "malformed proxy `" + s + "'";
-            throw ex;
+            throw ProxyParseException(__FILE__, __LINE__, "malformed proxy `" + s + "'");
         }
     }
 
@@ -865,9 +827,8 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
             }
             else
             {
-                EndpointSelectionTypeParseException ex(__FILE__, __LINE__);
-                ex.str = "illegal value `" + type + "'; expected `Random' or `Ordered'";
-                throw ex;
+                throw EndpointSelectionTypeParseException(__FILE__, __LINE__, "illegal value `" + type +
+                                                          "'; expected `Random' or `Ordered'");
             }
         }
 

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

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

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

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