zeroc-ice 3.7.0 → 3.7.5

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/RetryQueue.h>
 #include <Ice/OutgoingAsync.h>
@@ -44,7 +39,7 @@ IceInternal::RetryTask::runTimerTask()
 }
 
 void
-IceInternal::RetryTask::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, const Ice::LocalException& ex)
+IceInternal::RetryTask::asyncRequestCanceled(const OutgoingAsyncBasePtr& /*outAsync*/, const Ice::LocalException& ex)
 {
     if(_queue->cancel(ICE_SHARED_FROM_THIS))
     {
@@ -149,11 +144,14 @@ IceInternal::RetryQueue::cancel(const RetryTaskPtr& task)
     Lock sync(*this);
     if(_requests.erase(task) > 0)
     {
-        if(!_instance && _requests.empty())
+        if(_instance)
+        {
+            return _instance->timer()->cancel(task);
+        }
+        else if(_requests.empty())
         {
             notify(); // If we are destroying the queue, destroy is probably waiting on the queue to be empty.
         }
-        return _instance->timer()->cancel(task);
     }
     return false;
 }

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

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

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

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

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.0
+// Ice version 3.7.5
 //
 // <auto-generated>
 //
@@ -42,10 +37,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 5
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -92,19 +87,19 @@ const ::std::string iceC_Ice_RouterFinder_getRouter_name = "getRouter";
 }
 
 bool
-Ice::Router::ice_isA(::std::string s, const ::Ice::Current&) const
+Ice::Router::ice_isA(::std::string s, const Current&) const
 {
     return ::std::binary_search(iceC_Ice_Router_ids, iceC_Ice_Router_ids + 2, s);
 }
 
 ::std::vector<::std::string>
-Ice::Router::ice_ids(const ::Ice::Current&) const
+Ice::Router::ice_ids(const Current&) const
 {
     return ::std::vector<::std::string>(&iceC_Ice_Router_ids[0], &iceC_Ice_Router_ids[2]);
 }
 
 ::std::string
-Ice::Router::ice_id(const ::Ice::Current&) const
+Ice::Router::ice_id(const Current&) const
 {
     return ice_staticId();
 }
@@ -116,54 +111,61 @@ Ice::Router::ice_staticId()
     return typeId;
 }
 
+/// \cond INTERNAL
 bool
-Ice::Router::_iceD_getClientProxy(::IceInternal::Incoming& inS, const ::Ice::Current& current) const
+Ice::Router::_iceD_getClientProxy(::IceInternal::Incoming& inS, const Current& current) const
 {
     _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
     inS.readEmptyParams();
     Ice::optional<bool> iceP_hasRoutingTable;
-    ::std::shared_ptr<::Ice::ObjectPrx> ret = this->getClientProxy(iceP_hasRoutingTable, current);
+    ::std::shared_ptr<ObjectPrx> ret = this->getClientProxy(iceP_hasRoutingTable, current);
     auto ostr = inS.startWriteParams();
     ostr->writeAll(ret);
     ostr->writeAll({1}, iceP_hasRoutingTable);
     inS.endWriteParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::Router::_iceD_getServerProxy(::IceInternal::Incoming& inS, const ::Ice::Current& current) const
+Ice::Router::_iceD_getServerProxy(::IceInternal::Incoming& inS, const Current& current) const
 {
     _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
     inS.readEmptyParams();
-    ::std::shared_ptr<::Ice::ObjectPrx> ret = this->getServerProxy(current);
+    ::std::shared_ptr<ObjectPrx> ret = this->getServerProxy(current);
     auto ostr = inS.startWriteParams();
     ostr->writeAll(ret);
     inS.endWriteParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::Router::_iceD_addProxies(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::Router::_iceD_addProxies(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
     auto istr = inS.startReadParams();
-    ::Ice::ObjectProxySeq iceP_proxies;
+    ObjectProxySeq iceP_proxies;
     istr->readAll(iceP_proxies);
     inS.endReadParams();
-    ::Ice::ObjectProxySeq ret = this->addProxies(::std::move(iceP_proxies), current);
+    ObjectProxySeq ret = this->addProxies(::std::move(iceP_proxies), current);
     auto ostr = inS.startWriteParams();
     ostr->writeAll(ret);
     inS.endWriteParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::Router::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+Ice::Router::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
     ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_Router_ops, iceC_Ice_Router_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_Router_ops)
@@ -199,25 +201,26 @@ Ice::Router::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& cur
         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::RouterFinder::ice_isA(::std::string s, const ::Ice::Current&) const
+Ice::RouterFinder::ice_isA(::std::string s, const Current&) const
 {
     return ::std::binary_search(iceC_Ice_RouterFinder_ids, iceC_Ice_RouterFinder_ids + 2, s);
 }
 
 ::std::vector<::std::string>
-Ice::RouterFinder::ice_ids(const ::Ice::Current&) const
+Ice::RouterFinder::ice_ids(const Current&) const
 {
     return ::std::vector<::std::string>(&iceC_Ice_RouterFinder_ids[0], &iceC_Ice_RouterFinder_ids[2]);
 }
 
 ::std::string
-Ice::RouterFinder::ice_id(const ::Ice::Current&) const
+Ice::RouterFinder::ice_id(const Current&) const
 {
     return ice_staticId();
 }
@@ -229,25 +232,28 @@ Ice::RouterFinder::ice_staticId()
     return typeId;
 }
 
+/// \cond INTERNAL
 bool
-Ice::RouterFinder::_iceD_getRouter(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::RouterFinder::_iceD_getRouter(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
     inS.readEmptyParams();
-    ::std::shared_ptr<::Ice::RouterPrx> ret = this->getRouter(current);
+    ::std::shared_ptr<RouterPrx> ret = this->getRouter(current);
     auto ostr = inS.startWriteParams();
     ostr->writeAll(ret);
     inS.endWriteParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::RouterFinder::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+Ice::RouterFinder::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
     ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_RouterFinder_ops, iceC_Ice_RouterFinder_ops + 5, 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_RouterFinder_ops)
@@ -275,79 +281,92 @@ Ice::RouterFinder::_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 INTERNAL
 void
-Ice::RouterPrx::_iceI_getClientProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::Router::GetClientProxyResult>>& outAsync, const ::Ice::Context& context)
+Ice::RouterPrx::_iceI_getClientProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<Router::GetClientProxyResult>>& outAsync, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_Router_getClientProxy_name);
     outAsync->invoke(iceC_Ice_Router_getClientProxy_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context,
         nullptr,
         nullptr,
-        [](::Ice::InputStream* istr)
+        [](InputStream* istr)
         {
-            ::Ice::Router::GetClientProxyResult v;
+            Router::GetClientProxyResult v;
             istr->readAll(v.returnValue);
             istr->readAll({1}, v.hasRoutingTable);
             return v;
         });
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::RouterPrx::_iceI_getServerProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::ObjectPrx>>>& outAsync, const ::Ice::Context& context)
+Ice::RouterPrx::_iceI_getServerProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::ObjectPrx>>>& outAsync, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_Router_getServerProxy_name);
     outAsync->invoke(iceC_Ice_Router_getServerProxy_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context,
         nullptr,
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::RouterPrx::_iceI_addProxies(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::ObjectProxySeq>>& outAsync, const ::Ice::ObjectProxySeq& iceP_proxies, const ::Ice::Context& context)
+Ice::RouterPrx::_iceI_addProxies(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::ObjectProxySeq>>& outAsync, const ObjectProxySeq& iceP_proxies, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_Router_addProxies_name);
     outAsync->invoke(iceC_Ice_Router_addProxies_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
-        [&](::Ice::OutputStream* ostr)
+        [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_proxies);
         },
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 ::std::shared_ptr<::Ice::ObjectPrx>
 Ice::RouterPrx::_newInstance() const
 {
     return ::IceInternal::createProxy<RouterPrx>();
 }
+/// \endcond
 
 const ::std::string&
 Ice::RouterPrx::ice_staticId()
 {
-    return Ice::Router::ice_staticId();
+    return Router::ice_staticId();
 }
 
+/// \cond INTERNAL
 void
-Ice::RouterFinderPrx::_iceI_getRouter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::RouterPrx>>>& outAsync, const ::Ice::Context& context)
+Ice::RouterFinderPrx::_iceI_getRouter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::RouterPrx>>>& outAsync, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_RouterFinder_getRouter_name);
     outAsync->invoke(iceC_Ice_RouterFinder_getRouter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
         nullptr,
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 ::std::shared_ptr<::Ice::ObjectPrx>
 Ice::RouterFinderPrx::_newInstance() const
 {
     return ::IceInternal::createProxy<RouterFinderPrx>();
 }
+/// \endcond
 
 const ::std::string&
 Ice::RouterFinderPrx::ice_staticId()
 {
-    return Ice::RouterFinder::ice_staticId();
+    return RouterFinder::ice_staticId();
 }
 
 #else // C++98 mapping
@@ -364,10 +383,12 @@ const ::std::string iceC_Ice_Router_addProxies_name = "addProxies";
 const ::std::string iceC_Ice_RouterFinder_getRouter_name = "getRouter";
 
 }
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::Router* p) { return p; }
+
+/// \cond INTERNAL
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(Router* p) { return p; }
 
 void
-::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Router>& v)
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< Router>& v)
 {
     ::Ice::ObjectPrx proxy;
     istr->read(proxy);
@@ -377,10 +398,11 @@ void
     }
     else
     {
-        v = new ::IceProxy::Ice::Router;
+        v = new Router;
         v->_copyFrom(proxy);
     }
 }
+/// \endcond
 
 ::Ice::AsyncResultPtr
 IceProxy::Ice::Router::_iceI_begin_getClientProxy(const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
@@ -423,6 +445,26 @@ IceProxy::Ice::Router::end_getClientProxy(IceUtil::Optional<bool>& iceP_hasRouti
     return ret;
 }
 
+void IceProxy::Ice::Router::_iceI_end_getClientProxy(IceUtil::Optional<bool>& iceP_hasRoutingTable, ::Ice::ObjectPrxPtr& ret, const ::Ice::AsyncResultPtr& result)
+{
+    ::Ice::AsyncResult::_check(result, this, iceC_Ice_Router_getClientProxy_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(ret);
+    istr->read(1, iceP_hasRoutingTable);
+    result->_endReadParams();
+}
+
 ::Ice::AsyncResultPtr
 IceProxy::Ice::Router::_iceI_begin_getServerProxy(const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
 {
@@ -505,21 +547,25 @@ IceProxy::Ice::Router::end_addProxies(const ::Ice::AsyncResultPtr& result)
     return ret;
 }
 
+/// \cond INTERNAL
 ::IceProxy::Ice::Object*
 IceProxy::Ice::Router::_newInstance() const
 {
     return new Router;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::Ice::Router::ice_staticId()
 {
     return ::Ice::Router::ice_staticId();
 }
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::RouterFinder* p) { return p; }
+
+/// \cond INTERNAL
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(RouterFinder* p) { return p; }
 
 void
-::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::Ice::RouterFinder>& v)
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< RouterFinder>& v)
 {
     ::Ice::ObjectPrx proxy;
     istr->read(proxy);
@@ -529,10 +575,11 @@ void
     }
     else
     {
-        v = new ::IceProxy::Ice::RouterFinder;
+        v = new RouterFinder;
         v->_copyFrom(proxy);
     }
 }
+/// \endcond
 
 ::Ice::AsyncResultPtr
 IceProxy::Ice::RouterFinder::_iceI_begin_getRouter(const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
@@ -574,11 +621,13 @@ IceProxy::Ice::RouterFinder::end_getRouter(const ::Ice::AsyncResultPtr& result)
     return ret;
 }
 
+/// \cond INTERNAL
 ::IceProxy::Ice::Object*
 IceProxy::Ice::RouterFinder::_newInstance() const
 {
     return new RouterFinder;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::Ice::RouterFinder::ice_staticId()
@@ -590,8 +639,10 @@ Ice::Router::~Router()
 {
 }
 
-ICE_API ::Ice::Object* Ice::upCast(::Ice::Router* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::Object* Ice::upCast(Router* p) { return p; }
 
+/// \endcond
 
 namespace
 {
@@ -604,19 +655,19 @@ const ::std::string iceC_Ice_Router_ids[2] =
 }
 
 bool
-Ice::Router::ice_isA(const ::std::string& s, const ::Ice::Current&) const
+Ice::Router::ice_isA(const ::std::string& s, const Current&) const
 {
     return ::std::binary_search(iceC_Ice_Router_ids, iceC_Ice_Router_ids + 2, s);
 }
 
 ::std::vector< ::std::string>
-Ice::Router::ice_ids(const ::Ice::Current&) const
+Ice::Router::ice_ids(const Current&) const
 {
     return ::std::vector< ::std::string>(&iceC_Ice_Router_ids[0], &iceC_Ice_Router_ids[2]);
 }
 
 const ::std::string&
-Ice::Router::ice_id(const ::Ice::Current&) const
+Ice::Router::ice_id(const Current&) const
 {
     return ice_staticId();
 }
@@ -632,46 +683,52 @@ Ice::Router::ice_staticId()
 #endif
 }
 
+/// \cond INTERNAL
 bool
-Ice::Router::_iceD_getClientProxy(::IceInternal::Incoming& inS, const ::Ice::Current& current) const
+Ice::Router::_iceD_getClientProxy(::IceInternal::Incoming& inS, const Current& current) const
 {
     _iceCheckMode(::Ice::Idempotent, current.mode);
     inS.readEmptyParams();
     IceUtil::Optional<bool> iceP_hasRoutingTable;
-    ::Ice::ObjectPrx ret = this->getClientProxy(iceP_hasRoutingTable, current);
-    ::Ice::OutputStream* ostr = inS.startWriteParams();
+    ObjectPrx ret = this->getClientProxy(iceP_hasRoutingTable, current);
+    OutputStream* ostr = inS.startWriteParams();
     ostr->write(ret);
     ostr->write(1, iceP_hasRoutingTable);
     inS.endWriteParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::Router::_iceD_getServerProxy(::IceInternal::Incoming& inS, const ::Ice::Current& current) const
+Ice::Router::_iceD_getServerProxy(::IceInternal::Incoming& inS, const Current& current) const
 {
     _iceCheckMode(::Ice::Idempotent, current.mode);
     inS.readEmptyParams();
-    ::Ice::ObjectPrx ret = this->getServerProxy(current);
-    ::Ice::OutputStream* ostr = inS.startWriteParams();
+    ObjectPrx ret = this->getServerProxy(current);
+    OutputStream* ostr = inS.startWriteParams();
     ostr->write(ret);
     inS.endWriteParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::Router::_iceD_addProxies(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::Router::_iceD_addProxies(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::Idempotent, current.mode);
-    ::Ice::InputStream* istr = inS.startReadParams();
-    ::Ice::ObjectProxySeq iceP_proxies;
+    InputStream* istr = inS.startReadParams();
+    ObjectProxySeq iceP_proxies;
     istr->read(iceP_proxies);
     inS.endReadParams();
-    ::Ice::ObjectProxySeq ret = this->addProxies(iceP_proxies, current);
-    ::Ice::OutputStream* ostr = inS.startWriteParams();
+    ObjectProxySeq ret = this->addProxies(iceP_proxies, current);
+    OutputStream* ostr = inS.startWriteParams();
     ostr->write(ret);
     inS.endWriteParams();
     return true;
 }
+/// \endcond
 
 namespace
 {
@@ -688,13 +745,14 @@ const ::std::string iceC_Ice_Router_all[] =
 
 }
 
+/// \cond INTERNAL
 bool
-Ice::Router::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+Ice::Router::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
     ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_Router_all, iceC_Ice_Router_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_Router_all)
@@ -730,43 +788,50 @@ Ice::Router::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& cur
         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::Router::_iceWriteImpl(::Ice::OutputStream* ostr) const
+Ice::Router::_iceWriteImpl(OutputStream* ostr) const
 {
     ostr->startSlice(ice_staticId(), -1, true);
-    Ice::StreamWriter< ::Ice::Router, ::Ice::OutputStream>::write(ostr, *this);
+    StreamWriter< Router, OutputStream>::write(ostr, *this);
     ostr->endSlice();
 }
 
 void
-Ice::Router::_iceReadImpl(::Ice::InputStream* istr)
+Ice::Router::_iceReadImpl(InputStream* istr)
 {
     istr->startSlice();
-    Ice::StreamReader< ::Ice::Router, ::Ice::InputStream>::read(istr, *this);
+    StreamReader< Router, InputStream>::read(istr, *this);
     istr->endSlice();
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::_icePatchObjectPtr(RouterPtr& handle, const ::Ice::ObjectPtr& v)
+Ice::_icePatchObjectPtr(RouterPtr& handle, const ObjectPtr& v)
 {
-    handle = ::Ice::RouterPtr::dynamicCast(v);
+    handle = RouterPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::Ice::Router::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(Router::ice_staticId(), v);
     }
 }
+/// \endcond
 
 Ice::RouterFinder::~RouterFinder()
 {
 }
 
-ICE_API ::Ice::Object* Ice::upCast(::Ice::RouterFinder* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::Object* Ice::upCast(RouterFinder* p) { return p; }
 
+/// \endcond
 
 namespace
 {
@@ -779,19 +844,19 @@ const ::std::string iceC_Ice_RouterFinder_ids[2] =
 }
 
 bool
-Ice::RouterFinder::ice_isA(const ::std::string& s, const ::Ice::Current&) const
+Ice::RouterFinder::ice_isA(const ::std::string& s, const Current&) const
 {
     return ::std::binary_search(iceC_Ice_RouterFinder_ids, iceC_Ice_RouterFinder_ids + 2, s);
 }
 
 ::std::vector< ::std::string>
-Ice::RouterFinder::ice_ids(const ::Ice::Current&) const
+Ice::RouterFinder::ice_ids(const Current&) const
 {
     return ::std::vector< ::std::string>(&iceC_Ice_RouterFinder_ids[0], &iceC_Ice_RouterFinder_ids[2]);
 }
 
 const ::std::string&
-Ice::RouterFinder::ice_id(const ::Ice::Current&) const
+Ice::RouterFinder::ice_id(const Current&) const
 {
     return ice_staticId();
 }
@@ -807,17 +872,19 @@ Ice::RouterFinder::ice_staticId()
 #endif
 }
 
+/// \cond INTERNAL
 bool
-Ice::RouterFinder::_iceD_getRouter(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::RouterFinder::_iceD_getRouter(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::Normal, current.mode);
     inS.readEmptyParams();
-    ::Ice::RouterPrx ret = this->getRouter(current);
-    ::Ice::OutputStream* ostr = inS.startWriteParams();
+    RouterPrx ret = this->getRouter(current);
+    OutputStream* ostr = inS.startWriteParams();
     ostr->write(ret);
     inS.endWriteParams();
     return true;
 }
+/// \endcond
 
 namespace
 {
@@ -832,13 +899,14 @@ const ::std::string iceC_Ice_RouterFinder_all[] =
 
 }
 
+/// \cond INTERNAL
 bool
-Ice::RouterFinder::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+Ice::RouterFinder::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
     ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_RouterFinder_all, iceC_Ice_RouterFinder_all + 5, 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_RouterFinder_all)
@@ -866,36 +934,41 @@ Ice::RouterFinder::_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::RouterFinder::_iceWriteImpl(::Ice::OutputStream* ostr) const
+Ice::RouterFinder::_iceWriteImpl(OutputStream* ostr) const
 {
     ostr->startSlice(ice_staticId(), -1, true);
-    Ice::StreamWriter< ::Ice::RouterFinder, ::Ice::OutputStream>::write(ostr, *this);
+    StreamWriter< RouterFinder, OutputStream>::write(ostr, *this);
     ostr->endSlice();
 }
 
 void
-Ice::RouterFinder::_iceReadImpl(::Ice::InputStream* istr)
+Ice::RouterFinder::_iceReadImpl(InputStream* istr)
 {
     istr->startSlice();
-    Ice::StreamReader< ::Ice::RouterFinder, ::Ice::InputStream>::read(istr, *this);
+    StreamReader< RouterFinder, InputStream>::read(istr, *this);
     istr->endSlice();
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::_icePatchObjectPtr(RouterFinderPtr& handle, const ::Ice::ObjectPtr& v)
+Ice::_icePatchObjectPtr(RouterFinderPtr& handle, const ObjectPtr& v)
 {
-    handle = ::Ice::RouterFinderPtr::dynamicCast(v);
+    handle = RouterFinderPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::Ice::RouterFinder::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(RouterFinder::ice_staticId(), v);
     }
 }
+/// \endcond
 
 namespace Ice
 {