Merge remote-tracking branch 'origin/development'

This commit is contained in:
John Wellbelove 2017-12-22 11:12:52 +00:00
commit 07211212c0
3 changed files with 8 additions and 8 deletions

View File

@ -1,5 +1,5 @@
name=Embedded Template Library
version=10.8.0
version=10.8.1
author= John Wellbelove <john.wellbelove@etlcpp.com>
maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
sentence=A C++ template library tailored for embedded systems.

View File

@ -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.
//*************************************************************************

View File

@ -407,7 +407,7 @@ namespace etl
template <typename U>
U* allocate()
{
STATIC_ASSERT(alignof(U) <= ALIGNMENT_, "Type has incompatible alignment");
STATIC_ASSERT(etl::alignment_of<U>::value <= ALIGNMENT_, "Type has incompatible alignment");
STATIC_ASSERT(sizeof(U) <= ELEMENT_SIZE, "Type too large for pool");
return ipool::allocate<U>();
}