From 0b33fff6b7fe9186b08907a0aba419889e1c31fe Mon Sep 17 00:00:00 2001
From: Felix Thaler <thaler@cscs.ch>
Date: Mon, 23 Feb 2026 09:56:43 +0100
Subject: [PATCH] Fixes for newer Clang versions

---
 include/gridtools/common/hymap.hpp                | 15 +++++++--------
 .../frontend/cartesian/expressions/expr_pow.hpp   |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/include/gridtools/common/hymap.hpp b/include/gridtools/common/hymap.hpp
index 6c93c6f46..8265d84b7 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__ <= 17
+#if !defined(__NVCC__) && defined(__clang__)
             template <class... Vs>
             values(Vs const &...) -> values<Vs...>;
 #endif
@@ -213,16 +213,18 @@ namespace gridtools {
         template <class... Keys>
         template <class... Vals>
         struct keys<Keys...>::values {
+#if !defined(__clang__) || __clang_major__ < 18
             static_assert(sizeof...(Vals) == sizeof...(Keys), "invalid hymap");
+#endif
 
             tuple<Vals...> m_vals;
 
             template <class... Args,
-                std::enable_if_t<std::conjunction_v<std::is_constructible<Vals, Args>...>, int> = 0>
+                std::enable_if_t<sizeof...(Args) == sizeof...(Vals) &&
+                                     std::conjunction_v<std::is_constructible<Vals, Args>...>,
+                    int> = 0>
             constexpr GT_FUNCTION values(Args &&...args) noexcept : m_vals{std::forward<Args>(args)...} {}
 
-            constexpr GT_FUNCTION values(Vals const &...args) noexcept : m_vals(args...) {}
-
             constexpr GT_FUNCTION values(tuple<Vals...> &&args) noexcept : m_vals(std::move(args)) {}
             constexpr GT_FUNCTION values(tuple<Vals...> const &args) noexcept : m_vals(args) {}
 
@@ -234,10 +236,7 @@ namespace gridtools {
 
             template <class Src>
             constexpr GT_FUNCTION
-                std::enable_if_t<((!std::is_same_v<values, std::decay_t<Src>> && is_hymap<std::decay_t<Src>>::value) &&
-                                     ... &&
-                                     std::is_assignable_v<Vals &,
-                                         std::add_lvalue_reference_t<element_at<Keys, std::remove_reference_t<Src>>>>),
+                std::enable_if_t<!std::is_same_v<values, std::decay_t<Src>> && is_hymap<std::decay_t<Src>>::value,
                     values &>
                 operator=(Src &&src) {
                 (...,
diff --git a/include/gridtools/stencil/frontend/cartesian/expressions/expr_pow.hpp b/include/gridtools/stencil/frontend/cartesian/expressions/expr_pow.hpp
index 58365b188..0a5c9520c 100644
--- a/include/gridtools/stencil/frontend/cartesian/expressions/expr_pow.hpp
+++ b/include/gridtools/stencil/frontend/cartesian/expressions/expr_pow.hpp
@@ -21,7 +21,7 @@ namespace gridtools {
                 struct pow_f {
                     template <class Arg>
                     GT_FUNCTION constexpr auto operator()(Arg const &arg) const {
-                        return gt_pow<I>::template apply(arg);
+                        return gt_pow<I>::apply(arg);
                     }
                 };