Enable clang 15 workarounds and test in GitHub CI (GridTools#1735)

havogt · Dec 12, 2022 · 29a5896 · 29a5896
1 parent 101f840
commit 29a5896
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ jobs:
     container: ghcr.io/gridtools/gridtools-base:${{ matrix.compiler }}
     strategy:
         matrix:
-            compiler: [gcc-8, gcc-9, gcc-10, clang-11, clang-12, clang-13, clang-14, clang-14-cuda-11, gcc-10-cuda-11, base-hip, gcc-10-hpx]
+            compiler: [gcc-8, gcc-9, gcc-10, clang-11, clang-12, clang-13, clang-14, clang-15, clang-14-cuda-11, gcc-10-cuda-11, base-hip, gcc-10-hpx]
             build_type: [debug, release]
             exclude:
               - compiler: gcc-8

diff --git a/include/gridtools/common/hymap.hpp b/include/gridtools/common/hymap.hpp
@@ -198,7 +198,7 @@ namespace gridtools {
             template <class...>
             struct values;
 
-#if !defined(__NVCC__) && defined(__clang__) && __clang_major__ <= 14
+#if !defined(__NVCC__) && defined(__clang__) && __clang_major__ <= 15
             template <class... Vs>
             values(Vs const &...) -> values<Vs...>;
 #endif

diff --git a/include/gridtools/sid/composite.hpp b/include/gridtools/sid/composite.hpp
@@ -173,7 +173,7 @@ namespace gridtools {
                 struct compressed;
                 template <class...>
                 struct values;
-#if !defined(__NVCC__) && defined(__clang__) && __clang_major__ <= 14
+#if !defined(__NVCC__) && defined(__clang__) && __clang_major__ <= 15
                 template <class... Sids>
                 values(Sids const &...) -> values<Sids...>;
 #endif