coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-10-28 18:07:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix Github CI

Browse Source 
GCC 11 incompatibility
This commit is contained in:
John Wellbelove 2025-08-13 08:49:23 +01:00
parent 8f94ef619a
commit b734df629b
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/etl/fsm.h
View File

@ -60,7 +60,9 @@ SOFTWARE.
#include "message_router.h"
#include "integral_limits.h"
#include "largest.h"
#include "tuple.h"
#if ETL_USING_CPP11
#include "tuple.h"
#endif
#include <stdint.h>
@ -223,6 +225,7 @@ namespace etl
class ifsm_state;
#if ETL_USING_CPP11
//***************************************************************************
/// A class to store FSM states.
//***************************************************************************
@ -279,6 +282,7 @@ namespace etl
/// Pointers to the states.
etl::ifsm_state* states[sizeof...(TStates)]{ &etl::get<TStates>(storage)... };
};
#endif
//***************************************************************************
/// Interface class for FSM states.
@ -450,6 +454,7 @@ namespace etl
}
}
#if ETL_USING_CPP11
//*******************************************
/// Set the states for the FSM
/// From an etl::fsm_state_pack.
@ -465,6 +470,7 @@ namespace etl
state_list[i]->set_fsm_context(*this);
}
}
#endif
//*******************************************
/// Starts the FSM.

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

@ -476,6 +476,7 @@ namespace etl
}
}
#if ETL_USING_CPP11
//*******************************************
/// Set the states for the FSM
/// From an etl::fsm_state_pack.
@ -491,6 +492,7 @@ namespace etl
state_list[i]->set_fsm_context(*this);
}
}
#endif
//*******************************************
/// Starts the FSM.

15
test/test_delegate_observable.cpp
View File

@ -96,7 +96,18 @@ namespace
}
};
#if !(defined(ETL_COMPILER_GCC) && (ETL_COMPILER_FULL_VERSION <= 1100))
#if defined(ETL_COMPILER_GCC)
#if (ETL_COMPILER_FULL_VERSION <= 1100)
#define ETL_ENABLE_DELEGATE_OBSERVABLE_CREATE_OBSERVABLE 0
#else
#define ETL_ENABLE_DELEGATE_OBSERVABLE_CREATE_OBSERVABLE 1
#endif
#else
#define ETL_ENABLE_DELEGATE_OBSERVABLE_CREATE_OBSERVABLE 1
#endif
#if ETL_ENABLE_DELEGATE_OBSERVABLE_CREATE_OBSERVABLE
//*************************************************************************
ETL_CONSTEXPR14 Observable CreateObservable()
{
@ -170,7 +181,7 @@ namespace
}
#endif
#if !(defined(ETL_COMPILER_GCC) && (ETL_COMPILER_FULL_VERSION <= 1100))
#if ETL_ENABLE_DELEGATE_OBSERVABLE_CREATE_OBSERVABLE
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_constexpr_delegate_observable_from_function)
{