Skip to content

Commit

Permalink
2.3.0
Browse files Browse the repository at this point in the history
updated version info and readme
  • Loading branch information
andrew-gresyk authored Jun 8, 2023
1 parent 8359a8e commit 3d7f44a
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 67 deletions.
40 changes: 0 additions & 40 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,6 @@ jobs:
strategy:
matrix:
PLATFORM:
- {
OS: ubuntu-18.04,
CC: gcc-5,
CXX: g++-5,
INSTALL: true
}
- {
OS: ubuntu-18.04,
CC: gcc-6,
CXX: g++-6,
INSTALL: true
}
- {
OS: ubuntu-18.04,
CC: gcc-7,
CXX: g++-7
}
- {
OS: ubuntu-20.04,
CC: gcc-8,
Expand All @@ -60,24 +43,6 @@ jobs:
CC: gcc-12,
CXX: g++-12
}
- {
OS: ubuntu-18.04,
CC: clang-3.9,
CXX: clang++-3.9,
VERSION: '3.9'
}
- {
OS: ubuntu-18.04,
CC: clang-4.0,
CXX: clang++-4.0,
VERSION: '4.0'
}
- {
OS: ubuntu-18.04,
CC: clang-5.0,
CXX: clang++-5.0,
VERSION: '5.0'
}
- {
OS: ubuntu-20.04,
CC: clang-6.0,
Expand Down Expand Up @@ -135,11 +100,6 @@ jobs:
CXX: clang++-15,
VERSION: '15'
}
- {
OS: macos-10.15,
CC: clang,
CXX: clang++
}
- {
OS: macos-11,
CC: clang,
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ 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**
- 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**
- 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**)

Expand Down
6 changes: 3 additions & 3 deletions development/hfsm2/machine_dev.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// HFSM2 (hierarchical state machine for games and interactive applications)
// 2.2.3 (2023-02-07)
// 2.3.0 (2023-06-08)
//
// Created by Andrew Gresyk
//
Expand Down Expand Up @@ -32,8 +32,8 @@
#pragma once

#define HFSM2_VERSION_MAJOR 2
#define HFSM2_VERSION_MINOR 2
#define HFSM2_VERSION_PATCH 3
#define HFSM2_VERSION_MINOR 3
#define HFSM2_VERSION_PATCH 0

#define HFSM2_VERSION (10000 * HFSM2_VERSION_MAJOR + 100 * HFSM2_VERSION_MINOR + HFSM2_VERSION_PATCH)

Expand Down
32 changes: 11 additions & 21 deletions include/hfsm2/machine.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// HFSM2 (hierarchical state machine for games and interactive applications)
// 2.2.3 (2023-02-07)
// 2.3.0 (2023-06-08)
//
// Created by Andrew Gresyk
//
Expand Down Expand Up @@ -32,8 +32,8 @@
#pragma once

#define HFSM2_VERSION_MAJOR 2
#define HFSM2_VERSION_MINOR 2
#define HFSM2_VERSION_PATCH 3
#define HFSM2_VERSION_MINOR 3
#define HFSM2_VERSION_PATCH 0

#define HFSM2_VERSION (10000 * HFSM2_VERSION_MAJOR + 100 * HFSM2_VERSION_MINOR + HFSM2_VERSION_PATCH)

Expand Down Expand Up @@ -2054,7 +2054,14 @@ template <typename T>
HFSM2_CONSTEXPR(11)
T
filler() noexcept {
return T{INVALID_SHORT};
return T{};
}

template <>
HFSM2_CONSTEXPR(11)
Short
filler<Short>() noexcept {
return INVALID_SHORT;
}

template <typename T, Long NCapacity>
Expand Down Expand Up @@ -3791,9 +3798,6 @@ struct Status final {
HFSM2_CONSTEXPR(14) Status operator | (Status& lhs, const Status rhs) noexcept;
HFSM2_CONSTEXPR(14) Status& operator |= (Status& lhs, const Status rhs) noexcept;

template <>
HFSM2_CONSTEXPR(11) Status filler<Status>() noexcept;

#if HFSM2_PLANS_AVAILABLE()

#pragma pack(push, 2)
Expand All @@ -3803,13 +3807,6 @@ struct TaskLink final {
Long next = INVALID_LONG;
};

template <>
HFSM2_CONSTEXPR(11)
TaskLink
filler<TaskLink>() noexcept {
return TaskLink{};
}

struct Bounds final {
Long first = INVALID_LONG;
Long last = INVALID_LONG;
Expand Down Expand Up @@ -4073,13 +4070,6 @@ operator |= (Status& lhs,
return lhs;
}

template <>
HFSM2_CONSTEXPR(11)
Status
filler<Status>() noexcept {
return Status{};
}

#if HFSM2_PLANS_AVAILABLE()

template <typename TC, typename TG, typename TSL, typename TRL, Long NCC_, Long NOC, Long NOU HFSM2_IF_SERIALIZATION(, Long NSB), Long NSL, Long NTC, typename TTP>
Expand Down

0 comments on commit 3d7f44a

Please sign in to comment.