zeroc-ice 3.7.1 → 3.7.6

data/ext/ice/cpp/include/generated/Ice/LocatorF.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
@@ -98,14 +93,14 @@ namespace Ice
 
 class Locator;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Locator>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< Locator>&);
+ICE_API ::IceProxy::Ice::Object* upCast(Locator*);
 /// \endcond
 
 class LocatorRegistry;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::LocatorRegistry>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::LocatorRegistry*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< LocatorRegistry>&);
+ICE_API ::IceProxy::Ice::Object* upCast(LocatorRegistry*);
 /// \endcond
 
 }

data/ext/ice/cpp/include/generated/Ice/Logger.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>
 //
@@ -37,10 +32,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
@@ -167,6 +162,12 @@ public:
 
     virtual ~Logger();
 
+#ifdef ICE_CPP11_COMPILER
+    Logger() = default;
+    Logger(const Logger&) = default;
+    Logger& operator=(const Logger&) = default;
+#endif
+
     /**
      * Print a message. The message is printed literally, without
      * any decorations such as executable name or time stamp.

data/ext/ice/cpp/include/generated/Ice/LoggerF.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>
 //
@@ -37,10 +32,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

data/ext/ice/cpp/include/generated/Ice/Metrics.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>
 //
@@ -45,10 +40,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
@@ -104,14 +99,13 @@ struct MetricsFailures
     /**
      * The failures observed for this metrics.
      */
-    StringIntDict failures;
+    ::IceMX::StringIntDict failures;
 
     /**
-     * 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 ::std::string&, const StringIntDict&> ice_tuple() const
+    std::tuple<const ::std::string&, const ::IceMX::StringIntDict&> ice_tuple() const
     {
         return std::tie(id, failures);
     }
@@ -154,7 +148,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();
@@ -360,13 +353,13 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      */
     Metrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures) :
-        id(::std::move(id)),
+        id(id),
         total(total),
         current(current),
         totalLifetime(totalLifetime),
@@ -378,7 +371,6 @@ public:
      * Obtains a tuple containing all of the value's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&, const long long int&, const int&, const long long int&, const int&> ice_tuple() const
     {
         return std::tie(id, total, current, totalLifetime, failures);
@@ -395,16 +387,19 @@ public:
      */
     ::std::string id;
     /**
-     * The total number of objects that were observed by this metrics.
+     * The total number of objects observed by this metrics. This includes
+     * the number of currently observed objects and the number of objects
+     * observed in the past.
      */
     long long int total = 0LL;
     /**
-     * The current number of objects observed by this metrics.
+     * The number of objects currently observed by this metrics.
      */
     int current = 0;
     /**
      * The sum of the lifetime of each observed objects. This does not
-     * include the lifetime of objects which are currently observed.
+     * include the lifetime of objects which are currently observed,
+     * only the objects observed in the past.
      */
     long long int totalLifetime = 0LL;
     /**
@@ -438,8 +433,8 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      * @param inUseForIO The number of threads which are currently performing socket read or writes.
@@ -447,7 +442,7 @@ public:
      * @param inUseForOther The number of threads which are currently performing other activities.
      */
     ThreadMetrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures, int inUseForIO, int inUseForUser, int inUseForOther) :
-        Ice::ValueHelper<ThreadMetrics, Metrics>(::std::move(id), total, current, totalLifetime, failures),
+        Ice::ValueHelper<ThreadMetrics, Metrics>(id, total, current, totalLifetime, failures),
         inUseForIO(inUseForIO),
         inUseForUser(inUseForUser),
         inUseForOther(inUseForOther)
@@ -458,7 +453,6 @@ public:
      * Obtains a tuple containing all of the value's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&, const long long int&, const int&, const long long int&, const int&, const int&, const int&, const int&> ice_tuple() const
     {
         return std::tie(id, total, current, totalLifetime, failures, inUseForIO, inUseForUser, inUseForOther);
@@ -509,8 +503,8 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      * @param userException The number of dispatch that failed with a user exception.
@@ -518,7 +512,7 @@ public:
      * @param replySize The size of the dispatch reply.
      */
     DispatchMetrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures, int userException, long long int size, long long int replySize) :
-        Ice::ValueHelper<DispatchMetrics, Metrics>(::std::move(id), total, current, totalLifetime, failures),
+        Ice::ValueHelper<DispatchMetrics, Metrics>(id, total, current, totalLifetime, failures),
         userException(userException),
         size(size),
         replySize(replySize)
@@ -529,7 +523,6 @@ public:
      * Obtains a tuple containing all of the value's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&, const long long int&, const int&, const long long int&, const int&, const int&, const long long int&, const long long int&> ice_tuple() const
     {
         return std::tie(id, total, current, totalLifetime, failures, userException, size, replySize);
@@ -561,8 +554,8 @@ public:
  * Provides information on child invocations. A child invocation is
  * either remote (sent over an Ice connection) or collocated. An
  * invocation can have multiple child invocation if it is
- * retried. Child invocation metrics are embedded within {@link
- * InvocationMetrics}.
+ * retried. Child invocation metrics are embedded within
+ * {@link InvocationMetrics}.
  * \headerfile Ice/Ice.h
  */
 class ICE_CLASS(ICE_API) ChildInvocationMetrics : public ::Ice::ValueHelper<ChildInvocationMetrics, Metrics>
@@ -581,15 +574,15 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      * @param size The size of the invocation.
      * @param replySize The size of the invocation reply.
      */
     ChildInvocationMetrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures, long long int size, long long int replySize) :
-        Ice::ValueHelper<ChildInvocationMetrics, Metrics>(::std::move(id), total, current, totalLifetime, failures),
+        Ice::ValueHelper<ChildInvocationMetrics, Metrics>(id, total, current, totalLifetime, failures),
         size(size),
         replySize(replySize)
     {
@@ -599,7 +592,6 @@ public:
      * Obtains a tuple containing all of the value's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&, const long long int&, const int&, const long long int&, const int&, const long long int&, const long long int&> ice_tuple() const
     {
         return std::tie(id, total, current, totalLifetime, failures, size, replySize);
@@ -644,15 +636,15 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      * @param size The size of the invocation.
      * @param replySize The size of the invocation reply.
      */
     CollocatedMetrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures, long long int size, long long int replySize) :
-        Ice::ValueHelper<CollocatedMetrics, ChildInvocationMetrics>(::std::move(id), total, current, totalLifetime, failures, size, replySize)
+        Ice::ValueHelper<CollocatedMetrics, ChildInvocationMetrics>(id, total, current, totalLifetime, failures, size, replySize)
     {
     }
 
@@ -660,7 +652,6 @@ public:
      * Obtains a tuple containing all of the value's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&, const long long int&, const int&, const long long int&, const int&, const long long int&, const long long int&> ice_tuple() const
     {
         return std::tie(id, total, current, totalLifetime, failures, size, replySize);
@@ -675,8 +666,7 @@ public:
 
 /**
  * Provides information on invocations that are specifically sent over
- * Ice connections. Remote metrics are embedded within {@link
- * InvocationMetrics}.
+ * Ice connections. Remote metrics are embedded within {@link InvocationMetrics}.
  * \headerfile Ice/Ice.h
  */
 class ICE_CLASS(ICE_API) RemoteMetrics : public ::Ice::ValueHelper<RemoteMetrics, ChildInvocationMetrics>
@@ -695,15 +685,15 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      * @param size The size of the invocation.
      * @param replySize The size of the invocation reply.
      */
     RemoteMetrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures, long long int size, long long int replySize) :
-        Ice::ValueHelper<RemoteMetrics, ChildInvocationMetrics>(::std::move(id), total, current, totalLifetime, failures, size, replySize)
+        Ice::ValueHelper<RemoteMetrics, ChildInvocationMetrics>(id, total, current, totalLifetime, failures, size, replySize)
     {
     }
 
@@ -711,7 +701,6 @@ public:
      * Obtains a tuple containing all of the value's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&, const long long int&, const int&, const long long int&, const int&, const long long int&, const long long int&> ice_tuple() const
     {
         return std::tie(id, total, current, totalLifetime, failures, size, replySize);
@@ -745,8 +734,8 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      * @param retry The number of retries for the invocation(s).
@@ -754,12 +743,12 @@ public:
      * @param remotes The remote invocation metrics map.
      * @param collocated The collocated invocation metrics map.
      */
-    InvocationMetrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures, int retry, int userException, const MetricsMap& remotes, const MetricsMap& collocated) :
-        Ice::ValueHelper<InvocationMetrics, Metrics>(::std::move(id), total, current, totalLifetime, failures),
+    InvocationMetrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures, int retry, int userException, const ::IceMX::MetricsMap& remotes, const ::IceMX::MetricsMap& collocated) :
+        Ice::ValueHelper<InvocationMetrics, Metrics>(id, total, current, totalLifetime, failures),
         retry(retry),
         userException(userException),
-        remotes(::std::move(remotes)),
-        collocated(::std::move(collocated))
+        remotes(remotes),
+        collocated(collocated)
     {
     }
 
@@ -767,8 +756,7 @@ public:
      * Obtains a tuple containing all of the value's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const ::std::string&, const long long int&, const int&, const long long int&, const int&, const int&, const int&, const MetricsMap&, const MetricsMap&> ice_tuple() const
+    std::tuple<const ::std::string&, const long long int&, const int&, const long long int&, const int&, const int&, const int&, const ::IceMX::MetricsMap&, const ::IceMX::MetricsMap&> ice_tuple() const
     {
         return std::tie(id, total, current, totalLifetime, failures, retry, userException, remotes, collocated);
     }
@@ -791,12 +779,12 @@ public:
      * The remote invocation metrics map.
      * @see RemoteMetrics
      */
-    MetricsMap remotes;
+    ::IceMX::MetricsMap remotes;
     /**
      * The collocated invocation metrics map.
      * @see CollocatedMetrics
      */
-    MetricsMap collocated;
+    ::IceMX::MetricsMap collocated;
 };
 
 /**
@@ -820,15 +808,15 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      * @param receivedBytes The number of bytes received by the connection.
      * @param sentBytes The number of bytes sent by the connection.
      */
     ConnectionMetrics(const ::std::string& id, long long int total, int current, long long int totalLifetime, int failures, long long int receivedBytes, long long int sentBytes) :
-        Ice::ValueHelper<ConnectionMetrics, Metrics>(::std::move(id), total, current, totalLifetime, failures),
+        Ice::ValueHelper<ConnectionMetrics, Metrics>(id, total, current, totalLifetime, failures),
         receivedBytes(receivedBytes),
         sentBytes(sentBytes)
     {
@@ -838,7 +826,6 @@ public:
      * Obtains a tuple containing all of the value's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&, const long long int&, const int&, const long long int&, const int&, const long long int&, const long long int&> ice_tuple() const
     {
         return std::tie(id, total, current, totalLifetime, failures, receivedBytes, sentBytes);
@@ -919,7 +906,7 @@ public:
         {
             response(::std::move(_result.returnValue), ::std::move(_result.disabledViews));
         };
-        return _makeLamdaOutgoing<MetricsAdmin::GetMetricsViewNamesResult>(_responseCb, ex, sent, this, &MetricsAdminPrx::_iceI_getMetricsViewNames, context);
+        return _makeLamdaOutgoing<MetricsAdmin::GetMetricsViewNamesResult>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceMX::MetricsAdminPrx::_iceI_getMetricsViewNames, context);
     }
 
     /// \cond INTERNAL
@@ -967,7 +954,7 @@ public:
                            ::std::function<void(bool)> sent = nullptr,
                            const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makeLamdaOutgoing<void>(response, ex, sent, this, &MetricsAdminPrx::_iceI_enableMetricsView, name, context);
+        return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &IceMX::MetricsAdminPrx::_iceI_enableMetricsView, name, context);
     }
 
     /// \cond INTERNAL
@@ -1015,7 +1002,7 @@ public:
                             ::std::function<void(bool)> sent = nullptr,
                             const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makeLamdaOutgoing<void>(response, ex, sent, this, &MetricsAdminPrx::_iceI_disableMetricsView, name, context);
+        return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this, &IceMX::MetricsAdminPrx::_iceI_disableMetricsView, name, context);
     }
 
     /// \cond INTERNAL
@@ -1075,7 +1062,7 @@ public:
      */
     ::std::function<void()>
     getMetricsViewAsync(const ::std::string& view,
-                        ::std::function<void(MetricsView, long long int)> response,
+                        ::std::function<void(::IceMX::MetricsView, long long int)> response,
                         ::std::function<void(::std::exception_ptr)> ex = nullptr,
                         ::std::function<void(bool)> sent = nullptr,
                         const ::Ice::Context& context = ::Ice::noExplicitContext)
@@ -1084,7 +1071,7 @@ public:
         {
             response(::std::move(_result.returnValue), _result.timestamp);
         };
-        return _makeLamdaOutgoing<MetricsAdmin::GetMetricsViewResult>(_responseCb, ex, sent, this, &MetricsAdminPrx::_iceI_getMetricsView, view, context);
+        return _makeLamdaOutgoing<MetricsAdmin::GetMetricsViewResult>(std::move(_responseCb), std::move(ex), std::move(sent), this, &IceMX::MetricsAdminPrx::_iceI_getMetricsView, view, context);
     }
 
     /// \cond INTERNAL
@@ -1102,7 +1089,7 @@ public:
      */
     MetricsFailuresSeq getMapMetricsFailures(const ::std::string& view, const ::std::string& map, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makePromiseOutgoing<MetricsFailuresSeq>(true, this, &MetricsAdminPrx::_iceI_getMapMetricsFailures, view, map, context).get();
+        return _makePromiseOutgoing<::IceMX::MetricsFailuresSeq>(true, this, &MetricsAdminPrx::_iceI_getMapMetricsFailures, view, map, context).get();
     }
 
     /**
@@ -1114,9 +1101,9 @@ public:
      */
     template<template<typename> class P = ::std::promise>
     auto getMapMetricsFailuresAsync(const ::std::string& view, const ::std::string& map, const ::Ice::Context& context = ::Ice::noExplicitContext)
-        -> decltype(::std::declval<P<MetricsFailuresSeq>>().get_future())
+        -> decltype(::std::declval<P<::IceMX::MetricsFailuresSeq>>().get_future())
     {
-        return _makePromiseOutgoing<MetricsFailuresSeq, P>(false, this, &MetricsAdminPrx::_iceI_getMapMetricsFailures, view, map, context);
+        return _makePromiseOutgoing<::IceMX::MetricsFailuresSeq, P>(false, this, &MetricsAdminPrx::_iceI_getMapMetricsFailures, view, map, context);
     }
 
     /**
@@ -1131,16 +1118,16 @@ public:
      */
     ::std::function<void()>
     getMapMetricsFailuresAsync(const ::std::string& view, const ::std::string& map,
-                               ::std::function<void(MetricsFailuresSeq)> response,
+                               ::std::function<void(::IceMX::MetricsFailuresSeq)> response,
                                ::std::function<void(::std::exception_ptr)> ex = nullptr,
                                ::std::function<void(bool)> sent = nullptr,
                                const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makeLamdaOutgoing<MetricsFailuresSeq>(response, ex, sent, this, &MetricsAdminPrx::_iceI_getMapMetricsFailures, view, map, context);
+        return _makeLamdaOutgoing<::IceMX::MetricsFailuresSeq>(std::move(response), std::move(ex), std::move(sent), this, &IceMX::MetricsAdminPrx::_iceI_getMapMetricsFailures, view, map, context);
     }
 
     /// \cond INTERNAL
-    ICE_MEMBER(ICE_API) void _iceI_getMapMetricsFailures(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<MetricsFailuresSeq>>&, const ::std::string&, const ::std::string&, const ::Ice::Context&);
+    ICE_MEMBER(ICE_API) void _iceI_getMapMetricsFailures(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::IceMX::MetricsFailuresSeq>>&, const ::std::string&, const ::std::string&, const ::Ice::Context&);
     /// \endcond
 
     /**
@@ -1155,7 +1142,7 @@ public:
      */
     MetricsFailures getMetricsFailures(const ::std::string& view, const ::std::string& map, const ::std::string& id, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makePromiseOutgoing<MetricsFailures>(true, this, &MetricsAdminPrx::_iceI_getMetricsFailures, view, map, id, context).get();
+        return _makePromiseOutgoing<::IceMX::MetricsFailures>(true, this, &MetricsAdminPrx::_iceI_getMetricsFailures, view, map, id, context).get();
     }
 
     /**
@@ -1168,9 +1155,9 @@ public:
      */
     template<template<typename> class P = ::std::promise>
     auto getMetricsFailuresAsync(const ::std::string& view, const ::std::string& map, const ::std::string& id, const ::Ice::Context& context = ::Ice::noExplicitContext)
-        -> decltype(::std::declval<P<MetricsFailures>>().get_future())
+        -> decltype(::std::declval<P<::IceMX::MetricsFailures>>().get_future())
     {
-        return _makePromiseOutgoing<MetricsFailures, P>(false, this, &MetricsAdminPrx::_iceI_getMetricsFailures, view, map, id, context);
+        return _makePromiseOutgoing<::IceMX::MetricsFailures, P>(false, this, &MetricsAdminPrx::_iceI_getMetricsFailures, view, map, id, context);
     }
 
     /**
@@ -1186,16 +1173,16 @@ public:
      */
     ::std::function<void()>
     getMetricsFailuresAsync(const ::std::string& view, const ::std::string& map, const ::std::string& id,
-                            ::std::function<void(MetricsFailures)> response,
+                            ::std::function<void(::IceMX::MetricsFailures)> response,
                             ::std::function<void(::std::exception_ptr)> ex = nullptr,
                             ::std::function<void(bool)> sent = nullptr,
                             const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makeLamdaOutgoing<MetricsFailures>(response, ex, sent, this, &MetricsAdminPrx::_iceI_getMetricsFailures, view, map, id, context);
+        return _makeLamdaOutgoing<::IceMX::MetricsFailures>(std::move(response), std::move(ex), std::move(sent), this, &IceMX::MetricsAdminPrx::_iceI_getMetricsFailures, view, map, id, context);
     }
 
     /// \cond INTERNAL
-    ICE_MEMBER(ICE_API) void _iceI_getMetricsFailures(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<MetricsFailures>>&, const ::std::string&, const ::std::string&, const ::std::string&, const ::Ice::Context&);
+    ICE_MEMBER(ICE_API) void _iceI_getMetricsFailures(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::IceMX::MetricsFailures>>&, const ::std::string&, const ::std::string&, const ::std::string&, const ::Ice::Context&);
     /// \endcond
 
     /**
@@ -1407,56 +1394,56 @@ namespace IceMX
 
 class Metrics;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::Metrics>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::IceMX::Metrics*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< Metrics>&);
+ICE_API ::IceProxy::Ice::Object* upCast(Metrics*);
 /// \endcond
 
 class MetricsAdmin;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::MetricsAdmin>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::IceMX::MetricsAdmin*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< MetricsAdmin>&);
+ICE_API ::IceProxy::Ice::Object* upCast(MetricsAdmin*);
 /// \endcond
 
 class ThreadMetrics;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::ThreadMetrics>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::IceMX::ThreadMetrics*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ThreadMetrics>&);
+ICE_API ::IceProxy::Ice::Object* upCast(ThreadMetrics*);
 /// \endcond
 
 class DispatchMetrics;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::DispatchMetrics>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::IceMX::DispatchMetrics*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< DispatchMetrics>&);
+ICE_API ::IceProxy::Ice::Object* upCast(DispatchMetrics*);
 /// \endcond
 
 class ChildInvocationMetrics;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::ChildInvocationMetrics>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::IceMX::ChildInvocationMetrics*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ChildInvocationMetrics>&);
+ICE_API ::IceProxy::Ice::Object* upCast(ChildInvocationMetrics*);
 /// \endcond
 
 class CollocatedMetrics;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::CollocatedMetrics>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::IceMX::CollocatedMetrics*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< CollocatedMetrics>&);
+ICE_API ::IceProxy::Ice::Object* upCast(CollocatedMetrics*);
 /// \endcond
 
 class RemoteMetrics;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::RemoteMetrics>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::IceMX::RemoteMetrics*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< RemoteMetrics>&);
+ICE_API ::IceProxy::Ice::Object* upCast(RemoteMetrics*);
 /// \endcond
 
 class InvocationMetrics;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::InvocationMetrics>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::IceMX::InvocationMetrics*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< InvocationMetrics>&);
+ICE_API ::IceProxy::Ice::Object* upCast(InvocationMetrics*);
 /// \endcond
 
 class ConnectionMetrics;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::IceMX::ConnectionMetrics>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::IceMX::ConnectionMetrics*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ConnectionMetrics>&);
+ICE_API ::IceProxy::Ice::Object* upCast(ConnectionMetrics*);
 /// \endcond
 
 }
@@ -1573,7 +1560,7 @@ namespace IceMX
 /**
  * A dictionnary of strings to integers.
  */
-typedef ::std::map< ::std::string, Ice::Int> StringIntDict;
+typedef ::std::map< ::std::string, ::Ice::Int> StringIntDict;
 
 /**
  * A structure to keep track of failures associated with a given
@@ -1590,13 +1577,13 @@ struct MetricsFailures
     /**
      * The failures observed for this metrics.
      */
-    StringIntDict failures;
+    ::IceMX::StringIntDict failures;
 };
 
 /**
  * A sequence of {@link MetricsFailures}.
  */
-typedef ::std::vector<IceMX::MetricsFailures> MetricsFailuresSeq;
+typedef ::std::vector<MetricsFailures> MetricsFailuresSeq;
 
 /**
  * A metrics map is a sequence of metrics. We use a sequence here
@@ -1604,13 +1591,13 @@ typedef ::std::vector<IceMX::MetricsFailures> MetricsFailuresSeq;
  * in the Metrics class and using sequences of metrics objects is more
  * efficient than using dictionaries since lookup is not necessary.
  */
-typedef ::std::vector<IceMX::MetricsPtr> MetricsMap;
+typedef ::std::vector<MetricsPtr> MetricsMap;
 
 /**
  * A metrics view is a dictionary of metrics map. The key of the
  * dictionary is the name of the metrics map.
  */
-typedef ::std::map< ::std::string, IceMX::MetricsMap> MetricsView;
+typedef ::std::map< ::std::string, MetricsMap> MetricsView;
 
 /**
  * Raised if a metrics view cannot be found.
@@ -1621,7 +1608,13 @@ class ICE_API UnknownMetricsView : public ::Ice::UserException
 public:
 
     UnknownMetricsView() {}
+
+#ifdef ICE_CPP11_COMPILER
+    UnknownMetricsView(const UnknownMetricsView&) = default;
+    virtual ~UnknownMetricsView();
+#else
     virtual ~UnknownMetricsView() throw();
+#endif
 
     /**
      * Obtains the Slice type ID of this exception.
@@ -1629,7 +1622,7 @@ public:
      */
     virtual ::std::string ice_id() const;
     /**
-     * Polymporphically clones this exception.
+     * Polymorphically clones this exception.
      * @return A shallow copy of this exception.
      */
     virtual UnknownMetricsView* ice_clone() const;
@@ -2473,8 +2466,8 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      */
@@ -2487,8 +2480,13 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    Metrics(const Metrics&) = default;
+    Metrics& operator=(const Metrics&) = default;
+#endif
+
     /**
-     * Polymporphically clones this object.
+     * Polymorphically clones this object.
      * @return A shallow copy of this object.
      */
     virtual ::Ice::ObjectPtr ice_clone() const;
@@ -2541,16 +2539,19 @@ public:
      */
     ::std::string id;
     /**
-     * The total number of objects that were observed by this metrics.
+     * The total number of objects observed by this metrics. This includes
+     * the number of currently observed objects and the number of objects
+     * observed in the past.
      */
     ::Ice::Long total;
     /**
-     * The current number of objects observed by this metrics.
+     * The number of objects currently observed by this metrics.
      */
     ::Ice::Int current;
     /**
      * The sum of the lifetime of each observed objects. This does not
-     * include the lifetime of objects which are currently observed.
+     * include the lifetime of objects which are currently observed,
+     * only the objects observed in the past.
      */
     ::Ice::Long totalLifetime;
     /**
@@ -2590,6 +2591,12 @@ public:
 
     virtual ~MetricsAdmin();
 
+#ifdef ICE_CPP11_COMPILER
+    MetricsAdmin() = default;
+    MetricsAdmin(const MetricsAdmin&) = default;
+    MetricsAdmin& operator=(const MetricsAdmin&) = default;
+#endif
+
     /**
      * Determines whether this object supports an interface with the given Slice type ID.
      * @param id The fully-scoped Slice type ID.
@@ -2750,8 +2757,8 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      * @param inUseForIO The number of threads which are currently performing socket read or writes.
@@ -2766,8 +2773,13 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    ThreadMetrics(const ThreadMetrics&) = default;
+    ThreadMetrics& operator=(const ThreadMetrics&) = default;
+#endif
+
     /**
-     * Polymporphically clones this object.
+     * Polymorphically clones this object.
      * @return A shallow copy of this object.
      */
     virtual ::Ice::ObjectPtr ice_clone() const;
@@ -2873,8 +2885,8 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      * @param userException The number of dispatch that failed with a user exception.
@@ -2889,8 +2901,13 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    DispatchMetrics(const DispatchMetrics&) = default;
+    DispatchMetrics& operator=(const DispatchMetrics&) = default;
+#endif
+
     /**
-     * Polymporphically clones this object.
+     * Polymorphically clones this object.
      * @return A shallow copy of this object.
      */
     virtual ::Ice::ObjectPtr ice_clone() const;
@@ -2973,8 +2990,8 @@ inline bool operator<(const DispatchMetrics& lhs, const DispatchMetrics& rhs)
  * Provides information on child invocations. A child invocation is
  * either remote (sent over an Ice connection) or collocated. An
  * invocation can have multiple child invocation if it is
- * retried. Child invocation metrics are embedded within {@link
- * InvocationMetrics}.
+ * retried. Child invocation metrics are embedded within
+ * {@link InvocationMetrics}.
  * \headerfile Ice/Ice.h
  */
 class ICE_API ChildInvocationMetrics : public Metrics
@@ -2996,8 +3013,8 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      * @param size The size of the invocation.
@@ -3010,8 +3027,13 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    ChildInvocationMetrics(const ChildInvocationMetrics&) = default;
+    ChildInvocationMetrics& operator=(const ChildInvocationMetrics&) = default;
+#endif
+
     /**
-     * Polymporphically clones this object.
+     * Polymorphically clones this object.
      * @return A shallow copy of this object.
      */
     virtual ::Ice::ObjectPtr ice_clone() const;
@@ -3107,8 +3129,8 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      * @param size The size of the invocation.
@@ -3119,8 +3141,13 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    CollocatedMetrics(const CollocatedMetrics&) = default;
+    CollocatedMetrics& operator=(const CollocatedMetrics&) = default;
+#endif
+
     /**
-     * Polymporphically clones this object.
+     * Polymorphically clones this object.
      * @return A shallow copy of this object.
      */
     virtual ::Ice::ObjectPtr ice_clone() const;
@@ -3184,8 +3211,7 @@ inline bool operator<(const CollocatedMetrics& lhs, const CollocatedMetrics& rhs
 
 /**
  * Provides information on invocations that are specifically sent over
- * Ice connections. Remote metrics are embedded within {@link
- * InvocationMetrics}.
+ * Ice connections. Remote metrics are embedded within {@link InvocationMetrics}.
  * \headerfile Ice/Ice.h
  */
 class ICE_API RemoteMetrics : public ChildInvocationMetrics
@@ -3204,8 +3230,8 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      * @param size The size of the invocation.
@@ -3216,8 +3242,13 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    RemoteMetrics(const RemoteMetrics&) = default;
+    RemoteMetrics& operator=(const RemoteMetrics&) = default;
+#endif
+
     /**
-     * Polymporphically clones this object.
+     * Polymorphically clones this object.
      * @return A shallow copy of this object.
      */
     virtual ::Ice::ObjectPtr ice_clone() const;
@@ -3303,8 +3334,8 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      * @param retry The number of retries for the invocation(s).
@@ -3312,7 +3343,7 @@ public:
      * @param remotes The remote invocation metrics map.
      * @param collocated The collocated invocation metrics map.
      */
-    InvocationMetrics(const ::std::string& id, ::Ice::Long total, ::Ice::Int current, ::Ice::Long totalLifetime, ::Ice::Int failures, ::Ice::Int retry, ::Ice::Int userException, const MetricsMap& remotes, const MetricsMap& collocated) :
+    InvocationMetrics(const ::std::string& id, ::Ice::Long total, ::Ice::Int current, ::Ice::Long totalLifetime, ::Ice::Int failures, ::Ice::Int retry, ::Ice::Int userException, const ::IceMX::MetricsMap& remotes, const ::IceMX::MetricsMap& collocated) :
         ::IceMX::Metrics(id, total, current, totalLifetime, failures),
         retry(retry),
         userException(userException),
@@ -3321,8 +3352,13 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    InvocationMetrics(const InvocationMetrics&) = default;
+    InvocationMetrics& operator=(const InvocationMetrics&) = default;
+#endif
+
     /**
-     * Polymporphically clones this object.
+     * Polymorphically clones this object.
      * @return A shallow copy of this object.
      */
     virtual ::Ice::ObjectPtr ice_clone() const;
@@ -3385,12 +3421,12 @@ public:
      * The remote invocation metrics map.
      * @see RemoteMetrics
      */
-    MetricsMap remotes;
+    ::IceMX::MetricsMap remotes;
     /**
      * The collocated invocation metrics map.
      * @see CollocatedMetrics
      */
-    MetricsMap collocated;
+    ::IceMX::MetricsMap collocated;
 };
 /// \cond INTERNAL
 static ::Ice::ValueFactoryPtr _iceS_InvocationMetrics_init = ::IceMX::InvocationMetrics::ice_factory();
@@ -3432,8 +3468,8 @@ public:
     /**
      * One-shot constructor to initialize all data members.
      * @param id The metrics identifier.
-     * @param total The total number of objects that were observed by this metrics.
-     * @param current The current number of objects observed by this metrics.
+     * @param total The total number of objects observed by this metrics.
+     * @param current The number of objects currently observed by this metrics.
      * @param totalLifetime The sum of the lifetime of each observed objects.
      * @param failures The number of failures observed.
      * @param receivedBytes The number of bytes received by the connection.
@@ -3446,8 +3482,13 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    ConnectionMetrics(const ConnectionMetrics&) = default;
+    ConnectionMetrics& operator=(const ConnectionMetrics&) = default;
+#endif
+
     /**
-     * Polymporphically clones this object.
+     * Polymorphically clones this object.
      * @return A shallow copy of this object.
      */
     virtual ::Ice::ObjectPtr ice_clone() const;