From dbd07f53dd0cb0b6089eee4f947e9a63a1cb95d4 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 21 Dec 2017 19:58:51 +0000 Subject: [PATCH 1/2] Fixed comments --- src/array.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/array.h b/src/array.h index d2b5de06..d36af55b 100644 --- a/src/array.h +++ b/src/array.h @@ -452,7 +452,7 @@ namespace etl //************************************************************************* /// Erases a value from the array. - /// The after erase, the last value in the array will be unmodified. + /// After erase, the last value in the array will be unmodified. ///\param position The index of the position to erase at. //************************************************************************* inline iterator erase_at(size_t position) @@ -461,8 +461,8 @@ namespace etl } //************************************************************************* - /// Inserts a value into the array. - /// The after erase, the last value in the array will be unmodified. + /// Erases a value from the array. + /// After erase, the last value in the array will be unmodified. ///\param position The iterator to the position to erase at. //************************************************************************* iterator erase(const_iterator position) @@ -475,7 +475,7 @@ namespace etl //************************************************************************* /// Erases a range of values from the array. - /// The after erase, the last values in the array will be unmodified. + /// After erase, the last values in the array will be unmodified. ///\param first The first item to erase. ///\param last The one past the last item to erase. //************************************************************************* @@ -486,7 +486,7 @@ namespace etl //************************************************************************* /// Erases a range of values from the array. - /// The after erase, the last values in the array will be unmodified. + /// After erase, the last values in the array will be unmodified. ///\param first The first item to erase. ///\param last The one past the last item to erase. //************************************************************************* @@ -508,7 +508,7 @@ namespace etl } //************************************************************************* - /// Inserts a value into the array. + /// Erases a value from the array. ///\param position The iterator to the position to erase at. ///\param value The value to use to overwrite the last element in the array. //************************************************************************* From 87317df69a6c7b5282206d9052fdfd0be72cb022 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 22 Dec 2017 11:12:12 +0000 Subject: [PATCH 2/2] Changed alignof to etl::alignment_of --- library.properties | 2 +- src/pool.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library.properties b/library.properties index 24c1d7e5..8096d610 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Embedded Template Library -version=10.8.0 +version=10.8.1 author= John Wellbelove maintainer=John Wellbelove sentence=A C++ template library tailored for embedded systems. diff --git a/src/pool.h b/src/pool.h index 8120748d..ae7cc334 100644 --- a/src/pool.h +++ b/src/pool.h @@ -407,7 +407,7 @@ namespace etl template U* allocate() { - STATIC_ASSERT(alignof(U) <= ALIGNMENT_, "Type has incompatible alignment"); + STATIC_ASSERT(etl::alignment_of::value <= ALIGNMENT_, "Type has incompatible alignment"); STATIC_ASSERT(sizeof(U) <= ELEMENT_SIZE, "Type too large for pool"); return ipool::allocate(); }