zeroc-ice 3.8.0 → 3.8.2

data/dist/ice/cpp/src/Ice/generated/PropertyDict.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'PropertyDict.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,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/src/Ice/generated/RemoteLogger.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'RemoteLogger.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -33,7 +33,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/src/Ice/generated/ReplyStatus.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'ReplyStatus.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,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
@@ -64,6 +64,8 @@ Ice::operator<<(std::ostream& os, ReplyStatus value)
             return os << "InvalidData";
         case ReplyStatus::Unauthorized:
             return os << "Unauthorized";
+        case ReplyStatus::NotSupported:
+            return os << "NotSupported";
         default:
             return os << static_cast<std::int32_t>(value);
     }

data/dist/ice/cpp/src/Ice/generated/Router.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'Router.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -33,7 +33,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/src/Ice/generated/SliceChecksumDict.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'SliceChecksumDict.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -33,7 +33,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/src/Ice/generated/Version.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'Version.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
@@ -34,7 +34,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/src/IceDiscovery/LocatorI.cpp

@@ -25,7 +25,7 @@ LocatorRegistryI::setAdapterDirectProxy(string adapterId, optional<ObjectPrx> pr
     lock_guard lock(_mutex);
     if (proxy)
     {
-        _adapters.insert({adapterId, std::move(*proxy)});
+        _adapters.insert_or_assign(adapterId, std::move(*proxy));
     }
     else
     {
@@ -43,7 +43,7 @@ LocatorRegistryI::setReplicatedAdapterDirectProxy(
     lock_guard lock(_mutex);
     if (proxy)
     {
-        _adapters.insert({adapterId, std::move(*proxy)});
+        _adapters.insert_or_assign(adapterId, std::move(*proxy));
         auto p = _replicaGroups.find(replicaGroupId);
         if (p == _replicaGroups.end())
         {

data/dist/ice/cpp/src/IceDiscovery/LookupI.cpp

@@ -2,7 +2,6 @@
 
 #include "LookupI.h"
 #include "Ice/Communicator.h"
-#include "Ice/Connection.h"
 #include "Ice/Initialize.h"
 #include "Ice/LocalExceptions.h"
 #include "Ice/LoggerUtil.h"
@@ -226,8 +225,9 @@ LookupI::setLookupReply(const LookupReplyPrx& lookupReply)
 }
 
 void
-LookupI::findObjectById(string domainId, Ice::Identity id, optional<LookupReplyPrx> reply, const Ice::Current&)
+LookupI::findObjectById(string domainId, Ice::Identity id, optional<LookupReplyPrx> reply, const Ice::Current& current)
 {
+    checkNotNull(reply, __FILE__, __LINE__, current);
     if (domainId != _domainId)
     {
         return; // Ignore.
@@ -249,8 +249,9 @@ LookupI::findObjectById(string domainId, Ice::Identity id, optional<LookupReplyP
 }
 
 void
-LookupI::findAdapterById(string domainId, string adapterId, optional<LookupReplyPrx> reply, const Ice::Current&)
+LookupI::findAdapterById(string domainId, string adapterId, optional<LookupReplyPrx> reply, const Ice::Current& current)
 {
+    checkNotNull(reply, __FILE__, __LINE__, current);
     if (domainId != _domainId)
     {
         return; // Ignore.

data/dist/ice/cpp/src/IceDiscovery/LookupI.h

@@ -70,7 +70,8 @@ namespace IceDiscovery
     using AdapterCB =
         std::pair<std::function<void(const std::optional<Ice::ObjectPrx>&)>, std::function<void(std::exception_ptr)>>;
 
-    class ObjectRequest : public RequestT<Ice::Identity, ObjectCB>, public std::enable_shared_from_this<ObjectRequest>
+    class ObjectRequest final : public RequestT<Ice::Identity, ObjectCB>,
+                                public std::enable_shared_from_this<ObjectRequest>
     {
     public:
         ObjectRequest(const LookupIPtr&, const Ice::Identity&, int);

data/dist/ice/cpp/src/IceDiscovery/generated/Lookup.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'Lookup.ice'.</auto-generated>
 
 #define ICE_BUILDING_GENERATED_CODE
@@ -30,7 +30,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/src/IceLocatorDiscovery/PluginI.cpp

@@ -71,7 +71,7 @@ namespace
             function<void(exception_ptr)>,
             const Ice::Current&) final;
 
-        void foundLocator(const optional<Ice::LocatorPrx>&);
+        void foundLocator(const Ice::LocatorPrx&);
         void invoke(const optional<Ice::LocatorPrx>&, const RequestPtr&);
 
         vector<Ice::LocatorPrx> getLocators(const string&, const chrono::milliseconds&);
@@ -149,7 +149,6 @@ namespace
         [[nodiscard]] vector<Ice::LocatorPrx> getLocators(const string&, const chrono::milliseconds&) const final;
 
     private:
-        const string _name;
         const Ice::CommunicatorPtr _communicator;
         Ice::ObjectAdapterPtr _locatorAdapter;
         Ice::ObjectAdapterPtr _replyAdapter;
@@ -429,6 +428,7 @@ LocatorI::setLookupReply(const LookupReplyPrx& lookupReply)
                 if (r && r->host == info->mcastInterface)
                 {
                     reply = reply->ice_endpoints(Ice::EndpointSeq{replyEndpoint});
+                    break;
                 }
             }
         }
@@ -506,21 +506,9 @@ LocatorI::getLocators(const string& instanceName, const chrono::milliseconds& wa
 }
 
 void
-LocatorI::foundLocator(const optional<Ice::LocatorPrx>& reply)
+LocatorI::foundLocator(const Ice::LocatorPrx& locator)
 {
     lock_guard lock(_mutex);
-
-    if (!reply)
-    {
-        if (_traceLevel > 2)
-        {
-            Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
-            out << "ignoring locator reply: (null locator)";
-        }
-        return;
-    }
-
-    Ice::LocatorPrx locator = *reply;
     if (!_instanceName.empty() && locator->ice_getIdentity().category != _instanceName)
     {
         if (_traceLevel > 2)
@@ -574,7 +562,6 @@ LocatorI::foundLocator(const optional<Ice::LocatorPrx>& reply)
     {
         // We found another locator replica, append its endpoints to the current locator proxy endpoints.
         Ice::EndpointSeq newEndpoints = i->second->ice_getEndpoints();
-        Ice::EndpointSeq endpts = locator->ice_getEndpoints();
         for (const auto& endpoint : locator->ice_getEndpoints())
         {
             if (std::find(newEndpoints.begin(), newEndpoints.end(), endpoint) == newEndpoints.end())
@@ -816,7 +803,8 @@ LocatorI::runTimerTask()
 }
 
 void
-LookupReplyI::foundLocator(optional<Ice::LocatorPrx> locator, const Ice::Current&)
+LookupReplyI::foundLocator(optional<Ice::LocatorPrx> locator, const Ice::Current& current)
 {
-    _locator->foundLocator(locator);
+    checkNotNull(locator, __FILE__, __LINE__, current);
+    _locator->foundLocator(*locator);
 }

data/dist/ice/cpp/src/IceLocatorDiscovery/generated/Lookup.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'Lookup.ice'.</auto-generated>
 
 #define ICE_BUILDING_GENERATED_CODE
@@ -30,7 +30,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/src/Slice/DocCommentParser.cpp

@@ -60,9 +60,9 @@ DocCommentFormatter::formatCode(const string& rawText)
 }
 
 string
-DocCommentFormatter::formatParamRef(const string& param)
+DocCommentFormatter::formatParamRef(const string& paramName, const ParameterPtr&)
 {
-    return formatCode(param);
+    return formatCode(paramName);
 }
 
 string
@@ -397,19 +397,19 @@ namespace
         // Extract the parameter's name and check if matches an operation parameter.
         // If it does, make sure to use the mapped name instead of the Slice name.
         string parameterName = line.substr(nameStart, nameEnd - nameStart);
+        ParameterPtr parameterPtr = nullptr;
         if (auto operationTarget = dynamic_pointer_cast<Operation>(p))
         {
-            bool doesParameterExist = false;
             for (const auto& param : operationTarget->parameters())
             {
                 if (param->name() == parameterName)
                 {
                     parameterName = param->mappedName();
-                    doesParameterExist = true;
+                    parameterPtr = param;
                     break;
                 }
             }
-            if (!doesParameterExist)
+            if (parameterPtr == nullptr)
             {
                 string opName = operationTarget->name();
                 string msg = "No parameter named '" + parameterName + "' exists on operation '" + opName + "'";
@@ -422,7 +422,7 @@ namespace
         }
 
         // Format the parameter's name and insert it in-place of the original '@p name'.
-        const string formattedParamName = formatter.formatParamRef(parameterName);
+        const string formattedParamName = formatter.formatParamRef(parameterName, parameterPtr);
         line.erase(pos, nameEnd - pos);
         line.insert(pos, formattedParamName);
 

data/dist/ice/cpp/src/Slice/DocCommentParser.h

@@ -27,12 +27,14 @@ namespace Slice
         [[nodiscard]] virtual std::string formatCode(const std::string& rawText);
 
         /// This function is called by the doc-comment parser to map '@p' tags into each language's syntax.
-        /// @param param The mapped name of the parameter that is being referenced.
+        /// @param paramName If @p paramPtr is non-null, this is the mapped name of the parameter being referenced.
+        /// Otherwise, this is the identifier after '@p', taken verbatim from the doc-comment.
+        /// @param paramPtr A pointer to the parameter that is being referenced, or `nullptr` if it doesn't exist.
         /// @return A properly formatted parameters reference in the target language. The doc-comment parser will
         /// replace the entire "@p <rawParamName>" string with the returned value.
         //
         // By default we just emit the parameter's name in code formatting.
-        [[nodiscard]] virtual std::string formatParamRef(const std::string& param);
+        [[nodiscard]] virtual std::string formatParamRef(const std::string& paramName, const ParameterPtr& paramPtr);
 
         /// This function is called by the doc-comment parser to map doc-links ('{@link <rawLink>}') into each
         /// language's syntax.

data/dist/ice/cpp/src/Slice/FileTracker.h

@@ -7,6 +7,7 @@
 #include <map>
 #include <memory>
 #include <stdexcept>
+#include <string>
 
 namespace Slice
 {