From 2abc4ee96211365ebff99cd85787691171c853ce Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sat, 12 Sep 2020 13:55:09 +0100 Subject: [PATCH] Fixed conditional compilation macro use for template deduction guides --- include/etl/array.h | 2 +- include/etl/array_view.h | 2 +- include/etl/version.h | 2 +- library.json | 2 +- library.properties | 2 +- support/Release notes.txt | 4 ++++ 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/etl/array.h b/include/etl/array.h index 87a036d4..188ce506 100644 --- a/include/etl/array.h +++ b/include/etl/array.h @@ -555,7 +555,7 @@ namespace etl //************************************************************************* /// Template deduction guides. //************************************************************************* -#ifdef ETL_CPP17_SUPPORTED +#if ETL_CPP17_SUPPORTED template array(T, Ts...) -> array && ...), T>, 1 + sizeof...(Ts)>; diff --git a/include/etl/array_view.h b/include/etl/array_view.h index 530f354c..83f102b2 100644 --- a/include/etl/array_view.h +++ b/include/etl/array_view.h @@ -509,7 +509,7 @@ namespace etl //************************************************************************* /// Template deduction guides. //************************************************************************* -#ifdef ETL_CPP17_SUPPORTED +#if ETL_CPP17_SUPPORTED template array_view(TArray& a) -> array_view; diff --git a/include/etl/version.h b/include/etl/version.h index 47a98a93..d09a042f 100644 --- a/include/etl/version.h +++ b/include/etl/version.h @@ -39,7 +39,7 @@ SOFTWARE. #define ETL_VERSION_MAJOR 18 #define ETL_VERSION_MINOR 14 -#define ETL_VERSION_PATCH 0 +#define ETL_VERSION_PATCH 1 #define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION_W ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION_U16 ETL_STRINGIFY(ETL_VERSION_MAJOR) u"." ETL_STRINGIFY(ETL_VERSION_MINOR) u"." ETL_STRINGIFY(ETL_VERSION_PATCH) diff --git a/library.json b/library.json index 43b5118a..f519d66c 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "Embedded Template Library", - "version": "18.14.0", + "version": "18.14.1", "authors": { "name": "John Wellbelove", "email": "john.wellbelove@etlcpp.com" diff --git a/library.properties b/library.properties index bb380c9a..f359f708 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Embedded Template Library -version=18.14.0 +version=18.14.1 author= John Wellbelove maintainer=John Wellbelove license=MIT diff --git a/support/Release notes.txt b/support/Release notes.txt index 1d30d3fd..84c36e41 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -1,3 +1,7 @@ +=============================================================================== +18.14.1 +Fixed conditional compilation macro use for template deduction guides. + =============================================================================== 18.14.0 Added template deduction guides for array and array_view