From 29a5896142c2542804cba905ae44f7241f9ebb39 Mon Sep 17 00:00:00 2001
From: Hannes Vogt <hannes@havogt.de>
Date: Mon, 5 Dec 2022 14:27:01 +0100
Subject: [PATCH] Enable clang 15 workarounds and test in GitHub CI (#1735)

---
 .github/workflows/tests.yml         | 2 +-
 include/gridtools/common/hymap.hpp  | 2 +-
 include/gridtools/sid/composite.hpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e5c444b9a..313c21441 100644
--- 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
index f410874d9..5e81d5774 100644
--- 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
index 095a4878a..6d24adc13 100644
--- 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