Skip to content

Commit 75648b7

Browse files
authored
Merge pull request #215 from tcbrindle/pr/add_clang19
Add Clang 19 to CI test matrices
2 parents 998346a + e20f432 commit 75648b7

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

.github/workflows/linux.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
compiler: [GCC-11, GCC-12, GCC-13, GCC-14, Clang-17, Clang-18]
14+
compiler: [GCC-11, GCC-12, GCC-13, GCC-14, Clang-17, Clang-18, Clang-19]
1515
test_with: [Headers, Module]
1616
build_type: [Debug, Release]
1717

@@ -56,6 +56,11 @@ jobs:
5656
install: |
5757
brew install llvm@18 ninja binutils
5858
brew link --force binutils
59+
- compiler: Clang-19
60+
cxx: $(brew --prefix llvm@19)/bin/clang++
61+
install: |
62+
brew install llvm@19 ninja binutils
63+
brew link --force binutils
5964
6065
steps:
6166
- uses: actions/checkout@master

.github/workflows/macos.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: macos-latest
1515
strategy:
1616
matrix:
17-
compiler: [GCC-13, LLVM-Clang-16, LLVM-Clang-17, LLVM-Clang-18]
17+
compiler: [GCC-13, LLVM-Clang-16, LLVM-Clang-17, LLVM-Clang-18, LLVM-Clang-19]
1818
test_with: [Headers, Module]
1919
build_type: [Debug, Release]
2020

@@ -42,6 +42,10 @@ jobs:
4242
cxx: $(brew --prefix llvm@18)/bin/clang++
4343
install: |
4444
brew install llvm@18 ninja
45+
- compiler: LLVM-Clang-19
46+
cxx: $(brew --prefix llvm@19)/bin/clang++
47+
install: |
48+
brew install llvm@19 ninja
4549
4650
4751
steps:

include/flux/adaptor/flatten_with.hpp

+3-7
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,10 @@ namespace detail {
1919
template <std::size_t N>
2020
inline constexpr auto variant_emplace =
2121
[]<typename... Types>(std::variant<Types...>& variant, auto&&... args) {
22-
if constexpr (__cpp_lib_variant >= 202106L) {
23-
variant.template emplace<N>(FLUX_FWD(args)...);
22+
if (std::is_constant_evaluated()) {
23+
variant = std::variant<Types...>(std::in_place_index<N>, FLUX_FWD(args)...); // LCOV_EXCL_LINE
2424
} else {
25-
if (std::is_constant_evaluated()) {
26-
variant = std::variant<Types...>(std::in_place_index<N>, FLUX_FWD(args)...); // LCOV_EXCL_LINE
27-
} else {
28-
variant.template emplace<N>(FLUX_FWD(args)...);
29-
}
25+
variant.template emplace<N>(FLUX_FWD(args)...);
3026
}
3127
};
3228

0 commit comments

Comments
 (0)