coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-11-09 22:59:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed non-compliant constexpr

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/etl/queue.h
View File

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

4
include/etl/queue_mpmc_mutex.h
View File

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

4
include/etl/queue_spsc_atomic.h
View File

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

4
include/etl/queue_spsc_isr.h
View File

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

2
include/etl/variant.h
View File

@ -912,7 +912,7 @@ namespace etl
//*************************************************************************** //***************************************************************************
/// Gets the index of the type currently stored or UNSUPPORTED_TYPE_ID /// 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; return type_id;
} }

4
include/etl/version.h
View File

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

7
support/Release notes.txt
View File

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

1
test/codeblocks/ETL.cbp
View File

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