diff --git a/library.properties b/library.properties index feff42fd..bea30a02 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Embedded Template Library -version=10.11.1 +version=10.11.2 author= John Wellbelove maintainer=John Wellbelove sentence=A C++ template library tailored for embedded systems. diff --git a/src/platform.h b/src/platform.h index e50d4f19..8dd01fc9 100644 --- a/src/platform.h +++ b/src/platform.h @@ -38,8 +38,14 @@ SOFTWARE. #define ETL_DEBUG #endif -#include "etl_profile.h" +#undef ETL_CPP11_SUPPORTED +#undef ETL_CPP14_SUPPORTED +#undef ETL_NO_NULLPTR_SUPPORT +#undef ETL_NO_LARGE_CHAR_SUPPORT +#undef ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED +#undef ETL_ATOMIC_SUPPORTED +#include "etl_profile.h" #if ETL_CPP11_SUPPORTED #define ETL_CONSTEXPR constexpr diff --git a/support/Release notes.txt b/support/Release notes.txt index 8f8941bf..9613e04c 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -1,4 +1,7 @@ =============================================================================== +10.11.2 +GCC compatibility changes. +=============================================================================== 10.11.1 GCC compatibility changes. =============================================================================== diff --git a/test/ecl_user.h b/test/ecl_user.h index 637089e4..26eb1ab4 100644 --- a/test/ecl_user.h +++ b/test/ecl_user.h @@ -29,22 +29,20 @@ SOFTWARE. #ifndef __ECL_USER__ #define __ECL_USER__ -#include "platform.h" - #include -#if defined(ETL_COMPILER_GCC) - #define ECL_TIMER_TIMER_SEMAPHORE uint32_t - #define ECL_TIMER_DISABLE_PROCESSING(x) __sync_fetch_and_add(&x, 1) - #define ECL_TIMER_ENABLE_PROCESSING(x) __sync_fetch_and_sub(&x, 1) - #define ECL_TIMER_PROCESSING_ENABLED(x) (__sync_fetch_and_add(&x, 0) == 0) -#else +#if defined(_MSC_VER) #include #define ECL_TIMER_TIMER_SEMAPHORE uint32_t #define ECL_TIMER_DISABLE_PROCESSING(x) InterlockedIncrement((volatile long*)&x) #define ECL_TIMER_ENABLE_PROCESSING(x) InterlockedDecrement((volatile long*)&x) #define ECL_TIMER_PROCESSING_ENABLED(x) (InterlockedAdd((volatile long*)&x, 0) == 0) +#else + #define ECL_TIMER_TIMER_SEMAPHORE uint32_t + #define ECL_TIMER_DISABLE_PROCESSING(x) __sync_fetch_and_add(&x, 1) + #define ECL_TIMER_ENABLE_PROCESSING(x) __sync_fetch_and_sub(&x, 1) + #define ECL_TIMER_PROCESSING_ENABLED(x) (__sync_fetch_and_add(&x, 0) == 0) #endif #endif