Skip to content

Commit cb421d0

Browse files
authored
Merge pull request #155 from jcarpent/devel
Fix Windows C++20 compatibility
2 parents 2268269 + fe31266 commit cb421d0

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

.github/workflows/ci-linux-osx-win-conda.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
build_type: [Release, Debug]
1616
name: [ubuntu-latest, macos-latest, windows-2019-clang-cl, windows-latest]
17-
cxx_std: [17]
17+
cxx_std: [17, 20]
1818
continue_on_error: [false]
1919

2020
include:
@@ -36,12 +36,21 @@ jobs:
3636
build_type: Debug
3737
cxx_std: 17
3838
continue_on_error: true
39+
- name: macos-latest
40+
os: macos-latest
41+
build_type: Debug
42+
cxx_std: 20
43+
continue_on_error: true
3944

4045
exclude:
4146
- name: macos-latest
4247
build_type: Debug
4348
cxx_std: 17
4449
continue_on_error: false
50+
- name: macos-latest
51+
build_type: Debug
52+
cxx_std: 20
53+
continue_on_error: false
4554

4655
steps:
4756
- uses: actions/checkout@v2
@@ -179,4 +188,4 @@ jobs:
179188
- name: Display ccache statistics [Conda]
180189
shell: bash -l {0}
181190
run: |
182-
echo $(ccache -s)
191+
echo $(ccache -s)

include/proxsuite/linalg/veg/internal/macros.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1148,7 +1148,7 @@ struct StrLiteralLen<StrLiteralImpl<N> const>
11481148
template<typename Seq, auto Literal>
11491149
struct StrLiteralExpand;
11501150

1151-
template<usize... Is, StrLiteralImpl<isize{ sizeof...(Is) }> L>
1151+
template<usize... Is, StrLiteralImpl<static_cast<isize>(sizeof...(Is))> L>
11521152
struct StrLiteralExpand<_meta::integer_sequence<usize, Is...>, L>
11531153
{
11541154
using Type = StrLiteralConstant<L._[Is]...>;

0 commit comments

Comments
 (0)