coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-06-16 00:46:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix Github CI

Browse Source
This commit is contained in:
John Wellbelove 2025-08-12 18:22:52 +01:00
parent 86f76933c1
commit 310cc6e501
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/etl/fsm.h
View File

@ -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?

6
include/etl/generators/fsm_generator.h
View File

@ -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?

4
include/etl/hfsm.h
View File

@ -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))

6
test/test_delegate_observable.cpp
View File

@ -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());