Replaced std::distance with etl::distance in erase() and erase_if() for vector.h

This commit is contained in:
John Wellbelove 2021-04-18 08:45:09 +01:00
parent 6770774f69
commit 32ca2d87d2
5 changed files with 9 additions and 5 deletions

View File

@ -1747,7 +1747,7 @@ namespace etl
erase(etl::ivector<T>& v, const U& value)
{
typename etl::ivector<T>::iterator itr = etl::remove(v.begin(), v.end(), value);
typename etl::ivector<T>::difference_type d = std::distance(itr, v.end());
typename etl::ivector<T>::difference_type d = etl::distance(itr, v.end());
v.erase(itr, v.end());
return d;
@ -1761,7 +1761,7 @@ namespace etl
erase_if(etl::ivector<T>& v, TPredicate predicate)
{
typename etl::ivector<T>::iterator itr = etl::remove_if(v.begin(), v.end(), predicate);
typename etl::ivector<T>::difference_type d = std::distance(itr, v.end());
typename etl::ivector<T>::difference_type d = etl::distance(itr, v.end());
v.erase(itr, v.end());
return d;

View File

@ -39,7 +39,7 @@ SOFTWARE.
#define ETL_VERSION_MAJOR 20
#define ETL_VERSION_MINOR 9
#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)

View File

@ -1,6 +1,6 @@
{
"name": "ETL Embedded Template Library",
"version": "20.9.0",
"version": "20.9.1",
"author s": {
"name": "John Wellbelove",
"email": "john.wellbelove@etlcpp.com"

View File

@ -1,5 +1,5 @@
name=Embedded Template Library ETL
version=20.9.0
version=20.9.1
author= John Wellbelove <john.wellbelove@etlcpp.com>
maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
license=MIT

View File

@ -1,3 +1,7 @@
===============================================================================
20.9.1
Replaced std::distance with etl::distance in erase() and erase_if() for vector.h
===============================================================================
20.9.0
Fixed #362 'etl::fsm::receive() partial override'.