zeroc-ice 3.7.1 → 3.7.2

data/ext/ice/cpp/include/generated/Ice/Plugin.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -42,7 +37,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -111,7 +106,7 @@ public:
      * Initialize the configured plug-ins. The communicator automatically initializes
      * the plug-ins by default, but an application may need to interact directly with
      * a plug-in prior to initialization. In this case, the application must set
-     * <tt>Ice.InitPlugins=0</tt> and then invoke {@link #initializePlugins}
+     * <code>Ice.InitPlugins=0</code> and then invoke {@link #initializePlugins}
      * manually. The plug-ins are initialized in the order in which they are loaded.
      * If a plug-in raises an exception during initialization, the communicator
      * invokes destroy on the plug-ins that have already been initialized.
@@ -247,7 +242,7 @@ public:
      * Initialize the configured plug-ins. The communicator automatically initializes
      * the plug-ins by default, but an application may need to interact directly with
      * a plug-in prior to initialization. In this case, the application must set
-     * <tt>Ice.InitPlugins=0</tt> and then invoke {@link #initializePlugins}
+     * <code>Ice.InitPlugins=0</code> and then invoke {@link #initializePlugins}
      * manually. The plug-ins are initialized in the order in which they are loaded.
      * If a plug-in raises an exception during initialization, the communicator
      * invokes destroy on the plug-ins that have already been initialized.

data/ext/ice/cpp/include/generated/Ice/PluginF.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -40,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/Ice/Process.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -46,7 +41,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -203,7 +198,7 @@ public:
                   ::std::function<void(bool)> sent = nullptr,
                   const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<void>(response, ex, sent, this, &ProcessPrx::_iceI_shutdown, context);
+        return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::ProcessPrx::_iceI_shutdown, context);
     }
 
     /// \cond INTERNAL
@@ -252,7 +247,7 @@ public:
                       ::std::function<void(bool)> sent = nullptr,
                       const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<void>(response, ex, sent, this, &ProcessPrx::_iceI_writeMessage, message, fd, context);
+        return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::ProcessPrx::_iceI_writeMessage, message, fd, context);
     }
 
     /// \cond INTERNAL
@@ -304,8 +299,8 @@ namespace Ice
 
 class Process;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Process>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Process*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< Process>&);
+ICE_API ::IceProxy::Ice::Object* upCast(Process*);
 /// \endcond
 
 }

data/ext/ice/cpp/include/generated/Ice/ProcessF.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -41,7 +36,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -93,8 +88,8 @@ namespace Ice
 
 class Process;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Process>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Process*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< Process>&);
+ICE_API ::IceProxy::Ice::Object* upCast(Process*);
 /// \endcond
 
 }

data/ext/ice/cpp/include/generated/Ice/Properties.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -47,7 +42,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -183,7 +178,7 @@ public:
      * Get a sequence of command-line options that is equivalent to
      * this property set. Each element of the returned sequence is
      * a command-line option of the form
-     * <tt>--<em>key</em>=<em>value</em></tt>.
+     * <code>--<em>key</em>=<em>value</em></code>.
      * @return The command line options for this property set.
      */
     virtual ::Ice::StringSeq getCommandLineOptions() noexcept = 0;
@@ -191,11 +186,11 @@ public:
     /**
      * Convert a sequence of command-line options into properties.
      * All options that begin with
-     * <tt>--<em>prefix</em>.</tt> are
+     * <code>--<em>prefix</em>.</code> are
      * converted into properties. If the prefix is empty, all options
-     * that begin with <tt>--</tt> are converted to properties.
+     * that begin with <code>--</code> are converted to properties.
      * @param prefix The property prefix, or an empty string to
-     * convert all options starting with <tt>--</tt>.
+     * convert all options starting with <code>--</code>.
      * @param options The command-line options.
      * @return The command-line options that do not start with the specified
      * prefix, in their original order.
@@ -205,8 +200,8 @@ public:
     /**
      * Convert a sequence of command-line options into properties.
      * All options that begin with one of the following prefixes
-     * are converted into properties: <tt>--Ice</tt>, <tt>--IceBox</tt>, <tt>--IceGrid</tt>,
-     * <tt>--IcePatch2</tt>, <tt>--IceSSL</tt>, <tt>--IceStorm</tt>, <tt>--Freeze</tt>, and <tt>--Glacier2</tt>.
+     * are converted into properties: <code>--Ice</code>, <code>--IceBox</code>, <code>--IceGrid</code>,
+     * <code>--IcePatch2</code>, <code>--IceSSL</code>, <code>--IceStorm</code>, <code>--Freeze</code>, and <code>--Glacier2</code>.
      * @param options The command-line options.
      * @return The command-line options that do not start with one of
      * the listed prefixes, in their original order.
@@ -381,7 +376,7 @@ public:
      * Get a sequence of command-line options that is equivalent to
      * this property set. Each element of the returned sequence is
      * a command-line option of the form
-     * <tt>--<em>key</em>=<em>value</em></tt>.
+     * <code>--<em>key</em>=<em>value</em></code>.
      * @return The command line options for this property set.
      */
     virtual StringSeq getCommandLineOptions() ICE_NOEXCEPT = 0;
@@ -389,11 +384,11 @@ public:
     /**
      * Convert a sequence of command-line options into properties.
      * All options that begin with
-     * <tt>--<em>prefix</em>.</tt> are
+     * <code>--<em>prefix</em>.</code> are
      * converted into properties. If the prefix is empty, all options
-     * that begin with <tt>--</tt> are converted to properties.
+     * that begin with <code>--</code> are converted to properties.
      * @param prefix The property prefix, or an empty string to
-     * convert all options starting with <tt>--</tt>.
+     * convert all options starting with <code>--</code>.
      * @param options The command-line options.
      * @return The command-line options that do not start with the specified
      * prefix, in their original order.
@@ -403,8 +398,8 @@ public:
     /**
      * Convert a sequence of command-line options into properties.
      * All options that begin with one of the following prefixes
-     * are converted into properties: <tt>--Ice</tt>, <tt>--IceBox</tt>, <tt>--IceGrid</tt>,
-     * <tt>--IcePatch2</tt>, <tt>--IceSSL</tt>, <tt>--IceStorm</tt>, <tt>--Freeze</tt>, and <tt>--Glacier2</tt>.
+     * are converted into properties: <code>--Ice</code>, <code>--IceBox</code>, <code>--IceGrid</code>,
+     * <code>--IcePatch2</code>, <code>--IceSSL</code>, <code>--IceStorm</code>, <code>--Freeze</code>, and <code>--Glacier2</code>.
      * @param options The command-line options.
      * @return The command-line options that do not start with one of
      * the listed prefixes, in their original order.

data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -47,7 +42,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -227,7 +222,7 @@ public:
                      ::std::function<void(bool)> sent = nullptr,
                      const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<::std::string>(response, ex, sent, this, &PropertiesAdminPrx::_iceI_getProperty, key, context);
+        return _makeLamdaOutgoing<::std::string>(response, ex, sent, this, &Ice::PropertiesAdminPrx::_iceI_getProperty, key, context);
     }
 
     /// \cond INTERNAL
@@ -277,7 +272,7 @@ public:
                                 ::std::function<void(bool)> sent = nullptr,
                                 const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<PropertyDict>(response, ex, sent, this, &PropertiesAdminPrx::_iceI_getPropertiesForPrefix, prefix, context);
+        return _makeLamdaOutgoing<PropertyDict>(response, ex, sent, this, &Ice::PropertiesAdminPrx::_iceI_getPropertiesForPrefix, prefix, context);
     }
 
     /// \cond INTERNAL
@@ -338,7 +333,7 @@ public:
                        ::std::function<void(bool)> sent = nullptr,
                        const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<void>(response, ex, sent, this, &PropertiesAdminPrx::_iceI_setProperties, newProperties, context);
+        return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::PropertiesAdminPrx::_iceI_setProperties, newProperties, context);
     }
 
     /// \cond INTERNAL
@@ -390,8 +385,8 @@ namespace Ice
 
 class PropertiesAdmin;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::PropertiesAdmin>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::PropertiesAdmin*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< PropertiesAdmin>&);
+ICE_API ::IceProxy::Ice::Object* upCast(PropertiesAdmin*);
 /// \endcond
 
 }

data/ext/ice/cpp/include/generated/Ice/PropertiesF.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -41,7 +36,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -96,8 +91,8 @@ namespace Ice
 
 class PropertiesAdmin;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::PropertiesAdmin>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::PropertiesAdmin*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< PropertiesAdmin>&);
+ICE_API ::IceProxy::Ice::Object* upCast(PropertiesAdmin*);
 /// \endcond
 
 }

data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -49,7 +44,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -422,7 +417,7 @@ public:
               ::std::function<void(bool)> sent = nullptr,
               const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<void>(response, ex, sent, this, &RemoteLoggerPrx::_iceI_init, prefix, logMessages, context);
+        return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::RemoteLoggerPrx::_iceI_init, prefix, logMessages, context);
     }
 
     /// \cond INTERNAL
@@ -468,7 +463,7 @@ public:
              ::std::function<void(bool)> sent = nullptr,
              const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<void>(response, ex, sent, this, &RemoteLoggerPrx::_iceI_log, message, context);
+        return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::RemoteLoggerPrx::_iceI_log, message, context);
     }
 
     /// \cond INTERNAL
@@ -565,7 +560,7 @@ public:
                             ::std::function<void(bool)> sent = nullptr,
                             const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<void>(response, ex, sent, this, &LoggerAdminPrx::_iceI_attachRemoteLogger, prx, messageTypes, traceCategories, messageMax, context);
+        return _makeLamdaOutgoing<void>(response, ex, sent, this, &Ice::LoggerAdminPrx::_iceI_attachRemoteLogger, prx, messageTypes, traceCategories, messageMax, context);
     }
 
     /// \cond INTERNAL
@@ -612,7 +607,7 @@ public:
                             ::std::function<void(bool)> sent = nullptr,
                             const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<bool>(response, ex, sent, this, &LoggerAdminPrx::_iceI_detachRemoteLogger, prx, context);
+        return _makeLamdaOutgoing<bool>(response, ex, sent, this, &Ice::LoggerAdminPrx::_iceI_detachRemoteLogger, prx, context);
     }
 
     /// \cond INTERNAL
@@ -684,7 +679,7 @@ public:
         {
             response(::std::move(_result.returnValue), ::std::move(_result.prefix));
         };
-        return _makeLamdaOutgoing<LoggerAdmin::GetLogResult>(_responseCb, ex, sent, this, &LoggerAdminPrx::_iceI_getLog, messageTypes, traceCategories, messageMax, context);
+        return _makeLamdaOutgoing<LoggerAdmin::GetLogResult>(_responseCb, ex, sent, this, &Ice::LoggerAdminPrx::_iceI_getLog, messageTypes, traceCategories, messageMax, context);
     }
 
     /// \cond INTERNAL
@@ -766,14 +761,14 @@ namespace Ice
 
 class RemoteLogger;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::RemoteLogger>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::RemoteLogger*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< RemoteLogger>&);
+ICE_API ::IceProxy::Ice::Object* upCast(RemoteLogger*);
 /// \endcond
 
 class LoggerAdmin;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::LoggerAdmin>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::LoggerAdmin*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< LoggerAdmin>&);
+ICE_API ::IceProxy::Ice::Object* upCast(LoggerAdmin*);
 /// \endcond
 
 }
@@ -836,7 +831,7 @@ enum LogMessageType
 /**
  * A sequence of {@link LogMessageType}
  */
-typedef ::std::vector<Ice::LogMessageType> LogMessageTypeSeq;
+typedef ::std::vector<LogMessageType> LogMessageTypeSeq;
 
 /**
  * A complete log message.

data/ext/ice/cpp/include/generated/Ice/Router.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -47,7 +42,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -79,7 +74,7 @@ namespace Ice
 
 /**
  * The Ice router interface. Routers can be set either globally with
- * {@link Communicator#setDefaultRouter}, or with <tt>ice_router</tt> on specific
+ * {@link Communicator#setDefaultRouter}, or with <code>ice_router</code> on specific
  * proxies.
  * \headerfile Ice/Ice.h
  */
@@ -239,7 +234,7 @@ namespace Ice
 
 /**
  * The Ice router interface. Routers can be set either globally with
- * {@link Communicator#setDefaultRouter}, or with <tt>ice_router</tt> on specific
+ * {@link Communicator#setDefaultRouter}, or with <code>ice_router</code> on specific
  * proxies.
  * \headerfile Ice/Ice.h
  */
@@ -306,7 +301,7 @@ public:
         {
             response(::std::move(_result.returnValue), _result.hasRoutingTable);
         };
-        return _makeLamdaOutgoing<Router::GetClientProxyResult>(_responseCb, ex, sent, this, &RouterPrx::_iceI_getClientProxy, context);
+        return _makeLamdaOutgoing<Router::GetClientProxyResult>(_responseCb, ex, sent, this, &Ice::RouterPrx::_iceI_getClientProxy, context);
     }
 
     /// \cond INTERNAL
@@ -352,7 +347,7 @@ public:
                         ::std::function<void(bool)> sent = nullptr,
                         const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<::std::shared_ptr<ObjectPrx>>(response, ex, sent, this, &RouterPrx::_iceI_getServerProxy, context);
+        return _makeLamdaOutgoing<::std::shared_ptr<ObjectPrx>>(response, ex, sent, this, &Ice::RouterPrx::_iceI_getServerProxy, context);
     }
 
     /// \cond INTERNAL
@@ -399,7 +394,7 @@ public:
                     ::std::function<void(bool)> sent = nullptr,
                     const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<ObjectProxySeq>(response, ex, sent, this, &RouterPrx::_iceI_addProxies, proxies, context);
+        return _makeLamdaOutgoing<ObjectProxySeq>(response, ex, sent, this, &Ice::RouterPrx::_iceI_addProxies, proxies, context);
     }
 
     /// \cond INTERNAL
@@ -473,7 +468,7 @@ public:
                    ::std::function<void(bool)> sent = nullptr,
                    const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<::std::shared_ptr<RouterPrx>>(response, ex, sent, this, &RouterFinderPrx::_iceI_getRouter, context);
+        return _makeLamdaOutgoing<::std::shared_ptr<RouterPrx>>(response, ex, sent, this, &Ice::RouterFinderPrx::_iceI_getRouter, context);
     }
 
     /// \cond INTERNAL
@@ -528,14 +523,14 @@ namespace Ice
 
 class Router;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Router>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< Router>&);
+ICE_API ::IceProxy::Ice::Object* upCast(Router*);
 /// \endcond
 
 class RouterFinder;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::RouterFinder>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::RouterFinder*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< RouterFinder>&);
+ICE_API ::IceProxy::Ice::Object* upCast(RouterFinder*);
 /// \endcond
 
 }
@@ -1027,7 +1022,7 @@ namespace Ice
 
 /**
  * The Ice router interface. Routers can be set either globally with
- * {@link Communicator#setDefaultRouter}, or with <tt>ice_router</tt> on specific
+ * {@link Communicator#setDefaultRouter}, or with <code>ice_router</code> on specific
  * proxies.
  * \headerfile Ice/Ice.h
  */