Added fixes for building with clang 19 (more strict template matching rules)

Mykola Vankovych · Mykola Vankovych · commit 475bedb15252 · 2025-01-14T17:19:22.000+01:00
diff --git a/include/xtensor/xexpression_traits.hpp b/include/xtensor/xexpression_traits.hpp
@@ -103,16 +103,15 @@ namespace xt
             using type = xarray<T, L>;
         };
 
-#if defined(__GNUC__) && (__GNUC__ > 6)
-#if __cplusplus == 201703L
+// Workaround for rebind_container problems when C++17 feature is enabled
+#ifdef __cpp_template_template_args
         template <template <class, std::size_t, class, bool> class S, class X, std::size_t N, class A, bool Init>
         struct xtype_for_shape<S<X, N, A, Init>>
         {
             template <class T, layout_type L>
             using type = xarray<T, L>;
         };
-#endif  // __cplusplus == 201703L
-#endif  // __GNUC__ && (__GNUC__ > 6)
+#endif  // __cpp_template_template_args
 
         template <template <class, std::size_t> class S, class X, std::size_t N>
         struct xtype_for_shape<S<X, N>>
diff --git a/include/xtensor/xstorage.hpp b/include/xtensor/xstorage.hpp
@@ -1637,8 +1637,8 @@ namespace xt
         return !(lhs < rhs);
     }
 
-// Workaround for rebind_container problems on GCC 8 with C++17 enabled
-#if defined(__GNUC__) && __GNUC__ > 6 && !defined(__clang__) && __cplusplus >= 201703L
+// Workaround for rebind_container problems when C++17 feature is enabled
+#ifdef __cpp_template_template_args
     template <class X, class T, std::size_t N>
     struct rebind_container<X, aligned_array<T, N>>
     {
diff --git a/include/xtensor/xutils.hpp b/include/xtensor/xutils.hpp
@@ -1023,7 +1023,8 @@ namespace xt
         using type = C<X, allocator>;
     };
 
-#if defined(__GNUC__) && __GNUC__ > 6 && !defined(__clang__) && __cplusplus >= 201703L
+// Workaround for rebind_container problems when C++17 feature is enabled
+#ifdef __cpp_template_template_args
     template <class X, class T, std::size_t N>
     struct rebind_container<X, std::array<T, N>>
     {

Original file line number	Diff line number	Diff line change
`@@ -1637,8 +1637,8 @@ namespace xt`
`1637`	`1637`	`return !(lhs < rhs);`
`1638`	`1638`	`}`
`1639`	`1639`
`1640`		`-// Workaround for rebind_container problems on GCC 8 with C++17 enabled`
`1641`		`-#if defined(__GNUC__) && __GNUC__ > 6 && !defined(__clang__) && __cplusplus >= 201703L`
	`1640`	`+// Workaround for rebind_container problems when C++17 feature is enabled`
	`1641`	`+#ifdef __cpp_template_template_args`
`1642`	`1642`	`template <class X, class T, std::size_t N>`
`1643`	`1643`	`struct rebind_container<X, aligned_array<T, N>>`
`1644`	`1644`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1023,7 +1023,8 @@ namespace xt`
`1023`	`1023`	`using type = C<X, allocator>;`
`1024`	`1024`	`};`
`1025`	`1025`
`1026`		`-#if defined(__GNUC__) && __GNUC__ > 6 && !defined(__clang__) && __cplusplus >= 201703L`
	`1026`	`+// Workaround for rebind_container problems when C++17 feature is enabled`
	`1027`	`+#ifdef __cpp_template_template_args`
`1027`	`1028`	`template <class X, class T, std::size_t N>`
`1028`	`1029`	`struct rebind_container<X, std::array<T, N>>`
`1029`	`1030`	`{`