Skip to content

Commit f902c75

Browse files
committed
Try the suggested workaround in lexy for older compilers.
1 parent 786636e commit f902c75

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.github/workflows/ccpp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88

99
jobs:
1010
build-linux:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- uses: actions/checkout@v4
1414
with:
@@ -20,7 +20,7 @@ jobs:
2020
path: 'fluxengine-testdata'
2121
- name: apt
2222
run: |
23-
sudo apt install libudev-dev libsqlite3-dev protobuf-compiler libwxgtk3.2-dev libfmt-dev libprotobuf-dev
23+
sudo apt install libudev-dev libsqlite3-dev protobuf-compiler libwxgtk3.0-gtk3-dev libfmt-dev libprotobuf-dev
2424
- name: make
2525
run: CXXFLAGS="-Wp,-D_GLIBCXX_ASSERTIONS" make -j`nproc` -C fluxengine
2626

lib/data/locations.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ namespace grammar
4646
static constexpr auto rule =
4747
dsl::list(dsl::p<member>, dsl::sep(dsl::lit_c<','>));
4848
static constexpr auto value = lexy::fold_inplace<std::vector<unsigned>>(
49-
{},
49+
std::initializer_list<unsigned>{},
5050
[](std::vector<unsigned>& result, const Member& item)
5151
{
5252
if (item.start < 0)
@@ -83,7 +83,8 @@ namespace grammar
8383
static constexpr auto rule =
8484
dsl::list(dsl::p<ch>, dsl::sep(dsl::ascii::space));
8585
static constexpr auto value =
86-
lexy::fold_inplace<std::vector<CylinderHead>>({},
86+
lexy::fold_inplace<std::vector<CylinderHead>>(
87+
std::initializer_list<CylinderHead>{},
8788
[](std::vector<CylinderHead>& result,
8889
const std::vector<CylinderHead>& item)
8990
{

0 commit comments

Comments
 (0)