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

Minor changes

Browse Source 
Modified MSVC compiler C++11 check
This commit is contained in:
John Wellbelove 2022-01-24 20:15:17 +00:00
parent 3b7f280b32
commit 734e4e654a
4 changed files with 60 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arduino/library.json
View File

@ -7,7 +7,7 @@
},
"homepage": "https://www.etlcpp.com/",
"license": "MIT",
"description": "ETL. A C++ template library tailored for embedded systems. Directories formated for Arduino",
"description": "ETL. A C++ template library tailored for embedded systems. Directories formatted for Arduino",
"keywords": "c-plus-plus, cpp, algorithms, containers, templates",
"repository": {
"type": "git",

2
include/etl/profiles/determine_compiler_language_support.h
View File

@ -114,7 +114,7 @@ SOFTWARE.
#if defined(_MSVC_LANG)
#define ETL_CPP11_SUPPORTED (_MSVC_LANG >= 201103L)
#else
#define ETL_CPP11_SUPPORTED (_MSC_VER >= 1600)
#define ETL_CPP11_SUPPORTED (_MSC_VER >= 1700)
#endif
#elif defined(ETL_COMPILER_ARM5)
#define ETL_CPP11_SUPPORTED 0

100
include/etl/state_chart.h
View File

@ -271,15 +271,6 @@ namespace etl
return TObject_Ref;
}
//*************************************************************************
/// Gets the current state id.
/// \return The current state id.
//*************************************************************************
const state* find_state(state_id_t state_id)
{
return etl::find_if(State_Table_Begin, State_Table_Begin + State_Table_Size, is_state(state_id));
}
//*************************************************************************
/// Start the state chart.
//*************************************************************************
@ -373,6 +364,15 @@ namespace etl
private:
//*************************************************************************
/// Gets the current state id.
/// \return The current state id.
//*************************************************************************
const state* find_state(state_id_t state_id)
{
return etl::find_if(State_Table_Begin, State_Table_Begin + State_Table_Size, is_state(state_id));
}
//*************************************************************************
struct is_transition
{
@ -464,15 +464,6 @@ namespace etl
return TObject_Ref;
}
//*************************************************************************
/// Gets the current state id.
/// \return The current state id.
//*************************************************************************
const state* find_state(state_id_t state_id)
{
return etl::find_if(State_Table_Begin, State_Table_Begin + State_Table_Size, is_state(state_id));
}
//*************************************************************************
/// Start the state chart.
//*************************************************************************
@ -570,6 +561,15 @@ namespace etl
private:
//*************************************************************************
/// Gets the current state id.
/// \return The current state id.
//*************************************************************************
const state* find_state(state_id_t state_id)
{
return etl::find_if(State_Table_Begin, State_Table_Begin + State_Table_Size, is_state(state_id));
}
//*************************************************************************
struct is_transition
{
@ -694,22 +694,6 @@ namespace etl
return object;
}
//*************************************************************************
/// Gets the current state id.
/// \return The current state id.
//*************************************************************************
const state* find_state(state_id_t state_id)
{
if (state_table_begin == ETL_NULLPTR)
{
return state_table_end();
}
else
{
return etl::find_if(state_table_begin, state_table_end(), is_state(state_id));
}
}
//*************************************************************************
/// Start the state chart.
//*************************************************************************
@ -807,6 +791,22 @@ namespace etl
private:
//*************************************************************************
/// Gets the current state id.
/// \return The current state id.
//*************************************************************************
const state* find_state(state_id_t state_id)
{
if (state_table_begin == ETL_NULLPTR)
{
return state_table_end();
}
else
{
return etl::find_if(state_table_begin, state_table_end(), is_state(state_id));
}
}
//*************************************************************************
const transition* const transition_table_end() const
{
@ -948,22 +948,6 @@ namespace etl
return object;
}
//*************************************************************************
/// Gets the current state id.
/// \return The current state id.
//*************************************************************************
const state* find_state(state_id_t state_id)
{
if (state_table_begin == ETL_NULLPTR)
{
return state_table_end();
}
else
{
return etl::find_if(state_table_begin, state_table_end(), is_state(state_id));
}
}
//*************************************************************************
/// Start the state chart.
//*************************************************************************
@ -1057,6 +1041,22 @@ namespace etl
private:
//*************************************************************************
/// Gets the current state id.
/// \return The current state id.
//*************************************************************************
const state* find_state(state_id_t state_id)
{
if (state_table_begin == ETL_NULLPTR)
{
return state_table_end();
}
else
{
return etl::find_if(state_table_begin, state_table_end(), is_state(state_id));
}
}
//*************************************************************************
const transition* const transition_table_end() const
{

13
test/vs2019/etl.vcxproj.filters
View File

@ -181,6 +181,9 @@
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files\Arduino">
<UniqueIdentifier>{d138997a-b860-4420-9f45-87e9e2c52f3b}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\etl\enum_type.h">
@ -3265,11 +3268,11 @@
<None Include="..\..\meson.build">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\arduino\library.properties">
<Filter>ETL\Arduino</Filter>
</None>
<None Include="..\..\arduino\library.json">
<Filter>ETL\Arduino</Filter>
<Filter>Resource Files\Arduino</Filter>
</None>
<None Include="..\..\arduino\library.properties">
<Filter>Resource Files\Arduino</Filter>
</None>
</ItemGroup>
<ItemGroup>
@ -3326,4 +3329,4 @@
<Filter>Resource Files</Filter>
</Natvis>
</ItemGroup>
</Project>
</Project>