Skip to content

Commit 51d6028

Browse files
committed
Merge branch 'develop' into feature/cxx20-modules
2 parents 162f57d + 1f3d0bb commit 51d6028

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ jobs:
182182
- toolset: clang
183183
compiler: clang++-20
184184
cxxstd: "03,11,14,17,20,23,2c"
185-
container: ubuntu:25.04
185+
container: ubuntu:24.04
186186
os: ubuntu-latest
187187
install: clang-20
188188
- toolset: clang
@@ -267,11 +267,6 @@ jobs:
267267
fail-fast: false
268268
matrix:
269269
include:
270-
# msvc-14.0 not included, because it fails with "compiler is out of heap space"
271-
- toolset: msvc-14.2
272-
cxxstd: "14,17,20,latest"
273-
addrmd: 32,64
274-
os: windows-2019
275270
- toolset: msvc-14.3
276271
cxxstd: "14,17,20,latest"
277272
addrmd: 32,64
@@ -283,7 +278,7 @@ jobs:
283278
- toolset: gcc
284279
cxxstd: "03,11,14,17,2a"
285280
addrmd: 64
286-
os: windows-2019
281+
os: windows-2022
287282

288283
runs-on: ${{matrix.os}}
289284

@@ -620,7 +615,7 @@ jobs:
620615
nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++17 -c test/mp_count_if.cpp
621616
622617
cuda-windows:
623-
runs-on: windows-2019
618+
runs-on: windows-latest
624619

625620
steps:
626621
- uses: actions/checkout@v4
@@ -648,8 +643,7 @@ jobs:
648643
fail-fast: false
649644
matrix:
650645
include:
651-
- os: windows-2019
652-
- os: windows-2022
646+
- os: windows-latest
653647

654648
runs-on: ${{matrix.os}}
655649

@@ -698,8 +692,7 @@ jobs:
698692
fail-fast: false
699693
matrix:
700694
include:
701-
- os: windows-2019
702-
- os: windows-2022
695+
- os: windows-latest
703696

704697
runs-on: ${{matrix.os}}
705698

@@ -766,8 +759,7 @@ jobs:
766759
fail-fast: false
767760
matrix:
768761
include:
769-
- os: windows-2019
770-
- os: windows-2022
762+
- os: windows-latest
771763

772764
runs-on: ${{matrix.os}}
773765

doc/mp11/list.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ using R2 = mp_push_back<L2, char[1], char[2]>; // mp_list<void, char[1], char[2]
333333
.Using mp_push_back with mp_list_v
334334
```
335335
using L3 = mp_list_v<0, 1>;
336-
using R3 = mp_push_front<L3, mp_true, mp_false>; // mp_list_v<0, 1, true, false>
336+
using R3 = mp_push_back<L3, mp_true, mp_false>; // mp_list_v<0, 1, true, false>
337337
```
338338

339339
## mp_rename<L, Y>

0 commit comments

Comments
 (0)