From f131356dc2e4b2cb20dd9dcef4bbe408852f298d Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 18 May 2021 11:05:21 +0100 Subject: [PATCH] Fixed cross compiler compatibility for etl::circular_buffer. --- include/etl/circular_buffer.h | 2 +- include/etl/version.h | 2 +- library.json | 2 +- library.properties | 2 +- meson.build | 2 +- support/Release notes.txt | 4 ++++ 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/etl/circular_buffer.h b/include/etl/circular_buffer.h index c8026e92..d2470d83 100644 --- a/include/etl/circular_buffer.h +++ b/include/etl/circular_buffer.h @@ -965,7 +965,7 @@ namespace etl //************************************************************************* /// Protected constructor. //************************************************************************* - icircular_buffer(pointer pbuffer_, size_type max_length) + icircular_buffer(pointer pbuffer_, size_type max_length) : circular_buffer_base(max_length + 1U) , pbuffer(pbuffer_) { diff --git a/include/etl/version.h b/include/etl/version.h index 65346fda..3102f66c 100644 --- a/include/etl/version.h +++ b/include/etl/version.h @@ -39,7 +39,7 @@ SOFTWARE. #define ETL_VERSION_MAJOR 20 #define ETL_VERSION_MINOR 10 -#define ETL_VERSION_PATCH 3 +#define ETL_VERSION_PATCH 4 #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 422bf5f6..6aedee70 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "ETL Embedded Template Library", - "version": "20.10.3", + "version": "20.10.4", "author s": { "name": "John Wellbelove", "email": "john.wellbelove@etlcpp.com" diff --git a/library.properties b/library.properties index 611779c6..c863da9b 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Embedded Template Library ETL -version=20.10.3 +version=20.10.4 author= John Wellbelove maintainer=John Wellbelove license=MIT diff --git a/meson.build b/meson.build index 5bee70d4..04b64fe5 100644 --- a/meson.build +++ b/meson.build @@ -8,7 +8,7 @@ project('PROJECT_NAME', 'cpp_std=c++17', 'build.cpp_std=c++17', ], meson_version: '>=0.54.0', - version: '20.10.3' + version: '20.10.4' ) ###################### diff --git a/support/Release notes.txt b/support/Release notes.txt index f15ed693..5a7d19c9 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -1,3 +1,7 @@ +=============================================================================== +20.10.4 +Fixed cross compiler compatibility for etl::circular_buffer. + =============================================================================== 20.10.3 Fixed etl::fsm generator for non-default number of message types.