Merge pull request #215 from tcbrindle/pr/add_clang19

Add Clang 19 to CI test matrices
tcbrindle · Nov 5, 2024 · 75648b7 · 75648b7
2 parents 998346a + e20f432
commit 75648b7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        compiler: [GCC-11, GCC-12, GCC-13, GCC-14, Clang-17, Clang-18]
+        compiler: [GCC-11, GCC-12, GCC-13, GCC-14, Clang-17, Clang-18, Clang-19]
         test_with: [Headers, Module]
         build_type: [Debug, Release]
 
@@ -56,6 +56,11 @@ jobs:
             install: |
               brew install llvm@18 ninja binutils
               brew link --force binutils
+          - compiler: Clang-19
+            cxx: $(brew --prefix llvm@19)/bin/clang++
+            install: |
+              brew install llvm@19 ninja binutils
+              brew link --force binutils
 
     steps:
     - uses: actions/checkout@master

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        compiler: [GCC-13, LLVM-Clang-16, LLVM-Clang-17, LLVM-Clang-18]
+        compiler: [GCC-13, LLVM-Clang-16, LLVM-Clang-17, LLVM-Clang-18, LLVM-Clang-19]
         test_with: [Headers, Module]
         build_type: [Debug, Release]
 
@@ -42,6 +42,10 @@ jobs:
             cxx: $(brew --prefix llvm@18)/bin/clang++
             install: |
               brew install llvm@18 ninja
+          - compiler: LLVM-Clang-19
+            cxx: $(brew --prefix llvm@19)/bin/clang++
+            install: |
+              brew install llvm@19 ninja
 
 
     steps:

diff --git a/include/flux/adaptor/flatten_with.hpp b/include/flux/adaptor/flatten_with.hpp
@@ -19,14 +19,10 @@ namespace detail {
 template <std::size_t N>
 inline constexpr auto variant_emplace =
 []<typename... Types>(std::variant<Types...>& variant, auto&&... args) {
-    if constexpr (__cpp_lib_variant >= 202106L) {
-        variant.template emplace<N>(FLUX_FWD(args)...);
+    if (std::is_constant_evaluated()) {
+        variant = std::variant<Types...>(std::in_place_index<N>, FLUX_FWD(args)...); // LCOV_EXCL_LINE
     } else {
-        if (std::is_constant_evaluated()) {
-            variant = std::variant<Types...>(std::in_place_index<N>, FLUX_FWD(args)...); // LCOV_EXCL_LINE
-        } else {
-            variant.template emplace<N>(FLUX_FWD(args)...);
-        }
+        variant.template emplace<N>(FLUX_FWD(args)...);
     }
 };