zeroc-ice 3.7.2 → 3.7.3

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -45,10 +45,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/ObjectAdapterF.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/ObjectFactory.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/Plugin.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -34,10 +34,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/PluginF.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/Process.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -38,10 +38,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/ProcessF.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/Properties.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -39,10 +39,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -39,10 +39,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -238,7 +238,7 @@ public:
      */
     PropertyDict getPropertiesForPrefix(const ::std::string& prefix, const Context& context = noExplicitContext)
     {
-        return _makePromiseOutgoing<PropertyDict>(true, this, &PropertiesAdminPrx::_iceI_getPropertiesForPrefix, prefix, context).get();
+        return _makePromiseOutgoing<::Ice::PropertyDict>(true, this, &PropertiesAdminPrx::_iceI_getPropertiesForPrefix, prefix, context).get();
     }
 
     /**
@@ -250,9 +250,9 @@ public:
      */
     template<template<typename> class P = ::std::promise>
     auto getPropertiesForPrefixAsync(const ::std::string& prefix, const Context& context = noExplicitContext)
-        -> decltype(::std::declval<P<PropertyDict>>().get_future())
+        -> decltype(::std::declval<P<::Ice::PropertyDict>>().get_future())
     {
-        return _makePromiseOutgoing<PropertyDict, P>(false, this, &PropertiesAdminPrx::_iceI_getPropertiesForPrefix, prefix, context);
+        return _makePromiseOutgoing<::Ice::PropertyDict, P>(false, this, &PropertiesAdminPrx::_iceI_getPropertiesForPrefix, prefix, context);
     }
 
     /**
@@ -267,16 +267,16 @@ public:
      */
     ::std::function<void()>
     getPropertiesForPrefixAsync(const ::std::string& prefix,
-                                ::std::function<void(PropertyDict)> response,
+                                ::std::function<void(::Ice::PropertyDict)> response,
                                 ::std::function<void(::std::exception_ptr)> ex = nullptr,
                                 ::std::function<void(bool)> sent = nullptr,
                                 const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<PropertyDict>(response, ex, sent, this, &Ice::PropertiesAdminPrx::_iceI_getPropertiesForPrefix, prefix, context);
+        return _makeLamdaOutgoing<::Ice::PropertyDict>(response, ex, sent, this, &Ice::PropertiesAdminPrx::_iceI_getPropertiesForPrefix, prefix, context);
     }
 
     /// \cond INTERNAL
-    ICE_MEMBER(ICE_API) void _iceI_getPropertiesForPrefix(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<PropertyDict>>&, const ::std::string&, const Context&);
+    ICE_MEMBER(ICE_API) void _iceI_getPropertiesForPrefix(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::PropertyDict>>&, const ::std::string&, const Context&);
     /// \endcond
 
     /**

data/ext/ice/cpp/include/generated/Ice/PropertiesF.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/RemoteLogger.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -41,10 +41,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -111,7 +111,7 @@ struct LogMessage
     /**
      * The type of message sent to the {@link Logger}.
      */
-    LogMessageType type;
+    ::Ice::LogMessageType type;
     /**
      * The date and time when the {@link Logger} received this message, expressed
      * as the number of microseconds since the Unix Epoch (00:00:00 UTC on 1 January 1970)
@@ -128,11 +128,10 @@ struct LogMessage
     ::std::string message;
 
     /**
-     * Obtains a tuple containing all of the exception's data members.
+     * Obtains a tuple containing all of the struct's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const LogMessageType&, const long long int&, const ::std::string&, const ::std::string&> ice_tuple() const
+    std::tuple<const ::Ice::LogMessageType&, const long long int&, const ::std::string&, const ::std::string&> ice_tuple() const
     {
         return std::tie(type, timestamp, traceCategory, message);
     }
@@ -161,7 +160,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<> ice_tuple() const
     {
         return std::tie();
@@ -670,7 +668,7 @@ public:
      */
     ::std::function<void()>
     getLogAsync(const LogMessageTypeSeq& messageTypes, const StringSeq& traceCategories, int messageMax,
-                ::std::function<void(LogMessageSeq, ::std::string)> response,
+                ::std::function<void(::Ice::LogMessageSeq, ::std::string)> response,
                 ::std::function<void(::std::exception_ptr)> ex = nullptr,
                 ::std::function<void(bool)> sent = nullptr,
                 const Context& context = noExplicitContext)
@@ -842,12 +840,12 @@ struct LogMessage
     /**
      * The type of message sent to the {@link Logger}.
      */
-    LogMessageType type;
+    ::Ice::LogMessageType type;
     /**
      * The date and time when the {@link Logger} received this message, expressed
      * as the number of microseconds since the Unix Epoch (00:00:00 UTC on 1 January 1970)
      */
-    Long timestamp;
+    ::Ice::Long timestamp;
     /**
      * For a message of type trace, the trace category of this log message;
      * otherwise, the empty string.

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -39,10 +39,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -292,7 +292,7 @@ public:
      * @return A function that can be called to cancel the invocation locally.
      */
     ::std::function<void()>
-    getClientProxyAsync(::std::function<void(::std::shared_ptr<ObjectPrx>, Ice::optional<bool>)> response,
+    getClientProxyAsync(::std::function<void(::std::shared_ptr<::Ice::ObjectPrx>, Ice::optional<bool>)> response,
                         ::std::function<void(::std::exception_ptr)> ex = nullptr,
                         ::std::function<void(bool)> sent = nullptr,
                         const Context& context = noExplicitContext)
@@ -316,7 +316,7 @@ public:
      */
     ::std::shared_ptr<ObjectPrx> getServerProxy(const Context& context = noExplicitContext)
     {
-        return _makePromiseOutgoing<::std::shared_ptr<ObjectPrx>>(true, this, &RouterPrx::_iceI_getServerProxy, context).get();
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::ObjectPrx>>(true, this, &RouterPrx::_iceI_getServerProxy, context).get();
     }
 
     /**
@@ -327,9 +327,9 @@ public:
      */
     template<template<typename> class P = ::std::promise>
     auto getServerProxyAsync(const Context& context = noExplicitContext)
-        -> decltype(::std::declval<P<::std::shared_ptr<ObjectPrx>>>().get_future())
+        -> decltype(::std::declval<P<::std::shared_ptr<::Ice::ObjectPrx>>>().get_future())
     {
-        return _makePromiseOutgoing<::std::shared_ptr<ObjectPrx>, P>(false, this, &RouterPrx::_iceI_getServerProxy, context);
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::ObjectPrx>, P>(false, this, &RouterPrx::_iceI_getServerProxy, context);
     }
 
     /**
@@ -342,16 +342,16 @@ public:
      * @return A function that can be called to cancel the invocation locally.
      */
     ::std::function<void()>
-    getServerProxyAsync(::std::function<void(::std::shared_ptr<ObjectPrx>)> response,
+    getServerProxyAsync(::std::function<void(::std::shared_ptr<::Ice::ObjectPrx>)> response,
                         ::std::function<void(::std::exception_ptr)> ex = nullptr,
                         ::std::function<void(bool)> sent = nullptr,
                         const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<::std::shared_ptr<ObjectPrx>>(response, ex, sent, this, &Ice::RouterPrx::_iceI_getServerProxy, context);
+        return _makeLamdaOutgoing<::std::shared_ptr<::Ice::ObjectPrx>>(response, ex, sent, this, &Ice::RouterPrx::_iceI_getServerProxy, context);
     }
 
     /// \cond INTERNAL
-    ICE_MEMBER(ICE_API) void _iceI_getServerProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<ObjectPrx>>>&, const Context&);
+    ICE_MEMBER(ICE_API) void _iceI_getServerProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::ObjectPrx>>>&, const Context&);
     /// \endcond
 
     /**
@@ -362,7 +362,7 @@ public:
      */
     ObjectProxySeq addProxies(const ObjectProxySeq& proxies, const Context& context = noExplicitContext)
     {
-        return _makePromiseOutgoing<ObjectProxySeq>(true, this, &RouterPrx::_iceI_addProxies, proxies, context).get();
+        return _makePromiseOutgoing<::Ice::ObjectProxySeq>(true, this, &RouterPrx::_iceI_addProxies, proxies, context).get();
     }
 
     /**
@@ -373,9 +373,9 @@ public:
      */
     template<template<typename> class P = ::std::promise>
     auto addProxiesAsync(const ObjectProxySeq& proxies, const Context& context = noExplicitContext)
-        -> decltype(::std::declval<P<ObjectProxySeq>>().get_future())
+        -> decltype(::std::declval<P<::Ice::ObjectProxySeq>>().get_future())
     {
-        return _makePromiseOutgoing<ObjectProxySeq, P>(false, this, &RouterPrx::_iceI_addProxies, proxies, context);
+        return _makePromiseOutgoing<::Ice::ObjectProxySeq, P>(false, this, &RouterPrx::_iceI_addProxies, proxies, context);
     }
 
     /**
@@ -389,16 +389,16 @@ public:
      */
     ::std::function<void()>
     addProxiesAsync(const ObjectProxySeq& proxies,
-                    ::std::function<void(ObjectProxySeq)> response,
+                    ::std::function<void(::Ice::ObjectProxySeq)> response,
                     ::std::function<void(::std::exception_ptr)> ex = nullptr,
                     ::std::function<void(bool)> sent = nullptr,
                     const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<ObjectProxySeq>(response, ex, sent, this, &Ice::RouterPrx::_iceI_addProxies, proxies, context);
+        return _makeLamdaOutgoing<::Ice::ObjectProxySeq>(response, ex, sent, this, &Ice::RouterPrx::_iceI_addProxies, proxies, context);
     }
 
     /// \cond INTERNAL
-    ICE_MEMBER(ICE_API) void _iceI_addProxies(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<ObjectProxySeq>>&, const ObjectProxySeq&, const Context&);
+    ICE_MEMBER(ICE_API) void _iceI_addProxies(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::ObjectProxySeq>>&, const ObjectProxySeq&, const Context&);
     /// \endcond
 
     /**
@@ -437,7 +437,7 @@ public:
      */
     ::std::shared_ptr<RouterPrx> getRouter(const Context& context = noExplicitContext)
     {
-        return _makePromiseOutgoing<::std::shared_ptr<RouterPrx>>(true, this, &RouterFinderPrx::_iceI_getRouter, context).get();
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::RouterPrx>>(true, this, &RouterFinderPrx::_iceI_getRouter, context).get();
     }
 
     /**
@@ -448,9 +448,9 @@ public:
      */
     template<template<typename> class P = ::std::promise>
     auto getRouterAsync(const Context& context = noExplicitContext)
-        -> decltype(::std::declval<P<::std::shared_ptr<RouterPrx>>>().get_future())
+        -> decltype(::std::declval<P<::std::shared_ptr<::Ice::RouterPrx>>>().get_future())
     {
-        return _makePromiseOutgoing<::std::shared_ptr<RouterPrx>, P>(false, this, &RouterFinderPrx::_iceI_getRouter, context);
+        return _makePromiseOutgoing<::std::shared_ptr<::Ice::RouterPrx>, P>(false, this, &RouterFinderPrx::_iceI_getRouter, context);
     }
 
     /**
@@ -463,16 +463,16 @@ public:
      * @return A function that can be called to cancel the invocation locally.
      */
     ::std::function<void()>
-    getRouterAsync(::std::function<void(::std::shared_ptr<RouterPrx>)> response,
+    getRouterAsync(::std::function<void(::std::shared_ptr<::Ice::RouterPrx>)> response,
                    ::std::function<void(::std::exception_ptr)> ex = nullptr,
                    ::std::function<void(bool)> sent = nullptr,
                    const Context& context = noExplicitContext)
     {
-        return _makeLamdaOutgoing<::std::shared_ptr<RouterPrx>>(response, ex, sent, this, &Ice::RouterFinderPrx::_iceI_getRouter, context);
+        return _makeLamdaOutgoing<::std::shared_ptr<::Ice::RouterPrx>>(response, ex, sent, this, &Ice::RouterFinderPrx::_iceI_getRouter, context);
     }
 
     /// \cond INTERNAL
-    ICE_MEMBER(ICE_API) void _iceI_getRouter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<RouterPrx>>>&, const Context&);
+    ICE_MEMBER(ICE_API) void _iceI_getRouter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::RouterPrx>>>&, const Context&);
     /// \endcond
 
     /**