zeroc-ice 3.7.2 → 3.7.3

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -42,10 +42,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -95,7 +95,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();
@@ -131,7 +130,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();
@@ -163,7 +161,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();
@@ -194,7 +191,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();
@@ -225,7 +221,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();
@@ -534,7 +529,7 @@ public:
      */
     ::std::shared_ptr<ObjectPrx> findObjectById(const Identity& id, const Context& context = noExplicitContext)
     {
-        return _makePromiseOutgoing<::std::shared_ptr<ObjectPrx>>(true, this, &LocatorPrx::_iceI_findObjectById, id, context).get();
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::ObjectPrx>>(true, this, &LocatorPrx::_iceI_findObjectById, id, context).get();
     }
 
     /**
@@ -547,9 +542,9 @@ public:
      */
     template<template<typename> class P = ::std::promise>
     auto findObjectByIdAsync(const Identity& id, 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, &LocatorPrx::_iceI_findObjectById, id, context);
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::ObjectPrx>, P>(false, this, &LocatorPrx::_iceI_findObjectById, id, context);
     }
 
     /**
@@ -565,16 +560,16 @@ public:
      */
     ::std::function<void()>
     findObjectByIdAsync(const Identity& id,
-                        ::std::function<void(::std::shared_ptr<ObjectPrx>)> response,
+                        ::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, &Ice::LocatorPrx::_iceI_findObjectById, id, context);
+        return _makeLamdaOutgoing<::std::shared_ptr<::Ice::ObjectPrx>>(response, ex, sent, this, &Ice::LocatorPrx::_iceI_findObjectById, id, context);
     }
 
     /// \cond INTERNAL
-    ICE_MEMBER(ICE_API) void _iceI_findObjectById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<ObjectPrx>>>&, const Identity&, const Context&);
+    ICE_MEMBER(ICE_API) void _iceI_findObjectById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::ObjectPrx>>>&, const Identity&, const Context&);
     /// \endcond
 
     /**
@@ -588,7 +583,7 @@ public:
      */
     ::std::shared_ptr<ObjectPrx> findAdapterById(const ::std::string& id, const Context& context = noExplicitContext)
     {
-        return _makePromiseOutgoing<::std::shared_ptr<ObjectPrx>>(true, this, &LocatorPrx::_iceI_findAdapterById, id, context).get();
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::ObjectPrx>>(true, this, &LocatorPrx::_iceI_findAdapterById, id, context).get();
     }
 
     /**
@@ -600,9 +595,9 @@ public:
      */
     template<template<typename> class P = ::std::promise>
     auto findAdapterByIdAsync(const ::std::string& id, 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, &LocatorPrx::_iceI_findAdapterById, id, context);
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::ObjectPrx>, P>(false, this, &LocatorPrx::_iceI_findAdapterById, id, context);
     }
 
     /**
@@ -617,16 +612,16 @@ public:
      */
     ::std::function<void()>
     findAdapterByIdAsync(const ::std::string& id,
-                         ::std::function<void(::std::shared_ptr<ObjectPrx>)> response,
+                         ::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, &Ice::LocatorPrx::_iceI_findAdapterById, id, context);
+        return _makeLamdaOutgoing<::std::shared_ptr<::Ice::ObjectPrx>>(response, ex, sent, this, &Ice::LocatorPrx::_iceI_findAdapterById, id, context);
     }
 
     /// \cond INTERNAL
-    ICE_MEMBER(ICE_API) void _iceI_findAdapterById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<ObjectPrx>>>&, const ::std::string&, const Context&);
+    ICE_MEMBER(ICE_API) void _iceI_findAdapterById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::ObjectPrx>>>&, const ::std::string&, const Context&);
     /// \endcond
 
     /**
@@ -636,7 +631,7 @@ public:
      */
     ::std::shared_ptr<LocatorRegistryPrx> getRegistry(const Context& context = noExplicitContext)
     {
-        return _makePromiseOutgoing<::std::shared_ptr<LocatorRegistryPrx>>(true, this, &LocatorPrx::_iceI_getRegistry, context).get();
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::LocatorRegistryPrx>>(true, this, &LocatorPrx::_iceI_getRegistry, context).get();
     }
 
     /**
@@ -646,9 +641,9 @@ public:
      */
     template<template<typename> class P = ::std::promise>
     auto getRegistryAsync(const Context& context = noExplicitContext)
-        -> decltype(::std::declval<P<::std::shared_ptr<LocatorRegistryPrx>>>().get_future())
+        -> decltype(::std::declval<P<::std::shared_ptr<::Ice::LocatorRegistryPrx>>>().get_future())
     {
-        return _makePromiseOutgoing<::std::shared_ptr<LocatorRegistryPrx>, P>(false, this, &LocatorPrx::_iceI_getRegistry, context);
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::LocatorRegistryPrx>, P>(false, this, &LocatorPrx::_iceI_getRegistry, context);
     }
 
     /**
@@ -660,16 +655,16 @@ public:
      * @return A function that can be called to cancel the invocation locally.
      */
     ::std::function<void()>
-    getRegistryAsync(::std::function<void(::std::shared_ptr<LocatorRegistryPrx>)> response,
+    getRegistryAsync(::std::function<void(::std::shared_ptr<::Ice::LocatorRegistryPrx>)> response,
                      ::std::function<void(::std::exception_ptr)> ex = nullptr,
                      ::std::function<void(bool)> sent = nullptr,
                      const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<::std::shared_ptr<LocatorRegistryPrx>>(response, ex, sent, this, &Ice::LocatorPrx::_iceI_getRegistry, context);
+        return _makeLamdaOutgoing<::std::shared_ptr<::Ice::LocatorRegistryPrx>>(response, ex, sent, this, &Ice::LocatorPrx::_iceI_getRegistry, context);
     }
 
     /// \cond INTERNAL
-    ICE_MEMBER(ICE_API) void _iceI_getRegistry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<LocatorRegistryPrx>>>&, const Context&);
+    ICE_MEMBER(ICE_API) void _iceI_getRegistry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::LocatorRegistryPrx>>>&, const Context&);
     /// \endcond
 
     /**
@@ -917,7 +912,7 @@ public:
      */
     ::std::shared_ptr<LocatorPrx> getLocator(const Context& context = noExplicitContext)
     {
-        return _makePromiseOutgoing<::std::shared_ptr<LocatorPrx>>(true, this, &LocatorFinderPrx::_iceI_getLocator, context).get();
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::LocatorPrx>>(true, this, &LocatorFinderPrx::_iceI_getLocator, context).get();
     }
 
     /**
@@ -928,9 +923,9 @@ public:
      */
     template<template<typename> class P = ::std::promise>
     auto getLocatorAsync(const Context& context = noExplicitContext)
-        -> decltype(::std::declval<P<::std::shared_ptr<LocatorPrx>>>().get_future())
+        -> decltype(::std::declval<P<::std::shared_ptr<::Ice::LocatorPrx>>>().get_future())
     {
-        return _makePromiseOutgoing<::std::shared_ptr<LocatorPrx>, P>(false, this, &LocatorFinderPrx::_iceI_getLocator, context);
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::LocatorPrx>, P>(false, this, &LocatorFinderPrx::_iceI_getLocator, context);
     }
 
     /**
@@ -943,16 +938,16 @@ public:
      * @return A function that can be called to cancel the invocation locally.
      */
     ::std::function<void()>
-    getLocatorAsync(::std::function<void(::std::shared_ptr<LocatorPrx>)> response,
+    getLocatorAsync(::std::function<void(::std::shared_ptr<::Ice::LocatorPrx>)> response,
                     ::std::function<void(::std::exception_ptr)> ex = nullptr,
                     ::std::function<void(bool)> sent = nullptr,
                     const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<::std::shared_ptr<LocatorPrx>>(response, ex, sent, this, &Ice::LocatorFinderPrx::_iceI_getLocator, context);
+        return _makeLamdaOutgoing<::std::shared_ptr<::Ice::LocatorPrx>>(response, ex, sent, this, &Ice::LocatorFinderPrx::_iceI_getLocator, context);
     }
 
     /// \cond INTERNAL
-    ICE_MEMBER(ICE_API) void _iceI_getLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<LocatorPrx>>>&, const Context&);
+    ICE_MEMBER(ICE_API) void _iceI_getLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::LocatorPrx>>>&, const Context&);
     /// \endcond
 
     /**

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -33,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -32,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -32,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -40,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -99,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);
     }
@@ -149,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();
@@ -355,8 +353,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.
      */
@@ -373,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);
@@ -390,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;
     /**
@@ -433,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.
@@ -453,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);
@@ -504,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.
@@ -524,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);
@@ -556,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>
@@ -576,8 +574,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.
@@ -594,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);
@@ -639,8 +636,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.
@@ -655,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);
@@ -689,8 +685,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.
@@ -705,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);
@@ -739,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).
@@ -748,7 +743,7 @@ 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) :
+    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>(::std::move(id), total, current, totalLifetime, failures),
         retry(retry),
         userException(userException),
@@ -761,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);
     }
@@ -785,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;
 };
 
 /**
@@ -814,8 +808,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.
@@ -832,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);
@@ -1069,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)
@@ -1096,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();
     }
 
     /**
@@ -1108,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);
     }
 
     /**
@@ -1125,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, &IceMX::MetricsAdminPrx::_iceI_getMapMetricsFailures, view, map, context);
+        return _makeLamdaOutgoing<::IceMX::MetricsFailuresSeq>(response, ex, 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
 
     /**
@@ -1149,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();
     }
 
     /**
@@ -1162,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);
     }
 
     /**
@@ -1180,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, &IceMX::MetricsAdminPrx::_iceI_getMetricsFailures, view, map, id, context);
+        return _makeLamdaOutgoing<::IceMX::MetricsFailures>(response, ex, 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
 
     /**
@@ -1584,7 +1577,7 @@ struct MetricsFailures
     /**
      * The failures observed for this metrics.
      */
-    StringIntDict failures;
+    ::IceMX::StringIntDict failures;
 };
 
 /**
@@ -2467,8 +2460,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.
      */
@@ -2535,16 +2528,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;
     /**
@@ -2744,8 +2740,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.
@@ -2867,8 +2863,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.
@@ -2967,8 +2963,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
@@ -2990,8 +2986,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.
@@ -3101,8 +3097,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.
@@ -3197,8 +3193,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.
@@ -3296,8 +3292,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).
@@ -3305,7 +3301,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),
@@ -3378,12 +3374,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();
@@ -3425,8 +3421,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.