From 254a34935a88f0f4a27aef85ea0e4f61115c48ec Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 17 Jun 2018 10:11:57 +0100 Subject: [PATCH] Added more checks for STLPort --- include/etl/largest.h | 2 +- include/etl/message_router.h | 2 +- include/etl/pool.h | 6 +++--- include/etl/smallest.h | 2 +- include/etl/type_traits_generator.h | 4 ++-- include/etl/variant.h | 2 +- include/etl/variant_pool.h | 2 +- include/etl/variant_pool_generator.h | 2 +- include/etl/version.h | 4 ++-- support/Release notes.txt | 4 ++++ 10 files changed, 17 insertions(+), 13 deletions(-) diff --git a/include/etl/largest.h b/include/etl/largest.h index 0bb51c11..a352a582 100644 --- a/include/etl/largest.h +++ b/include/etl/largest.h @@ -33,7 +33,7 @@ SOFTWARE. #endif //*************************************************************************** -// This file has been auto generated. Do not edit this file. +// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE. //*************************************************************************** //*************************************************************************** diff --git a/include/etl/message_router.h b/include/etl/message_router.h index 62f591df..ff1ba20b 100644 --- a/include/etl/message_router.h +++ b/include/etl/message_router.h @@ -31,7 +31,7 @@ SOFTWARE. #endif //*************************************************************************** -// This file has been auto generated. Do not edit this file. +// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE. //*************************************************************************** //*************************************************************************** diff --git a/include/etl/pool.h b/include/etl/pool.h index 8ce26fe1..e110fa43 100644 --- a/include/etl/pool.h +++ b/include/etl/pool.h @@ -134,7 +134,7 @@ namespace etl return reinterpret_cast(allocate_item()); } -#if !ETL_CPP11_SUPPORTED || ETL_POOL_CPP03_CODE +#if !ETL_CPP11_SUPPORTED || ETL_POOL_CPP03_CODE || defined(ETL_STLPORT) //************************************************************************* /// Allocate storage for an object from the pool and create default. /// If asserts or exceptions are enabled and there are no more free items an @@ -499,7 +499,7 @@ namespace etl return ipool::allocate(); } -#if !ETL_CPP11_SUPPORTED || ETL_POOL_CPP03_CODE +#if !ETL_CPP11_SUPPORTED || ETL_POOL_CPP03_CODE || defined(ETL_STLPORT) //************************************************************************* /// Allocate storage for an object from the pool and create with default. /// If asserts or exceptions are enabled and there are no more free items an @@ -650,7 +650,7 @@ namespace etl return base_t::template allocate(); } -#if !ETL_CPP11_SUPPORTED || ETL_POOL_CPP03_CODE +#if !ETL_CPP11_SUPPORTED || ETL_POOL_CPP03_CODE || defined(ETL_STLPORT) //************************************************************************* /// Allocate storage for an object from the pool and create with default. /// If asserts or exceptions are enabled and there are no more free items an diff --git a/include/etl/smallest.h b/include/etl/smallest.h index 33eaaf6a..8b1337e1 100644 --- a/include/etl/smallest.h +++ b/include/etl/smallest.h @@ -33,7 +33,7 @@ SOFTWARE. #endif //*************************************************************************** -// This file has been auto generated. Do not edit this file. +// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE. //*************************************************************************** //*************************************************************************** diff --git a/include/etl/type_traits_generator.h b/include/etl/type_traits_generator.h index c993d746..5151b34e 100644 --- a/include/etl/type_traits_generator.h +++ b/include/etl/type_traits_generator.h @@ -281,14 +281,14 @@ namespace etl /// is_pod /// For C++03, only fundamental and pointers types are recognised. ///\ingroup type_traits -#if (ETL_CPP11_SUPPORTED && !defined(ARDUINO)) && !defined(ETL_IN_UNIT_TEST) +#if (ETL_CPP11_SUPPORTED && !defined(ARDUINO) && !defined(ETL_STLPORT)) && !defined(ETL_IN_UNIT_TEST) // For compilers that support C++11 template struct is_pod : std::is_pod {}; #else template struct is_pod : etl::integral_constant::value || etl::is_pointer::value> {}; #endif -#if (ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED) && !defined(ETL_IN_UNIT_TEST) +#if (ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED) && !defined(ETL_STLPORT) && !defined(ETL_IN_UNIT_TEST) /// is_trivially_constructible ///\ingroup type_traits template struct is_trivially_constructible : std::is_trivially_constructible {}; diff --git a/include/etl/variant.h b/include/etl/variant.h index 182e19c8..db22a746 100644 --- a/include/etl/variant.h +++ b/include/etl/variant.h @@ -711,7 +711,7 @@ namespace etl type_id = other.type_id; } -#if !ETL_CPP11_SUPPORTED +#if !ETL_CPP11_SUPPORTED || defined(ETL_STLPORT) //*************************************************************************** /// Emplace with one constructor parameter. //*************************************************************************** diff --git a/include/etl/variant_pool.h b/include/etl/variant_pool.h index c08dac50..bc66274a 100644 --- a/include/etl/variant_pool.h +++ b/include/etl/variant_pool.h @@ -133,7 +133,7 @@ namespace etl { } -#if !ETL_CPP11_SUPPORTED +#if !ETL_CPP11_SUPPORTED || defined(ETL_STLPORT) //************************************************************************* /// Creates the object. Default constructor. //************************************************************************* diff --git a/include/etl/variant_pool_generator.h b/include/etl/variant_pool_generator.h index 5c117bdf..5c859697 100644 --- a/include/etl/variant_pool_generator.h +++ b/include/etl/variant_pool_generator.h @@ -140,7 +140,7 @@ namespace etl { } -#if !ETL_CPP11_SUPPORTED +#if !ETL_CPP11_SUPPORTED || defined(ETL_STLPORT) //************************************************************************* /// Creates the object. Default constructor. //************************************************************************* diff --git a/include/etl/version.h b/include/etl/version.h index 015898b2..1f59cc16 100644 --- a/include/etl/version.h +++ b/include/etl/version.h @@ -37,10 +37,10 @@ SOFTWARE. /// Definitions of the ETL version ///\ingroup utilities -#define ETL_VERSION "11.11.0" +#define ETL_VERSION "11.11.1" #define ETL_VERSION_MAJOR 11 #define ETL_VERSION_MINOR 11 -#define ETL_VERSION_PATCH 0 +#define ETL_VERSION_PATCH 1 #endif diff --git a/support/Release notes.txt b/support/Release notes.txt index 3501b177..c182077b 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -1,3 +1,7 @@ +=============================================================================== +11.11.1 +Compatibilty changes for Segger IDE, GCC & STLPort + =============================================================================== 11.11.0 Compatibilty changes for Segger IDE, GCC & STLPort