From 792cb7bcc8b2cce5ce94eca83394633c880a46e0 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Mon, 2 Dec 2019 12:05:27 +0000 Subject: [PATCH] Merge remote-tracking branch 'origin/feature/no_stl_unit_tests' into development # Conflicts: # include/etl/private/choose_pair_types.h # include/etl/private/choose_tag_types.h # include/etl/version.h # library.json # library.properties # support/Release notes.txt --- examples/ArmTimerCallbacks - C++/main.cpp | 3 +++ include/etl/private/choose_pair_types.h | 3 ++- include/etl/private/choose_tag_types.h | 3 ++- include/etl/version.h | 2 +- library.json | 2 +- library.properties | 2 +- support/Release notes.txt | 5 +++++ 7 files changed, 15 insertions(+), 5 deletions(-) diff --git a/examples/ArmTimerCallbacks - C++/main.cpp b/examples/ArmTimerCallbacks - C++/main.cpp index 9a25db0d..4c525f4a 100644 --- a/examples/ArmTimerCallbacks - C++/main.cpp +++ b/examples/ArmTimerCallbacks - C++/main.cpp @@ -16,6 +16,9 @@ extern "C" #include "etl/function.h" #include "etl/callback_timer.h" #include "etl/vector.h" +#include "etl/iterator.h" + +static bool b = etl::is_input_iterator::value; struct FP { diff --git a/include/etl/private/choose_pair_types.h b/include/etl/private/choose_pair_types.h index 2c19e8e8..96ba73fe 100644 --- a/include/etl/private/choose_pair_types.h +++ b/include/etl/private/choose_pair_types.h @@ -33,7 +33,8 @@ SOFTWARE. #include "../platform.h" -#if defined(ETL_IN_UNIT_TEST) // When in the unit tests we have to ensure that the STL and ETL are using the same definitions. +// When in the unit tests we have to ensure that the STL and ETL are using the same definitions. +#if defined(ETL_IN_UNIT_TEST) || !defined(ETL_NO_STL) #include #define ETL_PAIR std::pair #define ETL_MAKE_PAIR std::make_pair diff --git a/include/etl/private/choose_tag_types.h b/include/etl/private/choose_tag_types.h index d6eeebe2..7b536de8 100644 --- a/include/etl/private/choose_tag_types.h +++ b/include/etl/private/choose_tag_types.h @@ -33,7 +33,8 @@ SOFTWARE. #include "../platform.h" -#if defined(ETL_IN_UNIT_TEST) // When in the unit tests we have to ensure that the STL and ETL are using the same definitions. +// When in the unit tests we have to ensure that the STL and ETL are using the same definitions. +#if defined(ETL_IN_UNIT_TEST) || !defined(ETL_NO_STL) #include #define ETL_INPUT_ITERATOR_TAG std::input_iterator_tag #define ETL_OUTPUT_ITERATOR_TAG std::output_iterator_tag diff --git a/include/etl/version.h b/include/etl/version.h index 7f310e09..596fd2bc 100644 --- a/include/etl/version.h +++ b/include/etl/version.h @@ -38,7 +38,7 @@ SOFTWARE. ///\ingroup utilities #define ETL_VERSION_MAJOR 15 -#define ETL_VERSION_MINOR 0 +#define ETL_VERSION_MINOR 1 #define ETL_VERSION_PATCH 0 #define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH) diff --git a/library.json b/library.json index bce97949..ba576b23 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "Embedded Template Library", - "version": "15.0.0", + "version": "15.1.0", "authors": { "name": "John Wellbelove", "email": "" diff --git a/library.properties b/library.properties index 1a7492f1..43611b42 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Embedded Template Library -version=15.0.0 +version=15.1.0 author= John Wellbelove maintainer=John Wellbelove license=MIT diff --git a/support/Release notes.txt b/support/Release notes.txt index 8873de5f..bf5b38b7 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -1,3 +1,8 @@ +=============================================================================== +15.1.0 +Fixes to the conditional compilation of choose_tag_types.h and +choose_pair_types.h to take into account ETL_NO_STL. + =============================================================================== 15.0.0 Unit tests and library code updated so that the ETL may be compiled and tested