From 310cc6e501c16ec34cddffed516ef9d42673dcd9 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 12 Aug 2025 18:22:52 +0100 Subject: [PATCH] Attempt to fix Github CI --- include/etl/fsm.h | 6 +++--- include/etl/generators/fsm_generator.h | 6 +++--- include/etl/hfsm.h | 4 ++-- test/test_delegate_observable.cpp | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/etl/fsm.h b/include/etl/fsm.h index d12a301a..85fbf68d 100644 --- a/include/etl/fsm.h +++ b/include/etl/fsm.h @@ -240,7 +240,7 @@ namespace etl //********************************* // The number of states. //********************************* - static constexpr size_t size() + static ETL_CONSTEXPR size_t size() { return sizeof...(TStates); } @@ -632,7 +632,7 @@ namespace etl { if (have_changed_state(next_state_id)) { - ETL_ASSERT_OR_RETURN(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception)); + ETL_ASSERT_OR_RETURN_VALUE(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception), p_state->get_state_id()); etl::ifsm_state* p_next_state = state_list[next_state_id]; do @@ -644,7 +644,7 @@ namespace etl if (have_changed_state(next_state_id)) { - ETL_ASSERT_OR_RETURN(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception)); + ETL_ASSERT_OR_RETURN_VALUE(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception), p_state->get_state_id()); p_next_state = state_list[next_state_id]; } } while (p_next_state != p_state); // Have we changed state again? diff --git a/include/etl/generators/fsm_generator.h b/include/etl/generators/fsm_generator.h index 143b2708..8eaee60e 100644 --- a/include/etl/generators/fsm_generator.h +++ b/include/etl/generators/fsm_generator.h @@ -259,7 +259,7 @@ namespace etl //********************************* // The number of states. //********************************* - static constexpr size_t size() + static ETL_CONSTEXPR size_t size() { return sizeof...(TStates); } @@ -536,7 +536,7 @@ namespace etl if (have_changed_state(next_state_id)) { - ETL_ASSERT_OR_RETURN(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception)); + ETL_ASSERT_OR_RETURN_VALUE(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception), p_state->get_state_id()); etl::ifsm_state* p_next_state = state_list[next_state_id]; do @@ -548,7 +548,7 @@ namespace etl if (have_changed_state(next_state_id)) { - ETL_ASSERT_OR_RETURN(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception)); + ETL_ASSERT_OR_RETURN_VALUE(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception), p_state->get_state_id()); p_next_state = state_list[next_state_id]; } } while (p_next_state != p_state); // Have we changed state again? diff --git a/include/etl/hfsm.h b/include/etl/hfsm.h index 127ea9f4..d86ee39a 100644 --- a/include/etl/hfsm.h +++ b/include/etl/hfsm.h @@ -219,7 +219,7 @@ namespace etl { if (have_changed_state(next_state_id)) { - ETL_ASSERT_OR_RETURN(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception)); + ETL_ASSERT_OR_RETURN_VALUE(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception), p_state->get_state_id()); etl::ifsm_state* p_next_state = state_list[next_state_id]; etl::ifsm_state* p_root = common_ancestor(p_state, p_next_state); @@ -227,7 +227,7 @@ namespace etl do_exits(p_root, p_state); next_state_id = do_enters(p_root, p_next_state, true); - ETL_ASSERT_OR_RETURN(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception)); + ETL_ASSERT_OR_RETURN_VALUE(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception), p_state->get_state_id()); p_state = state_list[next_state_id]; } else if (is_self_transition(next_state_id)) diff --git a/test/test_delegate_observable.cpp b/test/test_delegate_observable.cpp index ec86eeca..010786f6 100644 --- a/test/test_delegate_observable.cpp +++ b/test/test_delegate_observable.cpp @@ -117,7 +117,7 @@ namespace //************************************************************************* TEST_FIXTURE(SetupFixture, test_constexpr_delegate_observable) { - ETL_CONSTEXPR14 Observable observable(global_callback, member_callback); + static ETL_CONSTEXPR14 Observable observable(global_callback, member_callback); CHECK_EQUAL(2, observable.number_of_observers()); @@ -144,7 +144,7 @@ namespace //************************************************************************* TEST_FIXTURE(SetupFixture, test_constexpr_delegate_observable_using_template_deduction_guide_cpp17) { - ETL_CONSTEXPR14 etl::delegate_observable observable(int{}, global_callback, member_callback); + static ETL_CONSTEXPR14 etl::delegate_observable observable(int{}, global_callback, member_callback); CHECK_EQUAL(2, observable.number_of_observers()); @@ -171,7 +171,7 @@ namespace //************************************************************************* TEST_FIXTURE(SetupFixture, test_constexpr_delegate_observable_from_function) { - ETL_CONSTEXPR14 Observable observable = CreateObservable(); + static ETL_CONSTEXPR14 Observable observable = CreateObservable(); CHECK_EQUAL(1, observable.number_of_observers());