zeroc-ice 3.7.1 → 3.7.2

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.2
 //
 // <auto-generated>
 //
@@ -41,7 +36,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -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.2
 //
 // <auto-generated>
 //
@@ -40,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/Ice/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.2
 //
 // <auto-generated>
 //
@@ -40,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/Ice/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.2
 //
 // <auto-generated>
 //
@@ -48,7 +43,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -675,8 +670,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>
@@ -919,7 +913,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>(_responseCb, ex, sent, this, &IceMX::MetricsAdminPrx::_iceI_getMetricsViewNames, context);
     }
 
     /// \cond INTERNAL
@@ -967,7 +961,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>(response, ex, sent, this, &IceMX::MetricsAdminPrx::_iceI_enableMetricsView, name, context);
     }
 
     /// \cond INTERNAL
@@ -1015,7 +1009,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>(response, ex, sent, this, &IceMX::MetricsAdminPrx::_iceI_disableMetricsView, name, context);
     }
 
     /// \cond INTERNAL
@@ -1084,7 +1078,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>(_responseCb, ex, sent, this, &IceMX::MetricsAdminPrx::_iceI_getMetricsView, view, context);
     }
 
     /// \cond INTERNAL
@@ -1136,7 +1130,7 @@ public:
                                ::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<MetricsFailuresSeq>(response, ex, sent, this, &IceMX::MetricsAdminPrx::_iceI_getMapMetricsFailures, view, map, context);
     }
 
     /// \cond INTERNAL
@@ -1191,7 +1185,7 @@ public:
                             ::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<MetricsFailures>(response, ex, sent, this, &IceMX::MetricsAdminPrx::_iceI_getMetricsFailures, view, map, id, context);
     }
 
     /// \cond INTERNAL
@@ -1407,56 +1401,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 +1567,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
@@ -1596,7 +1590,7 @@ struct MetricsFailures
 /**
  * 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 +1598,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.
@@ -3184,8 +3178,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

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -53,7 +48,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -217,7 +212,7 @@ public:
     virtual ::std::shared_ptr<::Ice::ObjectPrx> add(const ::std::shared_ptr<Object>& servant, const Identity& id) = 0;
 
     /**
-     * Like {@link #add}, but with a facet. Calling <tt>add(servant, id)</tt>
+     * Like {@link #add}, but with a facet. Calling <code>add(servant, id)</code>
      * is equivalent to calling {@link #addFacet} with an empty facet.
      * @param servant The servant to add.
      * @param id The identity of the Ice object that is implemented by
@@ -237,7 +232,7 @@ public:
      * Add a servant to this object adapter's Active Servant Map,
      * using an automatically generated UUID as its identity. Note that
      * the generated UUID identity can be accessed using the proxy's
-     * <tt>ice_getIdentity</tt> operation.
+     * <code>ice_getIdentity</code> operation.
      * @param servant The servant to add.
      * @return A proxy that matches the generated UUID identity and
      * this object adapter.
@@ -251,7 +246,7 @@ public:
 
     /**
      * Like {@link #addWithUUID}, but with a facet. Calling
-     * <tt>addWithUUID(servant)</tt> is equivalent to calling
+     * <code>addWithUUID(servant)</code> is equivalent to calling
      * {@link #addFacetWithUUID} with an empty facet.
      * @param servant The servant to add.
      * @param facet The facet. An empty facet means the default
@@ -317,7 +312,7 @@ public:
     virtual ::std::shared_ptr<::Ice::Object> remove(const Identity& id) = 0;
 
     /**
-     * Like {@link #remove}, but with a facet. Calling <tt>remove(id)</tt>
+     * Like {@link #remove}, but with a facet. Calling <code>remove(id)</code>
      * is equivalent to calling {@link #removeFacet} with an empty facet.
      * @param id The identity of the Ice object that is implemented by
      * the servant.
@@ -371,7 +366,7 @@ public:
     virtual ::std::shared_ptr<::Ice::Object> find(const Identity& id) const = 0;
 
     /**
-     * Like {@link #find}, but with a facet. Calling <tt>find(id)</tt>
+     * Like {@link #find}, but with a facet. Calling <code>find(id)</code>
      * is equivalent to calling {@link #findFacet} with an empty
      * facet.
      * @param id The identity of the Ice object for which the
@@ -780,7 +775,7 @@ public:
     virtual ObjectPrx add(const ObjectPtr& servant, const Identity& id) = 0;
 
     /**
-     * Like {@link #add}, but with a facet. Calling <tt>add(servant, id)</tt>
+     * Like {@link #add}, but with a facet. Calling <code>add(servant, id)</code>
      * is equivalent to calling {@link #addFacet} with an empty facet.
      * @param servant The servant to add.
      * @param id The identity of the Ice object that is implemented by
@@ -800,7 +795,7 @@ public:
      * Add a servant to this object adapter's Active Servant Map,
      * using an automatically generated UUID as its identity. Note that
      * the generated UUID identity can be accessed using the proxy's
-     * <tt>ice_getIdentity</tt> operation.
+     * <code>ice_getIdentity</code> operation.
      * @param servant The servant to add.
      * @return A proxy that matches the generated UUID identity and
      * this object adapter.
@@ -814,7 +809,7 @@ public:
 
     /**
      * Like {@link #addWithUUID}, but with a facet. Calling
-     * <tt>addWithUUID(servant)</tt> is equivalent to calling
+     * <code>addWithUUID(servant)</code> is equivalent to calling
      * {@link #addFacetWithUUID} with an empty facet.
      * @param servant The servant to add.
      * @param facet The facet. An empty facet means the default
@@ -880,7 +875,7 @@ public:
     virtual ObjectPtr remove(const Identity& id) = 0;
 
     /**
-     * Like {@link #remove}, but with a facet. Calling <tt>remove(id)</tt>
+     * Like {@link #remove}, but with a facet. Calling <code>remove(id)</code>
      * is equivalent to calling {@link #removeFacet} with an empty facet.
      * @param id The identity of the Ice object that is implemented by
      * the servant.
@@ -934,7 +929,7 @@ public:
     virtual ObjectPtr find(const Identity& id) const = 0;
 
     /**
-     * Like {@link #find}, but with a facet. Calling <tt>find(id)</tt>
+     * Like {@link #find}, but with a facet. Calling <code>find(id)</code>
      * is equivalent to calling {@link #findFacet} with an empty
      * facet.
      * @param id The identity of the Ice object for which the

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

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

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -40,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -85,10 +80,10 @@ public:
      * Create a new object for a given object type. The type is the
      * absolute Slice type id, i.e., the id relative to the
      * unnamed top-level Slice module. For example, the absolute
-     * Slice type id for interfaces of type <tt>Bar</tt> in the module
-     * <tt>Foo</tt> is <tt>"::Foo::Bar"</tt>.
+     * Slice type id for interfaces of type <code>Bar</code> in the module
+     * <code>Foo</code> is <code>"::Foo::Bar"</code>.
      *
-     * <p class="Note">The leading "<tt>::</tt>" is required.
+     * <p class="Note">The leading "<code>::</code>" is required.
      * @param type The object type.
      * @return The object created for the given type, or nil if the
      * factory is unable to create the object.
@@ -157,10 +152,10 @@ public:
      * Create a new object for a given object type. The type is the
      * absolute Slice type id, i.e., the id relative to the
      * unnamed top-level Slice module. For example, the absolute
-     * Slice type id for interfaces of type <tt>Bar</tt> in the module
-     * <tt>Foo</tt> is <tt>"::Foo::Bar"</tt>.
+     * Slice type id for interfaces of type <code>Bar</code> in the module
+     * <code>Foo</code> is <code>"::Foo::Bar"</code>.
      *
-     * <p class="Note">The leading "<tt>::</tt>" is required.
+     * <p class="Note">The leading "<code>::</code>" is required.
      * @param type The object type.
      * @return The object created for the given type, or nil if the
      * factory is unable to create the object.