From d2e8e0aa7180ee85bd1c99475369db7a0942902d Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 7 Sep 2022 12:38:30 +0100 Subject: [PATCH] #594 Use a different workaround for problems with IARCC. --- include/etl/placement_new.h | 6 +++++- support/Release notes.txt | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/etl/placement_new.h b/include/etl/placement_new.h index 3efaffb9..d2aff1a7 100644 --- a/include/etl/placement_new.h +++ b/include/etl/placement_new.h @@ -37,7 +37,11 @@ SOFTWARE. // Figure out if we can use the standard library header, if haven't already done so in etl_profile.h #if !defined(ETL_USING_STD_NEW) #if defined(__has_include) - #define ETL_USING_STD_NEW __has_include("new") + #if __has_include() + #define ETL_USING_STD_NEW 1 + #else + #define ETL_USING_STD_NEW 0 + #endif #elif (defined(ARDUINO) && defined(__AVR__)) #define ETL_USING_STD_NEW 0 #else diff --git a/support/Release notes.txt b/support/Release notes.txt index d7338d38..9dec768a 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -12,6 +12,7 @@ Fixed unordered container equality tests to match STL #583 Permit non-default-constructable hashes and key-equals #589 Add minmax_push.h/minmax_pop.h includes #584 unordered_set::const_iterator has incorrect value_type +#593 Workaround for __has_include(<...>) and ICCAVR =============================================================================== 20.33.0