2.5.1

Maintenance release
andrew-gresyk · May 25, 2024 · faa9a2b · faa9a2b
1 parent 5e195f8
commit faa9a2b
Show file tree

Hide file tree

Showing 52 changed files with 899 additions and 583 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -43,6 +43,11 @@ jobs:
               CC: gcc-12,
               CXX: g++-12
             }
+          - {
+              OS: ubuntu-24.04,
+              CC: gcc-13,
+              CXX: g++-13
+            }
           - {
               OS: ubuntu-20.04,
               CC: clang-6.0,
@@ -100,11 +105,6 @@ jobs:
               CXX: clang++-15,
               VERSION: '15'
             }
-          - {
-              OS: macos-11,
-              CC: clang,
-              CXX: clang++
-            }
           - {
               OS: macos-12,
               CC: clang,

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -6,17 +6,30 @@ on:
   pull_request:
     branches: [ master ]
 
-env:
-  SOLUTION_FILE_PATH: projects\premake\hfsm2-vs.sln
-
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ${{ matrix.PLATFORM.OS }}
+
+    env:
+      SOLUTION_FILE_PATH: ${{ matrix.PLATFORM.SOLUTION_FILE_PATH }}
+      PROJECT_FILE_NAME: ${{ matrix.PLATFORM.PROJECT_FILE_NAME }}
 
     strategy:
       matrix:
+        PLATFORM:
+          - {
+              OS: windows-2019,
+              SOLUTION_FILE_PATH: projects\premake\hfsm2-vs-2019.sln,
+              PROJECT_FILE_NAME: test-15
+            }
+          - {
+              OS: windows-2022,
+              SOLUTION_FILE_PATH: projects\premake\hfsm2-vs-2022.sln,
+              PROJECT_FILE_NAME: test-17
+            }
+
         BUILD_CONFIG: [ Release, Debug ]
-        BUILD_PLATFORM: [ 32, 64 ]
+        BUILD_PLATFORM: [ Win32, x64 ]
 
     steps:
     - uses: actions/checkout@v4
@@ -26,9 +39,8 @@ jobs:
 
     - name: Build
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
       run: msbuild /m /p:Configuration=${{matrix.BUILD_CONFIG}} /p:Platform=${{matrix.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}
 
     - name: Test
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: "binaries/test-17-${{matrix.BUILD_CONFIG}}-${{matrix.BUILD_PLATFORM}}.exe"
+      run: "binaries/${{env.PROJECT_FILE_NAME}}-${{matrix.BUILD_CONFIG}}-${{matrix.BUILD_PLATFORM}}.exe"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,11 @@
 cmake_minimum_required(VERSION 3.5)
 
+find_program(CCACHE_PROGRAM ccache)
+if(CCACHE_PROGRAM)
+	message(STATUS "Found ccache in ${CCACHE_PROGRAM}")
+	set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+endif()
+
 project(hfsm2_test)
 
 file(GLOB SOURCE_FILES "test/*.cpp" "test/shared/*.cpp")

diff --git a/README.md b/README.md
@@ -20,13 +20,11 @@ Header-only heriarchical FSM framework in C++11, with fully statically-defined s
 
 ## Compiler Support
 
-- Visual Studio: 2015, **2017, 2019, 2022**
-- GCC: 5, 6, 7, **8, 9, 10, 11, 12**
-- ARM GCC: **9**
-- Clang: 3.9, 4, 5, **6, 7, 8, 9, 10, 11, 12, 13, 14, 15**
-- AppleClang: 12, **13, 13**
-
-(Currently CI-tested toolchains in **bold**)
+- Visual Studio: **2015, 2017, 2019, 2022**
+- GCC: **8, 9, 10, 11, 12, 13**
+- GCC (ARM): **9**
+- Clang: **6, 7, 8, 9, 10, 11, 12, 13, 14, 15**
+- AppleClang: **14**
 
 ---
 

diff --git a/development/hfsm2/detail/root/control_0.hpp b/development/hfsm2/detail/root/control_0.hpp
@@ -17,7 +17,7 @@ class ConstControlT {
 	template <typename, typename>
 	friend class R_;
 
-	template <typename, typename, typename>
+	template <typename, typename>
 	friend struct QueryWrapperT;
 
 protected:

diff --git a/development/hfsm2/detail/root/control_5.hpp b/development/hfsm2/detail/root/control_5.hpp
@@ -10,13 +10,13 @@ class EventControlT final
 	template <typename, typename>
 	friend class R_;
 
-	template <typename, typename, typename>
+	template <typename, typename>
 	friend struct PreReactWrapperT;
 
-	template <typename, typename, typename>
+	template <typename, typename>
 	friend struct ReactWrapperT;
 
-	template <typename, typename, typename>
+	template <typename, typename>
 	friend struct PostReactWrapperT;
 
 	using FullControl	= FullControlT<TArgs>;

diff --git a/development/hfsm2/detail/structure/composite.hpp b/development/hfsm2/detail/structure/composite.hpp
@@ -86,10 +86,10 @@ struct HFSM2_EMPTY_BASES C_
 								  TL_<TSubStates...>
 							  >;
 
-	using PreReactWrapper	= PreReactWrapperT <HeadState, SubStates, ReactOrder>;
-	using ReactWrapper		= ReactWrapperT	   <HeadState, SubStates, ReactOrder>;
-	using PostReactWrapper	= PostReactWrapperT<HeadState, SubStates, ReactOrder>;
-	using QueryWrapper		= QueryWrapperT	   <HeadState, SubStates, ReactOrder>;
+	using PreReactWrapper	= PreReactWrapperT <C_, ReactOrder>;
+	using ReactWrapper		= ReactWrapperT	   <C_, ReactOrder>;
+	using PostReactWrapper	= PostReactWrapperT<C_, ReactOrder>;
+	using QueryWrapper		= QueryWrapperT	   <C_, ReactOrder>;
 
 	using Info				= CI_<STRATEGY, Head, TSubStates...>;
 	static constexpr Short WIDTH		  = Info::WIDTH;

diff --git a/development/hfsm2/detail/structure/orthogonal.hpp b/development/hfsm2/detail/structure/orthogonal.hpp
@@ -86,10 +86,10 @@ struct HFSM2_EMPTY_BASES O_
 							  TSubStates...
 						  >;
 
-	using PreReactWrapper	= PreReactWrapperT <HeadState, SubStates, ReactOrder>;
-	using ReactWrapper		= ReactWrapperT	   <HeadState, SubStates, ReactOrder>;
-	using PostReactWrapper	= PostReactWrapperT<HeadState, SubStates, ReactOrder>;
-	using QueryWrapper		= QueryWrapperT	   <HeadState, SubStates, ReactOrder>;
+	using PreReactWrapper	= PreReactWrapperT <O_, ReactOrder>;
+	using ReactWrapper		= ReactWrapperT	   <O_, ReactOrder>;
+	using PostReactWrapper	= PostReactWrapperT<O_, ReactOrder>;
+	using QueryWrapper		= QueryWrapperT	   <O_, ReactOrder>;
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -