From d92a457f4605843e7770bb1f7de96ac161daacb5 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 13 Feb 2019 11:17:44 +0100 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into development --- include/etl/atomic/atomic_std.h | 2 +- include/etl/version.h | 2 +- support/Release notes.txt | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/etl/atomic/atomic_std.h b/include/etl/atomic/atomic_std.h index e2e7fea9..7a28a930 100644 --- a/include/etl/atomic/atomic_std.h +++ b/include/etl/atomic/atomic_std.h @@ -600,6 +600,6 @@ namespace etl typedef std::atomic atomic_ptrdiff_t; typedef std::atomic atomic_intmax_t; typedef std::atomic atomic_uintmax_t; -}; +} #endif diff --git a/include/etl/version.h b/include/etl/version.h index 97efaef9..0fc8a57d 100644 --- a/include/etl/version.h +++ b/include/etl/version.h @@ -38,7 +38,7 @@ SOFTWARE. ///\ingroup utilities #define ETL_VERSION_MAJOR 14 -#define ETL_VERSION_MINOR 9 +#define ETL_VERSION_MINOR 10 #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/support/Release notes.txt b/support/Release notes.txt index 3db09549..2aed565d 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -1,3 +1,8 @@ +=============================================================================== +14.10.0 +Added ETL_NOEXCEPT macros. +Added std::forward support to alternate STL utility header. + =============================================================================== 14.9.0 Added constexpr constructors to string_view and array_view.