Skip to content

Commit faa9a2b

Browse files
andrew-gresykandrew-gresyk
authored
2.5.1
Maintenance release
1 parent 5e195f8 commit faa9a2b

Some content is hidden

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

52 files changed

+899
-583
lines changed

‎.github/workflows/cmake.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ jobs:
4343
CC: gcc-12,
4444
CXX: g++-12
4545
}
46+
- {
47+
OS: ubuntu-24.04,
48+
CC: gcc-13,
49+
CXX: g++-13
50+
}
4651
- {
4752
OS: ubuntu-20.04,
4853
CC: clang-6.0,
@@ -100,11 +105,6 @@ jobs:
100105
CXX: clang++-15,
101106
VERSION: '15'
102107
}
103-
- {
104-
OS: macos-11,
105-
CC: clang,
106-
CXX: clang++
107-
}
108108
- {
109109
OS: macos-12,
110110
CC: clang,

‎.github/workflows/msbuild.yml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,30 @@ on:
66
pull_request:
77
branches: [ master ]
88

9-
env:
10-
SOLUTION_FILE_PATH: projects\premake\hfsm2-vs.sln
11-
129
jobs:
1310
build:
14-
runs-on: windows-latest
11+
runs-on: ${{ matrix.PLATFORM.OS }}
12+
13+
env:
14+
SOLUTION_FILE_PATH: ${{ matrix.PLATFORM.SOLUTION_FILE_PATH }}
15+
PROJECT_FILE_NAME: ${{ matrix.PLATFORM.PROJECT_FILE_NAME }}
1516

1617
strategy:
1718
matrix:
19+
PLATFORM:
20+
- {
21+
OS: windows-2019,
22+
SOLUTION_FILE_PATH: projects\premake\hfsm2-vs-2019.sln,
23+
PROJECT_FILE_NAME: test-15
24+
}
25+
- {
26+
OS: windows-2022,
27+
SOLUTION_FILE_PATH: projects\premake\hfsm2-vs-2022.sln,
28+
PROJECT_FILE_NAME: test-17
29+
}
30+
1831
BUILD_CONFIG: [ Release, Debug ]
19-
BUILD_PLATFORM: [ 32, 64 ]
32+
BUILD_PLATFORM: [ Win32, x64 ]
2033

2134
steps:
2235
- uses: actions/checkout@v4
@@ -26,9 +39,8 @@ jobs:
2639

2740
- name: Build
2841
working-directory: ${{env.GITHUB_WORKSPACE}}
29-
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
3042
run: msbuild /m /p:Configuration=${{matrix.BUILD_CONFIG}} /p:Platform=${{matrix.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}
3143

3244
- name: Test
3345
working-directory: ${{env.GITHUB_WORKSPACE}}
34-
run: "binaries/test-17-${{matrix.BUILD_CONFIG}}-${{matrix.BUILD_PLATFORM}}.exe"
46+
run: "binaries/${{env.PROJECT_FILE_NAME}}-${{matrix.BUILD_CONFIG}}-${{matrix.BUILD_PLATFORM}}.exe"

‎CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
cmake_minimum_required(VERSION 3.5)
22

3+
find_program(CCACHE_PROGRAM ccache)
4+
if(CCACHE_PROGRAM)
5+
message(STATUS "Found ccache in ${CCACHE_PROGRAM}")
6+
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
7+
endif()
8+
39
project(hfsm2_test)
410

511
file(GLOB SOURCE_FILES "test/*.cpp" "test/shared/*.cpp")

‎README.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ Header-only heriarchical FSM framework in C++11, with fully statically-defined s
2020

2121
## Compiler Support
2222

23-
- Visual Studio: 2015, **2017, 2019, 2022**
24-
- GCC: 5, 6, 7, **8, 9, 10, 11, 12**
25-
- ARM GCC: **9**
26-
- Clang: 3.9, 4, 5, **6, 7, 8, 9, 10, 11, 12, 13, 14, 15**
27-
- AppleClang: 12, **13, 13**
28-
29-
(Currently CI-tested toolchains in **bold**)
23+
- Visual Studio: **2015, 2017, 2019, 2022**
24+
- GCC: **8, 9, 10, 11, 12, 13**
25+
- GCC (ARM): **9**
26+
- Clang: **6, 7, 8, 9, 10, 11, 12, 13, 14, 15**
27+
- AppleClang: **14**
3028

3129
---
3230

‎development/hfsm2/detail/root/control_0.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class ConstControlT {
1717
template <typename, typename>
1818
friend class R_;
1919

20-
template <typename, typename, typename>
20+
template <typename, typename>
2121
friend struct QueryWrapperT;
2222

2323
protected:

‎development/hfsm2/detail/root/control_5.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ class EventControlT final
1010
template <typename, typename>
1111
friend class R_;
1212

13-
template <typename, typename, typename>
13+
template <typename, typename>
1414
friend struct PreReactWrapperT;
1515

16-
template <typename, typename, typename>
16+
template <typename, typename>
1717
friend struct ReactWrapperT;
1818

19-
template <typename, typename, typename>
19+
template <typename, typename>
2020
friend struct PostReactWrapperT;
2121

2222
using FullControl = FullControlT<TArgs>;

‎development/hfsm2/detail/structure/composite.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ struct HFSM2_EMPTY_BASES C_
8686
TL_<TSubStates...>
8787
>;
8888

89-
using PreReactWrapper = PreReactWrapperT <HeadState, SubStates, ReactOrder>;
90-
using ReactWrapper = ReactWrapperT <HeadState, SubStates, ReactOrder>;
91-
using PostReactWrapper = PostReactWrapperT<HeadState, SubStates, ReactOrder>;
92-
using QueryWrapper = QueryWrapperT <HeadState, SubStates, ReactOrder>;
89+
using PreReactWrapper = PreReactWrapperT <C_, ReactOrder>;
90+
using ReactWrapper = ReactWrapperT <C_, ReactOrder>;
91+
using PostReactWrapper = PostReactWrapperT<C_, ReactOrder>;
92+
using QueryWrapper = QueryWrapperT <C_, ReactOrder>;
9393

9494
using Info = CI_<STRATEGY, Head, TSubStates...>;
9595
static constexpr Short WIDTH = Info::WIDTH;

‎development/hfsm2/detail/structure/orthogonal.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ struct HFSM2_EMPTY_BASES O_
8686
TSubStates...
8787
>;
8888

89-
using PreReactWrapper = PreReactWrapperT <HeadState, SubStates, ReactOrder>;
90-
using ReactWrapper = ReactWrapperT <HeadState, SubStates, ReactOrder>;
91-
using PostReactWrapper = PostReactWrapperT<HeadState, SubStates, ReactOrder>;
92-
using QueryWrapper = QueryWrapperT <HeadState, SubStates, ReactOrder>;
89+
using PreReactWrapper = PreReactWrapperT <O_, ReactOrder>;
90+
using ReactWrapper = ReactWrapperT <O_, ReactOrder>;
91+
using PostReactWrapper = PostReactWrapperT<O_, ReactOrder>;
92+
using QueryWrapper = QueryWrapperT <O_, ReactOrder>;
9393

9494
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
9595

0 commit comments

Comments
 (0)