zeroc-ice 3.8.0 → 3.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5ea8ace37949a5a1a570cacb3aec87a89c574682a7e4bce1e9d5151c781e1e8
-  data.tar.gz: 93ba83989cac3865c8c541f673388a2864efecd0f4519ae6242be4b4ba45c362
+  metadata.gz: aa4154bd37d4df0c510b9737d68ad939fd5168b8f96c5c4f627fbbe9916720ce
+  data.tar.gz: 492eecaf69cd8e94539ad50a178183b5674d9e7960602f29b0dd63ae725499ff
 SHA512:
-  metadata.gz: 5f11cea3787b888af6f67b5e497d616539f639e78f37087e7c65b722bf7118aeb3bd42b6a7e3b73cc84adfc3a43e62597d7de69e63435544bfd04571f72ad376
-  data.tar.gz: 0b7e687a92fb5033f6b5c92a1ce40ca4dbf1575c655179ef365daf8c432d4db4b71fbfb00193158430359f605d45dbe2be154a4671c75c4552128e3c2de51f5a
+  metadata.gz: 63299394740124d99d1e5a83a4d384084682a026bc819a778467ac94325355fee31967c1c354b8cd001d93bb3ad3d9deedc3f22d5a9be88269349fadcde35bc6
+  data.tar.gz: a5bc4d318e83bb949c2b6578f25c1fca7a34d8cabcd6c1047823dec67a2633db6b9128ae1d6169a9a004c217fe2935c30c6175d8bb51ba536d50d458b31c0133

data/dist/IceRuby/Operation.cpp

@@ -38,7 +38,7 @@ namespace IceRuby
     class OperationI final : public Operation
     {
     public:
-        OperationI(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+        OperationI(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
 
         VALUE invoke(const Ice::ObjectPrx&, VALUE, VALUE) final;
         void deprecate(const string&) final;
@@ -56,6 +56,7 @@ namespace IceRuby
         ExceptionInfoList _exceptions;
         bool _sendsClasses;
         bool _returnsClasses;
+        bool _onewayOnly;
         string _deprecateMessage;
 
         void convertParams(VALUE, ParamInfoList&, long, bool&);
@@ -65,6 +66,7 @@ namespace IceRuby
         VALUE unmarshalException(const vector<byte>&, const Ice::CommunicatorPtr&);
         bool validateException(VALUE) const;
         void checkTwowayOnly(const Ice::ObjectPrx&) const;
+        void checkOnewayOnly(const Ice::ObjectPrx&) const;
     };
     using OperationIPtr = shared_ptr<OperationI>;
 }
@@ -94,12 +96,13 @@ IceRuby_defineOperation(
     VALUE inParams,
     VALUE outParams,
     VALUE returnType,
-    VALUE exceptions)
+    VALUE exceptions,
+    VALUE onewayOnly)
 {
     ICE_RUBY_TRY
     {
-        OperationIPtr op =
-            make_shared<OperationI>(sliceName, mappedName, mode, format, inParams, outParams, returnType, exceptions);
+        OperationIPtr op = make_shared<
+            OperationI>(sliceName, mappedName, mode, format, inParams, outParams, returnType, exceptions, onewayOnly);
         return TypedData_Wrap_Struct(_operationClass, &IceRuby_OperationType, new OperationPtr(op));
     }
     ICE_RUBY_CATCH
@@ -162,7 +165,8 @@ IceRuby::OperationI::OperationI(
     VALUE inParams,
     VALUE outParams,
     VALUE returnType,
-    VALUE exceptions)
+    VALUE exceptions,
+    VALUE onewayOnly)
 {
     _sliceName = getString(name);
     _mappedName = getString(mapped);
@@ -245,6 +249,8 @@ IceRuby::OperationI::OperationI(
     {
         _exceptions.push_back(getException(RARRAY_AREF(exceptions, i)));
     }
+
+    _onewayOnly = onewayOnly == Qtrue;
 }
 
 VALUE
@@ -266,6 +272,7 @@ IceRuby::OperationI::invoke(const Ice::ObjectPrx& proxy, VALUE args, VALUE hctx)
     }
 
     checkTwowayOnly(proxy);
+    checkOnewayOnly(proxy);
 
     //
     // Invoke the operation.
@@ -596,10 +603,19 @@ IceRuby::OperationI::checkTwowayOnly(const Ice::ObjectPrx& proxy) const
     }
 }
 
+void
+IceRuby::OperationI::checkOnewayOnly(const Ice::ObjectPrx& proxy) const
+{
+    if (_onewayOnly && proxy->ice_isTwoway())
+    {
+        throw Ice::OnewayOnlyException{__FILE__, __LINE__, _sliceName};
+    }
+}
+
 bool
 IceRuby::initOperation(VALUE iceModule)
 {
-    rb_define_module_function(iceModule, "__defineOperation", CAST_METHOD(IceRuby_defineOperation), 8);
+    rb_define_module_function(iceModule, "__defineOperation", CAST_METHOD(IceRuby_defineOperation), 9);
 
     //
     // Define a class to represent an operation.

data/dist/IceRuby/Slice.cpp

@@ -100,7 +100,7 @@ IceRuby_loadSlice(int argc, VALUE* argv, VALUE /*self*/)
                     throw RubyException(rb_eArgError, "Slice preprocessing failed");
                 }
 
-                unit = Unit::createUnit("ruby", all);
+                unit = Unit::createUnit("ruby", {.all = all});
                 int parseStatus = unit->parse(file, preprocessedHandle, debug);
 
                 preprocessor->close();

data/dist/ice/cpp/include/Ice/Communicator.h

@@ -36,8 +36,8 @@ namespace Ice
     public:
         ~Communicator();
 
-        /// Destroys this communicator. This function calls #shutdown implicitly. Calling #destroy destroys all
-        /// object adapters, and closes all outgoing connections. This method waits for all outstanding dispatches to
+        /// Destroys this communicator. This function calls #shutdown implicitly. Calling this function destroys all
+        /// object adapters, and closes all outgoing connections. This function waits for all outstanding dispatches to
         /// complete before returning. This includes "bidirectional dispatches" that execute on outgoing connections.
         /// @see CommunicatorHolder
         void destroy() noexcept;
@@ -277,14 +277,14 @@ namespace Ice
         [[nodiscard]] std::future<void> flushBatchRequestsAsync(CompressBatch compress);
 
         /// Adds the Admin object with all its facets to the provided object adapter. If `Ice.Admin.ServerId`
-        /// is set and the provided object adapter has a Locator, #createAdmin registers the Admin's Process facet with
+        /// is set and the provided object adapter has a Locator, this function registers the Admin's Process facet with
         /// the Locator's LocatorRegistry.
         /// @param adminAdapter The object adapter used to host the Admin object; if it is null and
         /// `Ice.Admin.Endpoints` is set, this function uses the `Ice.Admin` object adapter, after creating and
         /// activating this adapter.
         /// @param adminId The identity of the Admin object.
         /// @return A proxy to the main ("") facet of the Admin object.
-        /// @throws InitializationException Thrown when #createAdmin is called more than once.
+        /// @throws InitializationException Thrown when this function is called more than once.
         /// @see #getAdmin
         ObjectPrx createAdmin(const ObjectAdapterPtr& adminAdapter, const Identity& adminId);
 

data/dist/ice/cpp/include/Ice/Config.h

@@ -35,8 +35,8 @@
 #endif
 
 // The Ice version.
-#define ICE_STRING_VERSION "3.8.0" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 30800      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICE_STRING_VERSION "3.8.2" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_INT_VERSION 30802      // AABBCC, with AA=major, BB=minor, CC=patch
 #define ICE_SO_VERSION "38"        // "ABC", with A=major, B=minor, C=patch
 
 #if defined(_MSC_VER) && !defined(ICE_BUILDING_SLICE_COMPILERS) // Not using the IceUtil static build

data/dist/ice/cpp/include/Ice/Connection.h

@@ -25,7 +25,7 @@
 
 namespace Ice
 {
-    /// Represents batch compression options when flushing queued batch requests.
+    /// Represents batch compression options for flushing queued batch requests.
     enum class CompressBatch : std::uint8_t
     {
         /// Compress the batch requests.
@@ -124,8 +124,8 @@ namespace Ice
         /// @return A future that becomes available when the flush completes.
         [[nodiscard]] std::future<void> flushBatchRequestsAsync(CompressBatch compress);
 
-        /// Sets a close callback on the connection. The callback is called by the connection when it's closed. The
-        /// callback is called from the Ice thread pool associated with the connection.
+        /// Sets a close callback on the connection. The callback is called by the connection when it's closed.
+        /// The callback is called from the Ice thread pool associated with the connection.
         /// @param callback The close callback object.
         virtual void setCloseCallback(CloseCallback callback) = 0;
 

data/dist/ice/cpp/include/Ice/Endpoint.h

@@ -20,8 +20,8 @@
 
 namespace Ice
 {
-    /// An endpoint specifies the address of the server-end of an Ice connection: an object adapter listens on one or
-    /// more endpoints and a client establishes a connection to an endpoint.
+    /// An endpoint specifies the address of the server-end of an Ice connection.
+    /// An object adapter listens on one or more endpoints and a client establishes a connection to an endpoint.
     /// @headerfile Ice/Ice.h
     class ICE_API Endpoint
     {

data/dist/ice/cpp/include/Ice/Exception.h

@@ -34,7 +34,7 @@ namespace Ice
         /// Returns the type ID of this exception. This corresponds to the Slice type ID for Slice-defined exceptions,
         /// and to a fully scoped name for other exceptions. For example
         /// "::Ice::CommunicatorDestroyedException".
-        /// @return The type ID of this exception
+        /// @return The type ID of this exception.
         [[nodiscard]] virtual const char* ice_id() const noexcept = 0;
 
         /// Outputs a description of this exception to a stream.

data/dist/ice/cpp/include/Ice/Initialize.h

@@ -124,7 +124,7 @@ namespace Ice
 
     /// Converts a stringified identity into an Identity.
     /// @param str The stringified identity.
-    /// @return An Identity containing the name and category components.
+    /// @return An Identity created from the provided string.
     ICE_API Identity stringToIdentity(std::string_view str);
 
     /// Converts an Identity into a string using the specified mode.

data/dist/ice/cpp/include/Ice/LocalExceptions.h

@@ -785,7 +785,7 @@ namespace Ice
         [[nodiscard]] const char* ice_id() const noexcept final;
     };
 
-    /// The exception that is thrown when an ObjectAdapter cannot be activated. This can happen when the locator
+    /// The exception that is thrown when an ObjectAdapter cannot be activated. This can happen when a Locator
     /// implementation detects another active ObjectAdapter with the same adapter ID.
     /// @headerfile Ice/Ice.h
     class ICE_API ObjectAdapterIdInUseException final : public LocalException
@@ -856,6 +856,27 @@ namespace Ice
         [[nodiscard]] const char* ice_id() const noexcept final;
     };
 
+    /// The exception that is thrown when attempting to invoke a oneway-only operation (an operation with the
+    /// ["oneway"] metadata directive) using a twoway proxy.
+    /// @headerfile Ice/Ice.h
+    class ICE_API OnewayOnlyException final : public LocalException
+    {
+    public:
+        /// Constructs an OnewayOnlyException.
+        /// @param file The file where this exception is constructed. This C string is not copied.
+        /// @param line The line where this exception is constructed.
+        /// @param operation The oneway-only operation used to create the message returned by what().
+        OnewayOnlyException(const char* file, int line, std::string_view operation)
+            : LocalException(
+                  file,
+                  line,
+                  "cannot invoke oneway operation '" + std::string{operation} + "' with a twoway proxy")
+        {
+        }
+
+        [[nodiscard]] const char* ice_id() const noexcept final;
+    };
+
     /// The exception that is thrown when a property cannot be set or retrieved. For example, this exception is thrown
     /// when attempting to set an unknown Ice property.
     class ICE_API PropertyException final : public LocalException

data/dist/ice/cpp/include/Ice/Logger.h

@@ -28,8 +28,8 @@ namespace Ice
         // send the message to C APIs that require null-terminated strings.
         // The message itself is also often constructed from a string produced by an ostringstream.
 
-        /// Prints a message. The message is printed literally, without any decorations such as executable name or
-        /// timestamp.
+        /// Prints a message.
+        /// The message is printed literally, without any decorations such as executable name or timestamp.
         /// @param message The message to log.
         virtual void print(const std::string& message) = 0;
 
@@ -54,7 +54,7 @@ namespace Ice
 
         /// Returns a clone of the logger with a new prefix.
         /// @param prefix The new prefix for the logger.
-        /// @return A logger instance.
+        /// @return A new logger instance with the specified prefix.
         virtual LoggerPtr cloneWithPrefix(std::string prefix) = 0;
     };
 }

data/dist/ice/cpp/include/Ice/NativePropertiesAdmin.h

@@ -38,6 +38,8 @@ namespace Ice
         std::function<void()> addUpdateCallback(std::function<void(const PropertyDict&)> cb);
 
     private:
+        /// Removes a previously registered update callback.
+        /// @param p An iterator which points to the callback to remove.
         void removeUpdateCallback(std::list<std::function<void(const PropertyDict&)>>::iterator p);
 
         const PropertiesPtr _properties;

data/dist/ice/cpp/include/Ice/ObjectAdapter.h

@@ -56,7 +56,7 @@ namespace Ice
         virtual void hold() = 0;
 
         /// Waits until the object adapter is in the holding state (see #hold) and the dispatch of requests received
-        /// over incoming connection has completed.
+        /// over incoming connections has completed.
         /// @remark This function is provided for backward compatibility with older versions of Ice. Don't use it in
         /// new applications.
         virtual void waitForHold() = 0;
@@ -234,7 +234,7 @@ namespace Ice
         /// Removes a ServantLocator from this object adapter.
         /// @param category The category.
         /// @return The servant locator.
-        /// @throws NotRegisteredException Thrown when no ServantLocator with the given category is registered.
+        /// @throws NotRegisteredException Thrown when no servant locator with the given category is registered.
         virtual ServantLocatorPtr removeServantLocator(std::string_view category) = 0;
 
         /// Finds a ServantLocator registered with this object adapter.
@@ -267,7 +267,7 @@ namespace Ice
         /// Creates a direct proxy from an Ice identity.
         /// @tparam Prx The type of the proxy to return.
         /// @param id An Ice identity.
-        /// @return A proxy with the given identity and this published endpoints of this object adapter.
+        /// @return A proxy with the given identity and the published endpoints of this object adapter.
         template<typename Prx = ObjectPrx, std::enable_if_t<std::is_base_of_v<ObjectPrx, Prx>, bool> = true>
         Prx createDirectProxy(Identity id)
         {

data/dist/ice/cpp/include/Ice/ObserverHelper.h

@@ -6,6 +6,7 @@
 #include "InstanceF.h"
 #include "Instrumentation.h"
 
+#include <exception>
 #include <string_view>
 
 #if defined(_MSC_VER)

data/dist/ice/cpp/include/Ice/OutputStream.h

@@ -42,8 +42,9 @@ namespace Ice
         /// Constructs an OutputStream.
         /// @param encoding The encoding version to use.
         /// @param format The class format to use.
-        /// @param stringConverter The narrow string converter to use.
-        /// @param wstringConverter The wide string converter to use.
+        /// @param stringConverter The narrow string converter to use. @c nullptr means do not perform any conversion.
+        /// @param wstringConverter The wide string converter to use. @c nullptr is equivalent to the process wstring
+        /// converter.
         OutputStream(
             EncodingVersion encoding = Encoding_1_1,
             FormatType format = FormatType::CompactFormat,
@@ -66,8 +67,9 @@ namespace Ice
         /// stream will reallocate if the size of the marshaled data exceeds the application's buffer.
         /// @param encoding The encoding version to use.
         /// @param format The class format to use.
-        /// @param stringConverter The narrow string converter to use.
-        /// @param wstringConverter The wide string converter to use.
+        /// @param stringConverter The narrow string converter to use. @c nullptr means do not perform any conversion.
+        /// @param wstringConverter The wide string converter to use. @c nullptr is equivalent to the process wstring
+        /// converter.
         OutputStream(
             std::pair<const std::byte*, const std::byte*> bytes,
             EncodingVersion encoding = Encoding_1_1,
@@ -676,8 +678,28 @@ namespace Ice
         //
         void writeConverted(const char*, size_t);
 
+        /// Writes a 1-byte size placeholder and returns its position; after writing the data, call
+        /// #endOneByteSize to patch the placeholder with the actual size at the given position.
+        /// @return The position of the 1-byte size placeholder.
+        size_type startOneByteSize()
+        {
+            size_type position = b.size();
+            write(std::uint8_t(0)); // placeholder
+            return position;
+        }
+
+        /// Updates the 1-byte size value at the given position. The new size is computed from the stream's current
+        /// position. The size must be <= 254.
+        /// @param position The position of the 1-byte size placeholder as returned by #startOneByteSize.
+        void endOneByteSize(size_type position)
+        {
+            auto size = static_cast<std::int32_t>(b.size() - position - 1);
+            assert(size >= 0 && size <= 254);
+            rewriteSize(size, b.begin() + position);
+        }
+
         StringConverterPtr _stringConverter;
-        WstringConverterPtr _wstringConverter;
+        WstringConverterPtr _wstringConverter; // never null
 
         //
         // The public stream API needs to attach data to a stream.

data/dist/ice/cpp/include/Ice/Properties.h

@@ -196,7 +196,7 @@ namespace Ice
 
         /// Gets an Ice property as a list of strings. The strings must be separated by whitespace or comma. The strings
         /// in the list can contain whitespace and commas if they are enclosed in single or double quotes. If quotes are
-        /// mismatched, the default list is returned.  Within single quotes or double quotes, you can escape the quote
+        /// mismatched, the default list is returned. Within single quotes or double quotes, you can escape the quote
         /// in question with a backslash, e.g. O'Reilly can be written as O'Reilly, "O'Reilly" or 'O\'Reilly'.
         /// @param key The property key.
         /// @return The property value interpreted as a list of strings, or the default value if the property is not
@@ -216,8 +216,8 @@ namespace Ice
         /// @see #setProperty
         StringSeq getPropertyAsListWithDefault(std::string_view key, const StringSeq& value);
 
-        /// Gets all properties whose keys begin with @p prefix. If @p prefix is the empty string, then all properties
-        /// are returned.
+        /// Gets all properties whose keys begin with the given prefix. If @p prefix is the empty string,
+        /// then all properties are returned.
         /// @param prefix The prefix to search for.
         /// @return The matching property set.
         PropertyDict getPropertiesForPrefix(std::string_view prefix);

data/dist/ice/cpp/include/Ice/Proxy.h

@@ -623,7 +623,7 @@ namespace Ice
         [[nodiscard]] bool ice_isBatchDatagram() const noexcept;
 
         /// Gets the compression override setting of this proxy.
-        /// @return The compression override setting. If nullopt is returned, no override is set. Otherwise, true
+        /// @return The compression override setting. If nullopt is returned, no override is set. Otherwise, `true`
         /// if compression is enabled, `false` otherwise.
         [[nodiscard]] std::optional<bool> ice_getCompress() const noexcept;
 

data/dist/ice/cpp/include/Ice/SSL/ClientAuthenticationOptions.h

@@ -32,8 +32,13 @@ namespace Ice::SSL
         ///
         /// This callback is invoked by the SSL transport for each new outgoing connection before starting the SSL
         /// handshake to determine the appropriate client credentials. The callback must return a `SCH_CREDENTIALS` that
-        /// represents the client's credentials. The SSL transport takes ownership of the credentials' `paCred` and
-        /// `hRootStore` members and releases them when the connection is closed.
+        /// represents the client's credentials. The returned credentials are passed to [AcquireCredentialsHandle] to
+        /// create the credential handle for the connection; see the Schannel documentation for details on the
+        /// available fields. The SSL transport takes ownership of the credentials' `paCred` and `hRootStore` members
+        /// and releases them when the connection is closed.
+        ///
+        /// Certificate validation is not performed through the returned credentials. Use `trustedRootCertificates`
+        /// or `serverCertificateValidationCallback` instead.
         ///
         /// @param host The target host name.
         /// @return The client SSL credentials.
@@ -42,9 +47,12 @@ namespace Ice::SSL
         /// @snippet Ice/SSL/SchannelClientAuthenticationOptions.cpp clientCertificateSelectionCallback
         ///
         /// @see [SCH_CREDENTIALS]
+        /// @see [AcquireCredentialsHandle]
         ///
         /// [SCH_CREDENTIALS]:
         /// https://learn.microsoft.com/en-us/windows/win32/api/schannel/ns-schannel-sch_credentials
+        /// [AcquireCredentialsHandle]:
+        /// https://learn.microsoft.com/en-us/windows/win32/secauthn/acquirecredentialshandle--schannel
         std::function<SCH_CREDENTIALS(const std::string& host)> clientCredentialsSelectionCallback;
 
         /// A callback invoked before initiating a new SSL handshake, providing an opportunity to customize the SSL

data/dist/ice/cpp/include/Ice/SSL/ServerAuthenticationOptions.h

@@ -33,8 +33,13 @@ namespace Ice::SSL
         ///
         /// This callback is invoked by the SSL transport for each new incoming connection before starting the SSL
         /// handshake to determine the appropriate server credentials. The callback must return a `SCH_CREDENTIALS` that
-        /// represents the server's credentials. The SSL transport takes ownership of the credentials' `paCred` and
-        /// `hRootStore` members and releases them when the connection is closed.
+        /// represents the server's credentials. The returned credentials are passed to [AcquireCredentialsHandle] to
+        /// create the credential handle for the connection; see the Schannel documentation for details on the
+        /// available fields. The SSL transport takes ownership of the credentials' `paCred` and `hRootStore` members
+        /// and releases them when the connection is closed.
+        ///
+        /// Certificate validation is not performed through the returned credentials. Use `trustedRootCertificates`
+        /// or `clientCertificateValidationCallback` instead.
         ///
         /// @param adapterName The name of the object adapter that accepted the connection.
         /// @return The server SSL credentials.
@@ -43,9 +48,12 @@ namespace Ice::SSL
         /// @snippet Ice/SSL/SchannelServerAuthenticationOptions.cpp serverCertificateSelectionCallback
         ///
         /// @see [SCH_CREDENTIALS]
+        /// @see [AcquireCredentialsHandle]
         ///
         /// [SCH_CREDENTIALS]:
         /// https://learn.microsoft.com/en-us/windows/win32/api/schannel/ns-schannel-sch_credentials
+        /// [AcquireCredentialsHandle]:
+        /// https://learn.microsoft.com/en-us/windows/win32/secauthn/acquirecredentialshandle--schannel
         std::function<SCH_CREDENTIALS(const std::string& adapterName)> serverCredentialsSelectionCallback;
 
         /// A callback invoked before initiating a new SSL handshake, providing an opportunity to customize the SSL

data/dist/ice/cpp/include/generated/Ice/BuiltinSequences.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'BuiltinSequences.ice'.</auto-generated>
 // clang-format off
 
@@ -24,7 +24,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/include/generated/Ice/Context.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'Context.ice'.</auto-generated>
 // clang-format off
 
@@ -19,7 +19,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/include/generated/Ice/EndpointTypes.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'EndpointTypes.ice'.</auto-generated>
 // clang-format off
 
@@ -18,7 +18,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/include/generated/Ice/Identity.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'Identity.ice'.</auto-generated>
 // clang-format off
 
@@ -21,7 +21,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'Locator.ice'.</auto-generated>
 // clang-format off
 
@@ -18,7 +18,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -82,7 +82,7 @@ namespace Ice
             return *this;
         }
 
-        /// Finds an object by identity and returns a dummy proxy with the endpoint(s) that can be used to reach this
+        /// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
         /// object. This dummy proxy may be an indirect proxy that requires further resolution using
         /// ::Ice::LocatorPrx::findAdapterById.
         /// @param id The identity.
@@ -92,7 +92,7 @@ namespace Ice
         /// should treat this exception like a null return value.
         std::optional<Ice::ObjectPrx> findObjectById(const Identity& id, const Ice::Context& context = Ice::noExplicitContext) const; // NOLINT(modernize-use-nodiscard)
 
-        /// Finds an object by identity and returns a dummy proxy with the endpoint(s) that can be used to reach this
+        /// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
         /// object. This dummy proxy may be an indirect proxy that requires further resolution using
         /// ::Ice::LocatorPrx::findAdapterById.
         /// @param id The identity.
@@ -101,7 +101,7 @@ namespace Ice
         /// - A dummy proxy, or null if an object with the requested identity was not found.
         [[nodiscard]] std::future<std::optional<Ice::ObjectPrx>> findObjectByIdAsync(const Identity& id, const Ice::Context& context = Ice::noExplicitContext) const;
 
-        /// Finds an object by identity and returns a dummy proxy with the endpoint(s) that can be used to reach this
+        /// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
         /// object. This dummy proxy may be an indirect proxy that requires further resolution using
         /// ::Ice::LocatorPrx::findAdapterById.
         /// @param id The identity.
@@ -279,8 +279,7 @@ namespace Ice
 
 namespace Ice
 {
-    /// The exception that is thrown by a LocatorPrx implementation when it cannot find an object adapter with the
-    /// provided adapter ID.
+    /// The exception that is thrown by a LocatorPrx implementation when it cannot find an object adapter.
     /// @remarks The Slice compiler generated this exception class from Slice exception `::Ice::AdapterNotFoundException`.
     /// @headerfile Ice/Ice.h
     class ICE_API AdapterNotFoundException : public Ice::UserException
@@ -302,8 +301,7 @@ namespace Ice
         void _readImpl(Ice::InputStream*) override;
     };
 
-    /// The exception that is thrown by a LocatorPrx implementation when it cannot find an object with the provided
-    /// identity.
+    /// The exception that is thrown by a LocatorPrx implementation when it cannot find an object.
     /// @remarks The Slice compiler generated this exception class from Slice exception `::Ice::ObjectNotFoundException`.
     /// @headerfile Ice/Ice.h
     class ICE_API ObjectNotFoundException : public Ice::UserException
@@ -348,7 +346,7 @@ namespace Ice
 
         [[nodiscard]] std::string ice_id(const Ice::Current& current) const override;
 
-        /// Finds an object by identity and returns a dummy proxy with the endpoint(s) that can be used to reach this
+        /// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
         /// object. This dummy proxy may be an indirect proxy that requires further resolution using
         /// ::Ice::LocatorPrx::findAdapterById.
         /// @param id The identity.
@@ -449,7 +447,7 @@ namespace Ice
 
         [[nodiscard]] std::string ice_id(const Ice::Current& current) const override;
 
-        /// Finds an object by identity and returns a dummy proxy with the endpoint(s) that can be used to reach this
+        /// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
         /// object. This dummy proxy may be an indirect proxy that requires further resolution using
         /// ::Ice::LocatorPrx::findAdapterById.
         /// @param id The identity.

data/dist/ice/cpp/include/generated/Ice/LocatorRegistry.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'LocatorRegistry.ice'.</auto-generated>
 // clang-format off
 
@@ -18,7 +18,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif