From 734e4e654a23b3752178562cd00f1a94ede16430 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Mon, 24 Jan 2022 20:15:17 +0000 Subject: [PATCH] Minor changes Modified MSVC compiler C++11 check --- arduino/library.json | 2 +- .../determine_compiler_language_support.h | 2 +- include/etl/state_chart.h | 100 +++++++++--------- test/vs2019/etl.vcxproj.filters | 13 ++- 4 files changed, 60 insertions(+), 57 deletions(-) diff --git a/arduino/library.json b/arduino/library.json index 3904cd23..257d4f60 100644 --- a/arduino/library.json +++ b/arduino/library.json @@ -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", diff --git a/include/etl/profiles/determine_compiler_language_support.h b/include/etl/profiles/determine_compiler_language_support.h index 8c6aa954..2f38c90d 100644 --- a/include/etl/profiles/determine_compiler_language_support.h +++ b/include/etl/profiles/determine_compiler_language_support.h @@ -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 diff --git a/include/etl/state_chart.h b/include/etl/state_chart.h index 4aa7432b..2852491a 100644 --- a/include/etl/state_chart.h +++ b/include/etl/state_chart.h @@ -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 { diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters index c38f8175..33fbf35c 100644 --- a/test/vs2019/etl.vcxproj.filters +++ b/test/vs2019/etl.vcxproj.filters @@ -181,6 +181,9 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hh;hpp;hxx;hm;inl;inc;xsd + + {d138997a-b860-4420-9f45-87e9e2c52f3b} + @@ -3265,11 +3268,11 @@ Resource Files - - ETL\Arduino - - ETL\Arduino + Resource Files\Arduino + + + Resource Files\Arduino @@ -3326,4 +3329,4 @@ Resource Files - + \ No newline at end of file