Merge remote-tracking branch 'origin/main' into std-mutex1

zeroc-ice · Feb 5, 2024 · b8be90e · b8be90e
2 parents fa95dbf + dd14cad
commit b8be90e
Show file tree

Hide file tree

Showing 96 changed files with 670 additions and 761 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -9,7 +9,7 @@ RUN set -eux \
     && sudo dpkg -i packages-microsoft-prod.deb \
     && rm packages-microsoft-prod.deb \
     && sudo apt update \
-    && sudo apt-get install -y python3 ruby-full \
+    && sudo apt-get install -y python3 python3-dev python3-passlib ruby-full \
     && sudo apt-get install -y libbluetooth-dev libbz2-dev libdbus-1-dev libedit-dev libexpat1-dev liblmdb-dev libmcpp-dev libssl-dev libsystemd-dev \
     && sudo rm -rf /var/lib/apt/lists/* \
     && sudo apt-get clean
diff --git a/CHANGELOG-3.8.md b/CHANGELOG-3.8.md
@@ -24,47 +24,13 @@ Ice 3.7. You can still define proxies with the usual syntax, `Greeter*`, where `
 
 ## C++ Changes
 
-- The C++98 mapping is now called the Original mapping.
-
-- The C++11 mapping is now called the New mapping.
-
-- (Original mapping) The base class for mapped class instances is now Ice::Value, like in the new mapping. Previously,
-Ice::Object was the base class for both mapped class instances and servants.
-
-- (Original mapping) Ice::Value does not derive from IceUtil::Shared and the generated Ptr for mapped classed is now an
-Ice::SharedPtr that behaves mostly like the previous IceUtil (and IceInternal) Handle by wrapping a std::shared_ptr.
-The important differences are:
- - the comparison operators of Ice::SharedPtr compare pointers like std::shared_ptr but unlike IceUtil::Handle.
- - the pointed-to object no longer holds the reference count, and as result you must be careful and avoid creating
- multiple SharedPtr managing the same object. For example:
- ```
- MyClassPtr c1 = new MyClass(); // SharedPtr to class instance
- MyClassPtr c2 = c1; // c1 and c2 point to the same instance
- MyClassPtr c3 = c1.get(); // c3 points to the same instance. With Ice 3.7 and before, it's ok as it simply adds a
-                           // a reference count to the shared instance. As of Ice 3.8, it's incorrect since c3 is a new
-                           // independent SharedPtr with its own reference count.
- ```
-
-- (Original mapping) Removed all support for garbage collection (GC) of class instances. If you create or receive a
-graph of class instances with a cycle, you must break this cycle to avoid a leak.
-
-- (New mapping) Ice::optional is now an alias for std::optional.
-
-- (Original mapping) IceUtil::Optional is now an alias for std::optional. When upgrading from Ice 3.7 or earlier, you
-need to replace calls to `get()` on IceUtil::Optional by calls to `value()`.
+- There is now a single C++ mapping, based on the C++11 mapping provided by Ice 3.7. This new C++ mapping requires a
+C++ compiler with support for std=c++17 or higher.
 
 ## Objective-C Changes
 
-- The base class for class instances is now Ice::Value. Previously, Ice::Object was the base class for both mapped class
-instances and servants.
-
-- The slice compiler no longer generates an Objective-C protocol for Slice classes. It generates only an Objective-C
-class (interface).
+- The Objective-C mapping was removed.
 
 ## PHP Changes
 
 - Removed the flattened mapping deprecated in 3.7.
-
-## Ice Service Changes
-
-- The implementations of Glacier2, IceGrid, IceStorm and IcePatch2 were updated to use the new C++ mapping.
diff --git a/config/Make.project.rules b/config/Make.project.rules
@@ -133,7 +133,7 @@ $3/%.o: $1/%.mm
 $3/%.o: $1/%.mm
 	$(E) "Compiling [$8-$9] $$<"
 	$(Q)$(or $($8_cxx),$(platform_cxx)) $(CXXFLAGS) $(call depend-cppflags,$3/$$*.Td,$$@)\
-	$(strip $6) $(CPPFLAGS) -std=c++17 -c $$< -o $$@
+	$(strip $6) $(CPPFLAGS) -c $$< -o $$@
 	$(Q)$(MV) $3/$$*.Td $3/$$*.mm.d
 endif
 

diff --git a/config/Make.rules.Darwin b/config/Make.rules.Darwin
@@ -42,9 +42,13 @@ ifeq ($(MAXWARN),yes)
     cppflags	+=  -Wweak-vtables
 endif
 
-# -Wshadow issues false warnings with clang 3.x (Apple LLVM 9.0)
-ifeq ($(shell clang -v 2>&1 | sed -ne 's/.*version \([0-9]*\)\.\([0-9]*\).*/\1\2/p'),90)
-    cppflags    := $(filter-out -Wshadow -Wshadow-all,$(cppflags))
+clang_version = $(shell clang -dumpversion 2>&1 | cut -f1 -d\.)
+
+# We use -std=c++20 with clang 15.0 and later.
+ifeq ($(shell test $(clang_version) -ge 15 && echo yes),yes)
+    cppflags    += -std=c++20
+else
+    cppflags    += -std=c++17
 endif
 
 nodeprecatedwarnings-cppflags := -Wno-deprecated-declarations

diff --git a/config/Make.rules.Linux b/config/Make.rules.Linux
@@ -140,10 +140,10 @@ shared_ldflags      = $(if $(filter-out program,$($1_target)),\
 cppflags        = -Wall -Wextra -Wredundant-decls -Wshadow -Wdeprecated -Werror -pthread $(if $(filter yes,$(OPTIMIZE)),-DNDEBUG,-g)
 ldflags         = -pthread
 
-# -Wshadow is too strict with gcc 4
-ifeq ($(shell $(CXX) -dumpversion | cut -f1 -d\.),4)
-    cppflags    := $(filter-out -Wshadow,$(cppflags))
-endif
+gcc_version = $(shell $(CXX) -dumpversion 2>&1 | cut -f1 -d\.)
+
+# As of GCC 13.4, https://gcc.gnu.org/projects/cxx-status.html#cxx20 still describes C++20 support as "experimental".
+cppflags       += -std=c++17
 
 nodeprecatedwarnings-cppflags := -Wno-deprecated-declarations
 nounusedparameter-cppflags    := -Wno-unused-parameter

diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
@@ -17,9 +17,6 @@ ifeq ($(os),Darwin)
 include         $(lang_srcdir)/config/Make.xcodesdk.rules
 endif
 
-# We assume Make.rules.$(os) defines cppflags.
-cppflags                += -std=c++17
-
 # Validate platforms and configs
 $(eval $(call validate-config))
 
@@ -78,7 +75,7 @@ define make-cpp-src-project
 ifeq ($(filter all cpp,$(ICE_BIN_DIST)),)
 $1_slicecompiler        := slice2cpp
 $1_sliceflags           += -I$(slicedir)
-$1_cppflags             += -Isrc -I$1/generated -I$(includedir) -I$(includedir)/generated -DICE_BUILDING_SRC -std=c++17
+$1_cppflags             += -Isrc -I$1/generated -I$(includedir) -I$(includedir)/generated -DICE_BUILDING_SRC
 $(make-project)
 srcs:: $1
 endif

diff --git a/cpp/include/Ice/Communicator.h b/cpp/include/Ice/Communicator.h
@@ -19,7 +19,7 @@
 #include <Ice/Incoming.h>
 #include <Ice/IncomingAsync.h>
 #include <Ice/FactoryTableInit.h>
-#include <Ice/Optional.h>
+#include <optional>
 #include <Ice/ExceptionHelpers.h>
 #include <Ice/LoggerF.h>
 #include <Ice/InstrumentationF.h>

diff --git a/cpp/include/Ice/CommunicatorF.h b/cpp/include/Ice/CommunicatorF.h
@@ -13,7 +13,7 @@
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
 #include <Ice/Comparable.h>
-#include <Ice/Optional.h>
+#include <optional>
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_API

diff --git a/cpp/include/Ice/Connection.h b/cpp/include/Ice/Connection.h
@@ -14,7 +14,7 @@
 #include <Ice/StreamHelpers.h>
 #include <Ice/Comparable.h>
 #include <Ice/OutgoingAsync.h>
-#include <Ice/Optional.h>
+#include <optional>
 #include <Ice/ObjectAdapterF.h>
 #include <Ice/Identity.h>
 #include <Ice/Endpoint.h>
@@ -409,7 +409,7 @@ class ICE_CLASS(ICE_API) Connection
      * @param close The close condition
      * @param heartbeat The hertbeat condition
      */
-    virtual void setACM(const Ice::optional<int>& timeout, const Ice::optional<ACMClose>& close, const Ice::optional<ACMHeartbeat>& heartbeat) = 0;
+    virtual void setACM(const std::optional<int>& timeout, const std::optional<ACMClose>& close, const std::optional<ACMHeartbeat>& heartbeat) = 0;
 
     /**
      * Get the ACM parameters.

diff --git a/cpp/include/Ice/ConnectionF.h b/cpp/include/Ice/ConnectionF.h
@@ -13,7 +13,7 @@
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
 #include <Ice/Comparable.h>
-#include <Ice/Optional.h>
+#include <optional>
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_API

diff --git a/cpp/include/Ice/Current.h b/cpp/include/Ice/Current.h
@@ -13,7 +13,7 @@
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
 #include <Ice/Comparable.h>
-#include <Ice/Optional.h>
+#include <optional>
 #include <Ice/ObjectAdapterF.h>
 #include <Ice/ConnectionF.h>
 #include <Ice/Context.h>

diff --git a/cpp/include/Ice/Endpoint.h b/cpp/include/Ice/Endpoint.h
@@ -13,7 +13,7 @@
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
 #include <Ice/Comparable.h>
-#include <Ice/Optional.h>
+#include <optional>
 #include <Ice/Version.h>
 #include <Ice/BuiltinSequences.h>
 #include <Ice/EndpointF.h>

diff --git a/cpp/include/Ice/EndpointF.h b/cpp/include/Ice/EndpointF.h
@@ -13,7 +13,7 @@
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
 #include <Ice/Comparable.h>
-#include <Ice/Optional.h>
+#include <optional>
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_API

diff --git a/cpp/include/Ice/EndpointSelectionType.h b/cpp/include/Ice/EndpointSelectionType.h
@@ -12,7 +12,7 @@
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
 #include <Ice/Comparable.h>
-#include <Ice/Optional.h>
+#include <optional>
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_API

diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
@@ -13,7 +13,7 @@
 #include <Ice/Proxy.h>
 #include <Ice/Current.h>
 #include <Ice/LocalException.h>
-#include <Ice/Optional.h>
+#include <optional>
 #include <Ice/Object.h>
 #include <Ice/SlicedData.h>
 #include <Ice/OutgoingAsync.h>

diff --git a/cpp/include/Ice/ImplicitContext.h b/cpp/include/Ice/ImplicitContext.h
@@ -13,7 +13,7 @@
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
 #include <Ice/Comparable.h>
-#include <Ice/Optional.h>
+#include <optional>
 #include <Ice/ExceptionHelpers.h>
 #include <Ice/LocalException.h>
 #include <Ice/Current.h>

diff --git a/cpp/include/Ice/ImplicitContextF.h b/cpp/include/Ice/ImplicitContextF.h
@@ -12,7 +12,7 @@
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
 #include <Ice/Comparable.h>
-#include <Ice/Optional.h>
+#include <optional>
 #include <IceUtil/UndefSysMacros.h>
 
 namespace Ice

diff --git a/cpp/include/Ice/InputStream.h b/cpp/include/Ice/InputStream.h
@@ -632,7 +632,7 @@ class ICE_API InputStream : public IceInternal::Buffer
      * @param tag The tag ID.
      * @param v Holds the extracted data (if any).
      */
-    template<typename T> void read(Int tag, IceUtil::Optional<T>& v)
+    template<typename T> void read(Int tag, std::optional<T>& v)
     {
         if(readOptional(tag, StreamOptionalHelper<T,
                                              StreamableTraits<T>::helper,
@@ -645,7 +645,7 @@ class ICE_API InputStream : public IceInternal::Buffer
         }
         else
         {
-            v = IceUtil::None;
+            v = std::nullopt;
         }
     }
 
@@ -691,7 +691,7 @@ class ICE_API InputStream : public IceInternal::Buffer
      * Reads a list of optional data values.
      */
     template<typename T>
-    void readAll(std::initializer_list<int> tags, IceUtil::Optional<T>& v)
+    void readAll(std::initializer_list<int> tags, std::optional<T>& v)
     {
         read(*(tags.begin() + tags.size() - 1), v);
     }
@@ -700,7 +700,7 @@ class ICE_API InputStream : public IceInternal::Buffer
      * Reads a list of optional data values.
      */
     template<typename T, typename... Te>
-    void readAll(std::initializer_list<int> tags, IceUtil::Optional<T>& v, IceUtil::Optional<Te>&... ve)
+    void readAll(std::initializer_list<int> tags, std::optional<T>& v, std::optional<Te>&... ve)
     {
         size_t index = tags.size() - sizeof...(ve) - 1;
         read(*(tags.begin() + index), v);

diff --git a/cpp/include/Ice/LocalException.h b/cpp/include/Ice/LocalException.h
@@ -13,7 +13,7 @@
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
 #include <Ice/Comparable.h>
-#include <Ice/Optional.h>
+#include <optional>
 #include <Ice/ExceptionHelpers.h>
 #include <Ice/Identity.h>
 #include <Ice/Version.h>

diff --git a/cpp/include/Ice/Logger.h b/cpp/include/Ice/Logger.h
@@ -12,7 +12,7 @@
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
 #include <Ice/Comparable.h>
-#include <Ice/Optional.h>
+#include <optional>
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_API

diff --git a/cpp/include/Ice/LoggerF.h b/cpp/include/Ice/LoggerF.h
@@ -12,7 +12,7 @@
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
 #include <Ice/Comparable.h>
-#include <Ice/Optional.h>
+#include <optional>
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_API

diff --git a/cpp/include/Ice/Optional.h b/cpp/include/Ice/Optional.h
diff --git a/cpp/include/Ice/OutputStream.h b/cpp/include/Ice/OutputStream.h
@@ -400,7 +400,7 @@ class ICE_API OutputStream : public IceInternal::Buffer
      * @param tag The tag ID.
      * @param v The data value to be written (if any).
      */
-    template<typename T> void write(Int tag, const IceUtil::Optional<T>& v)
+    template<typename T> void write(Int tag, const std::optional<T>& v)
     {
         if(!v)
         {
@@ -489,7 +489,7 @@ class ICE_API OutputStream : public IceInternal::Buffer
      * Writes a list of optional data values.
      */
     template<typename T>
-    void writeAll(std::initializer_list<int> tags, const IceUtil::Optional<T>& v)
+    void writeAll(std::initializer_list<int> tags, const std::optional<T>& v)
     {
         write(*(tags.begin() + tags.size() - 1), v);
     }
@@ -498,7 +498,7 @@ class ICE_API OutputStream : public IceInternal::Buffer
      * Writes a list of optional data values.
      */
     template<typename T, typename... Te>
-    void writeAll(std::initializer_list<int> tags, const IceUtil::Optional<T>& v, const IceUtil::Optional<Te>&... ve)
+    void writeAll(std::initializer_list<int> tags, const std::optional<T>& v, const std::optional<Te>&... ve)
     {
         size_t index = tags.size() - sizeof...(ve) - 1;
         write(*(tags.begin() + index), v);

diff --git a/cpp/include/Ice/Plugin.h b/cpp/include/Ice/Plugin.h
@@ -13,7 +13,7 @@
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
 #include <Ice/Comparable.h>
-#include <Ice/Optional.h>
+#include <optional>
 #include <Ice/LoggerF.h>
 #include <Ice/BuiltinSequences.h>
 #include <IceUtil/UndefSysMacros.h>