Add support for Clang 16 (#2774)

zeroc-ice · Sep 24, 2024 · 5efb9f4 · 5efb9f4
1 parent cd8dfb0
commit 5efb9f4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/config/Make.rules.Darwin b/config/Make.rules.Darwin
@@ -35,7 +35,8 @@ endif
 shared_cppflags = $(if $(filter-out program,$($1_target)),-fPIC) -fvisibility=hidden
 
 cppflags        = -Wall -Wextra -Wshadow -Wshadow-all -Wredundant-decls -Wno-shadow-field \
-                  -Wdeprecated -Wstrict-prototypes -Werror -Wconversion -Wdocumentation -pthread \
+                  -Wdeprecated -Wstrict-prototypes -Werror -Wconversion -Wdocumentation -Wno-shadow-uncaptured-local \
+                  -pthread \
                   $(if $(filter yes,$(OPTIMIZE)),-O2 -DNDEBUG,-g)
 
 ifeq ($(MAXWARN),yes)

diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
@@ -19,8 +19,14 @@
 #include <Ice/LocalException.h>
 #include <Ice/UniquePtr.h>
 
-#ifndef ICE_CPP11_MAPPING
-#    include <Ice/AsyncResult.h>
+#ifdef ICE_CPP11_MAPPING
+#   ifdef __clang__
+#       pragma clang diagnostic push
+        // See #2747
+#       pragma clang diagnostic ignored "-Wshadow-uncaptured-local"
+#   endif
+#else
+#   include <Ice/AsyncResult.h>
 #endif
 
 #include <exception>
@@ -853,4 +859,10 @@ newCallback(T* instance,
 
 #endif
 
+#ifdef ICE_CPP11_MAPPING
+#   ifdef __clang__
+#       pragma clang diagnostic pop
+#   endif
+#endif
+
 #endif