Removed non-compliant constexpr

This commit is contained in:
John Wellbelove 2018-04-21 18:26:24 +01:00
parent 67a32df7d0
commit d63afc70ea
8 changed files with 19 additions and 11 deletions

View File

@ -119,7 +119,7 @@ namespace etl
//*************************************************************************
/// Returns the maximum number of items that can be queued.
//*************************************************************************
ETL_CONSTEXPR size_type max_size() const
size_type max_size() const
{
return CAPACITY;
}
@ -127,7 +127,7 @@ namespace etl
//*************************************************************************
/// Returns the maximum number of items that can be queued.
//*************************************************************************
ETL_CONSTEXPR size_type capacity() const
size_type capacity() const
{
return CAPACITY;
}

View File

@ -51,7 +51,7 @@ namespace etl
//*************************************************************************
/// How many items can the queue hold.
//*************************************************************************
ETL_CONSTEXPR size_t capacity() const
size_t capacity() const
{
return MAX_SIZE;
}
@ -59,7 +59,7 @@ namespace etl
//*************************************************************************
/// How many items can the queue hold.
//*************************************************************************
ETL_CONSTEXPR size_t max_size() const
size_t max_size() const
{
return MAX_SIZE;
}

View File

@ -105,7 +105,7 @@ namespace etl
//*************************************************************************
/// How many items can the queue hold.
//*************************************************************************
ETL_CONSTEXPR size_t capacity() const
size_t capacity() const
{
return RESERVED - 1;
}
@ -113,7 +113,7 @@ namespace etl
//*************************************************************************
/// How many items can the queue hold.
//*************************************************************************
ETL_CONSTEXPR size_t max_size() const
size_t max_size() const
{
return RESERVED - 1;
}

View File

@ -131,7 +131,7 @@ namespace etl
//*************************************************************************
/// How many items can the queue hold.
//*************************************************************************
ETL_CONSTEXPR size_t capacity() const
size_t capacity() const
{
return MAX_SIZE;
}
@ -139,7 +139,7 @@ namespace etl
//*************************************************************************
/// How many items can the queue hold.
//*************************************************************************
ETL_CONSTEXPR size_t max_size() const
size_t max_size() const
{
return MAX_SIZE;
}

View File

@ -912,7 +912,7 @@ namespace etl
//***************************************************************************
/// Gets the index of the type currently stored or UNSUPPORTED_TYPE_ID
//***************************************************************************
ETL_CONSTEXPR size_t index() const
size_t index() const
{
return type_id;
}

View File

@ -37,9 +37,9 @@ SOFTWARE.
/// Definitions of the ETL version
///\ingroup utilities
#define ETL_VERSION "11.6.0"
#define ETL_VERSION "11.7.0"
#define ETL_VERSION_MAJOR 11
#define ETL_VERSION_MINOR 6
#define ETL_VERSION_MINOR 7
#define ETL_VERSION_PATCH 0
#endif

View File

@ -1,3 +1,10 @@
===============================================================================
11.7.0
Modified header guards.
Added etl::type_select
Added etl::null_type
===============================================================================
11.6.0
Added capacity() to etl::queue
Prefixed max_size() and capacity() with ETL_CONSTEXPR in all queue types.

View File

@ -157,6 +157,7 @@
<Unit filename="../../include/etl/multimap.h" />
<Unit filename="../../include/etl/multiset.h" />
<Unit filename="../../include/etl/murmur3.h" />
<Unit filename="../../include/etl/null_type.h" />
<Unit filename="../../include/etl/nullptr.h" />
<Unit filename="../../include/etl/numeric.h" />
<Unit filename="../../include/etl/observer.h" />