Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commiteb0ce18

Browse files
2.8.1
Sync from HFSM2
1 parent74433df commiteb0ce18

File tree

47 files changed

+438
-654
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+438
-654
lines changed

‎.github/workflows/cmake-qemu-arm.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on:ubuntu-20.04
11+
runs-on:ubuntu-latest
1212

1313
env:
1414
CC:arm-linux-gnueabihf-gcc
@@ -27,18 +27,16 @@ jobs:
2727
steps:
2828
-uses:actions/checkout@v4
2929

30-
# install dependencies
3130
-name:Install ARM GCC on ubuntu
3231
run:|
3332
sudo apt-get update
3433
sudo apt-get install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf qemu-user
3534
36-
# main test
37-
-name:Configure Test
38-
run:cmake -B ./build -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_CONFIG }}
35+
-name:Configure
36+
run:cmake -B ./build -DHFSM2_BUILD_TESTS=ON -DHFSM2_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_CONFIG }}
3937
working-directory:${{ github.workspace }}
4038

41-
-name:Build Text
39+
-name:Build
4240
run:cmake --build ./build --config ${{ matrix.BUILD_CONFIG }}
4341
working-directory:${{ github.workspace }}
4442

‎.github/workflows/cmake.yml‎

Lines changed: 35 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ jobs:
1717
strategy:
1818
matrix:
1919
PLATFORM:
20-
-{
21-
OS:ubuntu-20.04,
22-
CC:gcc-8,
23-
CXX:g++-8,
24-
INSTALL:true
25-
}
2620
-{
2721
OS:ubuntu-22.04,
2822
CC:gcc-9,
@@ -49,45 +43,9 @@ jobs:
4943
CXX:g++-13
5044
}
5145
-{
52-
OS:ubuntu-20.04,
53-
CC:clang-6.0,
54-
CXX:clang++-6.0,
55-
VERSION:'6.0'
56-
}
57-
-{
58-
OS:ubuntu-20.04,
59-
CC:clang-7,
60-
CXX:clang++-7,
61-
VERSION:'7'
62-
}
63-
-{
64-
OS:ubuntu-20.04,
65-
CC:clang-8,
66-
CXX:clang++-8,
67-
VERSION:'8'
68-
}
69-
-{
70-
OS:ubuntu-20.04,
71-
CC:clang-9,
72-
CXX:clang++-9,
73-
VERSION:'9'
74-
}
75-
-{
76-
OS:ubuntu-20.04,
77-
CC:clang-10,
78-
CXX:clang++-10,
79-
VERSION:'10'
80-
}
81-
-{
82-
OS:ubuntu-20.04,
83-
CC:clang-11,
84-
CXX:clang++-11,
85-
VERSION:'11'
86-
}
87-
-{
88-
OS:ubuntu-20.04,
89-
CC:clang-12,
90-
CXX:clang++-12
46+
OS:ubuntu-24.04,
47+
CC:gcc-14,
48+
CXX:g++-14
9149
}
9250
-{
9351
OS:ubuntu-22.04,
@@ -106,7 +64,35 @@ jobs:
10664
VERSION:'15'
10765
}
10866
-{
109-
OS:macos-12,
67+
OS:ubuntu-24.04,
68+
CC:clang-16,
69+
CXX:clang++-16,
70+
VERSION:'16'
71+
}
72+
-{
73+
OS:ubuntu-24.04,
74+
CC:clang-17,
75+
CXX:clang++-17,
76+
VERSION:'17'
77+
}
78+
-{
79+
OS:ubuntu-24.04,
80+
CC:clang-18,
81+
CXX:clang++-18,
82+
VERSION:'18'
83+
}
84+
-{
85+
OS:macos-13,
86+
CC:clang,
87+
CXX:clang++
88+
}
89+
-{
90+
OS:macos-14,
91+
CC:clang,
92+
CXX:clang++
93+
}
94+
-{
95+
OS:macos-15,
11096
CC:clang,
11197
CXX:clang++
11298
}
@@ -116,14 +102,11 @@ jobs:
116102
steps:
117103
-uses:actions/checkout@v4
118104

119-
# install dependencies
120105
-name:Install GCC on ubuntu
121106
if:|
122107
startsWith(matrix.PLATFORM.OS, 'ubuntu-') &&
123108
startsWith(matrix.PLATFORM.CC, 'gcc-') &&
124109
matrix.PLATFORM.INSTALL
125-
# run: |
126-
# echo "deb http://dk.archive.ubuntu.com/ubuntu/ bionic main universe" | sudo tee /etc/apt/sources.list
127110
run:|
128111
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
129112
sudo apt-get update
@@ -138,12 +121,11 @@ jobs:
138121
with:
139122
version:${{ matrix.PLATFORM.VERSION }}
140123

141-
# main test
142-
-name:Configure Test
143-
run:cmake -B ./build -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_CONFIG }}
124+
-name:Configure
125+
run:cmake -B ./build -DFFSM2_BUILD_TESTS=ON -DFFSM2_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_CONFIG }}
144126
working-directory:${{ github.workspace }}
145127

146-
-name:Build Test
128+
-name:Build
147129
run:cmake --build ./build --config ${{ matrix.BUILD_CONFIG }}
148130
working-directory:${{ github.workspace }}
149131

‎.github/workflows/codeql.yml‎

Lines changed: 0 additions & 76 deletions
This file was deleted.

‎.github/workflows/flawfinder-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ jobs:
3333
output:'flawfinder_results.sarif'
3434

3535
-name:Upload analysis results to GitHub Security tab
36-
uses:github/codeql-action/upload-sarif@v3
36+
uses:github/codeql-action/upload-sarif@v4
3737
with:
3838
sarif_file:${{github.workspace}}/flawfinder_results.sarif

‎.github/workflows/msbuild.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ jobs:
1717
strategy:
1818
matrix:
1919
PLATFORM:
20-
-{
21-
OS:windows-2019,
22-
SOLUTION_FILE_PATH:projects\premake\ffsm2-vs-2019.sln,
23-
PROJECT_FILE_NAME:test-15
24-
}
2520
-{
2621
OS:windows-2022,
2722
SOLUTION_FILE_PATH:projects\premake\ffsm2-vs-2022.sln,

‎.github/workflows/msvc-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
# Upload SARIF file to GitHub Code Scanning Alerts
4949
-name:Upload SARIF to GitHub
50-
uses:github/codeql-action/upload-sarif@v3
50+
uses:github/codeql-action/upload-sarif@v4
5151
with:
5252
sarif_file:${{ steps.run-analysis.outputs.sarif }}
5353

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ Header-only flat FSM framework in C++11, with fully statically-defined structure
2020

2121
##Compiler Support
2222

23-
- Visual Studio:**2015, 2017, 2019, 2022**
24-
- GCC:**8,9, 10, 11, 12, 13**
23+
- Visual Studio: 2015, 2017, 2019,**2022**
24+
- GCC:**9, 10, 11, 12, 13, 14**
2525
- GCC (ARM):**9**
26-
- Clang:**6, 7, 8, 9, 10, 11, 12, 13, 14, 15**
27-
- AppleClang:**14**
26+
- Clang:**13, 14, 15, 16, 17, 18**
27+
- AppleClang:**15, 16**
2828

2929
---
3030

‎development/ffsm2/detail/containers/array.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ typename DynamicArrayT<T, NC_>::Index
7171
DynamicArrayT<T, NC_>::emplace(TArgs&&... args)noexcept {
7272
FFSM2_ASSERT(_count < CAPACITY);
7373

74-
new (&_items[_count]) Item{forward<TArgs>(args)...};
74+
new (&_items[_count]) Item{::ffsm2::forward<TArgs>(args)...};
7575

7676
return _count++;
7777
}

‎development/ffsm2/detail/features/task_list.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ TaskListT<TP_, NC_>::emplace(TA_&&... args) noexcept {
5959
_vacantTail = INVALID;
6060
}
6161

62-
new (&item) Item{forward<TA_>(args)...};
62+
new (&item) Item{::ffsm2::forward<TA_>(args)...};
6363
++_count;
6464

6565
FFSM2_IF_ASSERT(verifyStructure());

‎development/ffsm2/detail/root/control_3.inl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ FullControlT<ArgsT<TG_, TSL_ FFSM2_IF_SERIALIZATION(, NSB_), NTC_, TTP_>>::updat
8282
_taskStatus.result = TaskStatus::FAILURE;
8383
headState.wrapPlanFailed(*this);
8484

85-
plan().clear();
85+
_core.planData.clearStatuses();
8686
}elseif (subStatus.result == TaskStatus::SUCCESS) {
8787
if (Plan p =plan()) {
8888
TasksBits successesToClear;
@@ -114,7 +114,7 @@ FullControlT<ArgsT<TG_, TSL_ FFSM2_IF_SERIALIZATION(, NSB_), NTC_, TTP_>>::updat
114114
_taskStatus.result = TaskStatus::SUCCESS;
115115
headState.wrapPlanSucceeded(*this);
116116

117-
plan().clear();
117+
_core.planData.clearStatuses();
118118
}
119119
}
120120
}
@@ -159,7 +159,7 @@ FullControlT<ArgsT<TG_, TSL_ FFSM2_IF_SERIALIZATION(, NSB_), NTC_, void>>::updat
159159
_taskStatus.result = TaskStatus::FAILURE;
160160
headState.wrapPlanFailed(*this);
161161

162-
plan().clear();
162+
_core.planData.clearStatuses();
163163
}elseif (subStatus.result == TaskStatus::SUCCESS) {
164164
if (Plan p =plan()) {
165165
TasksBits successesToClear;
@@ -188,7 +188,7 @@ FullControlT<ArgsT<TG_, TSL_ FFSM2_IF_SERIALIZATION(, NSB_), NTC_, void>>::updat
188188
_taskStatus.result = TaskStatus::SUCCESS;
189189
headState.wrapPlanSucceeded(*this);
190190

191-
plan().clear();
191+
_core.planData.clearStatuses();
192192
}
193193
}
194194
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp