zeroc-ice 3.7.1 → 3.7.6

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.6
 //
 // <auto-generated>
 //
@@ -44,10 +39,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 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       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>(std::move(response), std::move(ex), std::move(sent), this, &Ice::PropertiesAdminPrx::_iceI_getProperty, key, context);
     }
 
     /// \cond INTERNAL
@@ -243,7 +238,7 @@ public:
      */
     PropertyDict getPropertiesForPrefix(const ::std::string& prefix, const Context& context = noExplicitContext)
     {
-        return _makePromiseOutgoing<PropertyDict>(true, this, &PropertiesAdminPrx::_iceI_getPropertiesForPrefix, prefix, context).get();
+        return _makePromiseOutgoing<::Ice::PropertyDict>(true, this, &PropertiesAdminPrx::_iceI_getPropertiesForPrefix, prefix, context).get();
     }
 
     /**
@@ -255,9 +250,9 @@ public:
      */
     template<template<typename> class P = ::std::promise>
     auto getPropertiesForPrefixAsync(const ::std::string& prefix, const Context& context = noExplicitContext)
-        -> decltype(::std::declval<P<PropertyDict>>().get_future())
+        -> decltype(::std::declval<P<::Ice::PropertyDict>>().get_future())
     {
-        return _makePromiseOutgoing<PropertyDict, P>(false, this, &PropertiesAdminPrx::_iceI_getPropertiesForPrefix, prefix, context);
+        return _makePromiseOutgoing<::Ice::PropertyDict, P>(false, this, &PropertiesAdminPrx::_iceI_getPropertiesForPrefix, prefix, context);
     }
 
     /**
@@ -272,16 +267,16 @@ public:
      */
     ::std::function<void()>
     getPropertiesForPrefixAsync(const ::std::string& prefix,
-                                ::std::function<void(PropertyDict)> response,
+                                ::std::function<void(::Ice::PropertyDict)> response,
                                 ::std::function<void(::std::exception_ptr)> ex = nullptr,
                                 ::std::function<void(bool)> sent = nullptr,
                                 const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<PropertyDict>(response, ex, sent, this, &PropertiesAdminPrx::_iceI_getPropertiesForPrefix, prefix, context);
+        return _makeLamdaOutgoing<::Ice::PropertyDict>(std::move(response), std::move(ex), std::move(sent), this, &Ice::PropertiesAdminPrx::_iceI_getPropertiesForPrefix, prefix, context);
     }
 
     /// \cond INTERNAL
-    ICE_MEMBER(ICE_API) void _iceI_getPropertiesForPrefix(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<PropertyDict>>&, const ::std::string&, const Context&);
+    ICE_MEMBER(ICE_API) void _iceI_getPropertiesForPrefix(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::PropertyDict>>&, const ::std::string&, const Context&);
     /// \endcond
 
     /**
@@ -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>(std::move(response), std::move(ex), std::move(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
 
 }
@@ -794,6 +789,12 @@ public:
 
     virtual ~PropertiesAdmin();
 
+#ifdef ICE_CPP11_COMPILER
+    PropertiesAdmin() = default;
+    PropertiesAdmin(const PropertiesAdmin&) = default;
+    PropertiesAdmin& operator=(const PropertiesAdmin&) = default;
+#endif
+
     /**
      * Determines whether this object supports an interface with the given Slice type ID.
      * @param id The fully-scoped Slice type ID.

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.6
 //
 // <auto-generated>
 //
@@ -38,10 +33,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 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       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.6
 //
 // <auto-generated>
 //
@@ -46,10 +41,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 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -116,7 +111,7 @@ struct LogMessage
     /**
      * The type of message sent to the {@link Logger}.
      */
-    LogMessageType type;
+    ::Ice::LogMessageType type;
     /**
      * The date and time when the {@link Logger} received this message, expressed
      * as the number of microseconds since the Unix Epoch (00:00:00 UTC on 1 January 1970)
@@ -133,11 +128,10 @@ struct LogMessage
     ::std::string message;
 
     /**
-     * Obtains a tuple containing all of the exception's data members.
+     * Obtains a tuple containing all of the struct's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const LogMessageType&, const long long int&, const ::std::string&, const ::std::string&> ice_tuple() const
+    std::tuple<const ::Ice::LogMessageType&, const long long int&, const ::std::string&, const ::std::string&> ice_tuple() const
     {
         return std::tie(type, timestamp, traceCategory, message);
     }
@@ -166,7 +160,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<> ice_tuple() const
     {
         return std::tie();
@@ -422,7 +415,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>(std::move(response), std::move(ex), std::move(sent), this, &Ice::RemoteLoggerPrx::_iceI_init, prefix, logMessages, context);
     }
 
     /// \cond INTERNAL
@@ -468,7 +461,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>(std::move(response), std::move(ex), std::move(sent), this, &Ice::RemoteLoggerPrx::_iceI_log, message, context);
     }
 
     /// \cond INTERNAL
@@ -565,7 +558,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>(std::move(response), std::move(ex), std::move(sent), this, &Ice::LoggerAdminPrx::_iceI_attachRemoteLogger, prx, messageTypes, traceCategories, messageMax, context);
     }
 
     /// \cond INTERNAL
@@ -612,7 +605,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>(std::move(response), std::move(ex), std::move(sent), this, &Ice::LoggerAdminPrx::_iceI_detachRemoteLogger, prx, context);
     }
 
     /// \cond INTERNAL
@@ -675,7 +668,7 @@ public:
      */
     ::std::function<void()>
     getLogAsync(const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, int messageMax,
-                ::std::function<void(LogMessageSeq, ::std::string)> response,
+                ::std::function<void(::Ice::LogMessageSeq, ::std::string)> response,
                 ::std::function<void(::std::exception_ptr)> ex = nullptr,
                 ::std::function<void(bool)> sent = nullptr,
                 const Context& context = noExplicitContext)
@@ -684,7 +677,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>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Ice::LoggerAdminPrx::_iceI_getLog, messageTypes, traceCategories, messageMax, context);
     }
 
     /// \cond INTERNAL
@@ -766,14 +759,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 +829,7 @@ enum LogMessageType
 /**
  * A sequence of {@link LogMessageType}
  */
-typedef ::std::vector<Ice::LogMessageType> LogMessageTypeSeq;
+typedef ::std::vector<LogMessageType> LogMessageTypeSeq;
 
 /**
  * A complete log message.
@@ -847,12 +840,12 @@ struct LogMessage
     /**
      * The type of message sent to the {@link Logger}.
      */
-    LogMessageType type;
+    ::Ice::LogMessageType type;
     /**
      * The date and time when the {@link Logger} received this message, expressed
      * as the number of microseconds since the Unix Epoch (00:00:00 UTC on 1 January 1970)
      */
-    Long timestamp;
+    ::Ice::Long timestamp;
     /**
      * For a message of type trace, the trace category of this log message;
      * otherwise, the empty string.
@@ -961,7 +954,13 @@ class ICE_API RemoteLoggerAlreadyAttachedException : public UserException
 public:
 
     RemoteLoggerAlreadyAttachedException() {}
+
+#ifdef ICE_CPP11_COMPILER
+    RemoteLoggerAlreadyAttachedException(const RemoteLoggerAlreadyAttachedException&) = default;
+    virtual ~RemoteLoggerAlreadyAttachedException();
+#else
     virtual ~RemoteLoggerAlreadyAttachedException() throw();
+#endif
 
     /**
      * Obtains the Slice type ID of this exception.
@@ -969,7 +968,7 @@ public:
      */
     virtual ::std::string ice_id() const;
     /**
-     * Polymporphically clones this exception.
+     * Polymorphically clones this exception.
      * @return A shallow copy of this exception.
      */
     virtual RemoteLoggerAlreadyAttachedException* ice_clone() const;
@@ -1618,6 +1617,12 @@ public:
 
     virtual ~RemoteLogger();
 
+#ifdef ICE_CPP11_COMPILER
+    RemoteLogger() = default;
+    RemoteLogger(const RemoteLogger&) = default;
+    RemoteLogger& operator=(const RemoteLogger&) = default;
+#endif
+
     /**
      * Determines whether this object supports an interface with the given Slice type ID.
      * @param id The fully-scoped Slice type ID.
@@ -1705,6 +1710,12 @@ public:
 
     virtual ~LoggerAdmin();
 
+#ifdef ICE_CPP11_COMPILER
+    LoggerAdmin() = default;
+    LoggerAdmin(const LoggerAdmin&) = default;
+    LoggerAdmin& operator=(const LoggerAdmin&) = default;
+#endif
+
     /**
      * Determines whether this object supports an interface with the given Slice type ID.
      * @param id The fully-scoped Slice type ID.

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.6
 //
 // <auto-generated>
 //
@@ -44,10 +39,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 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       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
  */
@@ -297,7 +292,7 @@ public:
      * @return A function that can be called to cancel the invocation locally.
      */
     ::std::function<void()>
-    getClientProxyAsync(::std::function<void(::std::shared_ptr<ObjectPrx>, Ice::optional<bool>)> response,
+    getClientProxyAsync(::std::function<void(::std::shared_ptr<::Ice::ObjectPrx>, Ice::optional<bool>)> response,
                         ::std::function<void(::std::exception_ptr)> ex = nullptr,
                         ::std::function<void(bool)> sent = nullptr,
                         const Context& context = noExplicitContext)
@@ -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>(std::move(_responseCb), std::move(ex), std::move(sent), this, &Ice::RouterPrx::_iceI_getClientProxy, context);
     }
 
     /// \cond INTERNAL
@@ -321,7 +316,7 @@ public:
      */
     ::std::shared_ptr<ObjectPrx> getServerProxy(const Context& context = noExplicitContext)
     {
-        return _makePromiseOutgoing<::std::shared_ptr<ObjectPrx>>(true, this, &RouterPrx::_iceI_getServerProxy, context).get();
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::ObjectPrx>>(true, this, &RouterPrx::_iceI_getServerProxy, context).get();
     }
 
     /**
@@ -332,9 +327,9 @@ public:
      */
     template<template<typename> class P = ::std::promise>
     auto getServerProxyAsync(const Context& context = noExplicitContext)
-        -> decltype(::std::declval<P<::std::shared_ptr<ObjectPrx>>>().get_future())
+        -> decltype(::std::declval<P<::std::shared_ptr<::Ice::ObjectPrx>>>().get_future())
     {
-        return _makePromiseOutgoing<::std::shared_ptr<ObjectPrx>, P>(false, this, &RouterPrx::_iceI_getServerProxy, context);
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::ObjectPrx>, P>(false, this, &RouterPrx::_iceI_getServerProxy, context);
     }
 
     /**
@@ -347,16 +342,16 @@ public:
      * @return A function that can be called to cancel the invocation locally.
      */
     ::std::function<void()>
-    getServerProxyAsync(::std::function<void(::std::shared_ptr<ObjectPrx>)> response,
+    getServerProxyAsync(::std::function<void(::std::shared_ptr<::Ice::ObjectPrx>)> response,
                         ::std::function<void(::std::exception_ptr)> ex = nullptr,
                         ::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<::Ice::ObjectPrx>>(std::move(response), std::move(ex), std::move(sent), this, &Ice::RouterPrx::_iceI_getServerProxy, context);
     }
 
     /// \cond INTERNAL
-    ICE_MEMBER(ICE_API) void _iceI_getServerProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<ObjectPrx>>>&, const Context&);
+    ICE_MEMBER(ICE_API) void _iceI_getServerProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::ObjectPrx>>>&, const Context&);
     /// \endcond
 
     /**
@@ -367,7 +362,7 @@ public:
      */
     ObjectProxySeq addProxies(const ObjectProxySeq& proxies, const Context& context = noExplicitContext)
     {
-        return _makePromiseOutgoing<ObjectProxySeq>(true, this, &RouterPrx::_iceI_addProxies, proxies, context).get();
+        return _makePromiseOutgoing<::Ice::ObjectProxySeq>(true, this, &RouterPrx::_iceI_addProxies, proxies, context).get();
     }
 
     /**
@@ -378,9 +373,9 @@ public:
      */
     template<template<typename> class P = ::std::promise>
     auto addProxiesAsync(const ObjectProxySeq& proxies, const Context& context = noExplicitContext)
-        -> decltype(::std::declval<P<ObjectProxySeq>>().get_future())
+        -> decltype(::std::declval<P<::Ice::ObjectProxySeq>>().get_future())
     {
-        return _makePromiseOutgoing<ObjectProxySeq, P>(false, this, &RouterPrx::_iceI_addProxies, proxies, context);
+        return _makePromiseOutgoing<::Ice::ObjectProxySeq, P>(false, this, &RouterPrx::_iceI_addProxies, proxies, context);
     }
 
     /**
@@ -394,16 +389,16 @@ public:
      */
     ::std::function<void()>
     addProxiesAsync(const ObjectProxySeq& proxies,
-                    ::std::function<void(ObjectProxySeq)> response,
+                    ::std::function<void(::Ice::ObjectProxySeq)> response,
                     ::std::function<void(::std::exception_ptr)> ex = nullptr,
                     ::std::function<void(bool)> sent = nullptr,
                     const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<ObjectProxySeq>(response, ex, sent, this, &RouterPrx::_iceI_addProxies, proxies, context);
+        return _makeLamdaOutgoing<::Ice::ObjectProxySeq>(std::move(response), std::move(ex), std::move(sent), this, &Ice::RouterPrx::_iceI_addProxies, proxies, context);
     }
 
     /// \cond INTERNAL
-    ICE_MEMBER(ICE_API) void _iceI_addProxies(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<ObjectProxySeq>>&, const ObjectProxySeq&, const Context&);
+    ICE_MEMBER(ICE_API) void _iceI_addProxies(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::ObjectProxySeq>>&, const ObjectProxySeq&, const Context&);
     /// \endcond
 
     /**
@@ -442,7 +437,7 @@ public:
      */
     ::std::shared_ptr<RouterPrx> getRouter(const Context& context = noExplicitContext)
     {
-        return _makePromiseOutgoing<::std::shared_ptr<RouterPrx>>(true, this, &RouterFinderPrx::_iceI_getRouter, context).get();
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::RouterPrx>>(true, this, &RouterFinderPrx::_iceI_getRouter, context).get();
     }
 
     /**
@@ -453,9 +448,9 @@ public:
      */
     template<template<typename> class P = ::std::promise>
     auto getRouterAsync(const Context& context = noExplicitContext)
-        -> decltype(::std::declval<P<::std::shared_ptr<RouterPrx>>>().get_future())
+        -> decltype(::std::declval<P<::std::shared_ptr<::Ice::RouterPrx>>>().get_future())
     {
-        return _makePromiseOutgoing<::std::shared_ptr<RouterPrx>, P>(false, this, &RouterFinderPrx::_iceI_getRouter, context);
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::RouterPrx>, P>(false, this, &RouterFinderPrx::_iceI_getRouter, context);
     }
 
     /**
@@ -468,16 +463,16 @@ public:
      * @return A function that can be called to cancel the invocation locally.
      */
     ::std::function<void()>
-    getRouterAsync(::std::function<void(::std::shared_ptr<RouterPrx>)> response,
+    getRouterAsync(::std::function<void(::std::shared_ptr<::Ice::RouterPrx>)> response,
                    ::std::function<void(::std::exception_ptr)> ex = nullptr,
                    ::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<::Ice::RouterPrx>>(std::move(response), std::move(ex), std::move(sent), this, &Ice::RouterFinderPrx::_iceI_getRouter, context);
     }
 
     /// \cond INTERNAL
-    ICE_MEMBER(ICE_API) void _iceI_getRouter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<RouterPrx>>>&, const Context&);
+    ICE_MEMBER(ICE_API) void _iceI_getRouter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::RouterPrx>>>&, const Context&);
     /// \endcond
 
     /**
@@ -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
  */
@@ -1040,6 +1035,12 @@ public:
 
     virtual ~Router();
 
+#ifdef ICE_CPP11_COMPILER
+    Router() = default;
+    Router(const Router&) = default;
+    Router& operator=(const Router&) = default;
+#endif
+
     /**
      * Determines whether this object supports an interface with the given Slice type ID.
      * @param id The fully-scoped Slice type ID.
@@ -1150,6 +1151,12 @@ public:
 
     virtual ~RouterFinder();
 
+#ifdef ICE_CPP11_COMPILER
+    RouterFinder() = default;
+    RouterFinder(const RouterFinder&) = default;
+    RouterFinder& operator=(const RouterFinder&) = default;
+#endif
+
     /**
      * Determines whether this object supports an interface with the given Slice type ID.
      * @param id The fully-scoped Slice type ID.