coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-06-28 21:38:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/development'

Browse Source
This commit is contained in:
John Wellbelove 2018-04-14 13:27:48 +01:00
commit 08a52159f4
6 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/etl/queue.h
View File

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

4
include/etl/queue_mpmc_mutex.h
View File

@ -51,7 +51,7 @@ namespace etl
//*************************************************************************
/// How many items can the queue hold.
//*************************************************************************
size_t capacity() const
ETL_CONSTEXPR size_t capacity() const
{
return MAX_SIZE;
}
@ -59,7 +59,7 @@ namespace etl
//*************************************************************************
/// How many items can the queue hold.
//*************************************************************************
size_t max_size() const
ETL_CONSTEXPR size_t max_size() const
{
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.
//*************************************************************************
size_t capacity() const
ETL_CONSTEXPR size_t capacity() const
{
return RESERVED - 1;
}
@ -113,7 +113,7 @@ namespace etl
//*************************************************************************
/// How many items can the queue hold.
//*************************************************************************
size_t max_size() const
ETL_CONSTEXPR size_t max_size() const
{
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.
//*************************************************************************
size_t capacity() const
ETL_CONSTEXPR size_t capacity() const
{
return MAX_SIZE;
}
@ -139,7 +139,7 @@ namespace etl
//*************************************************************************
/// How many items can the queue hold.
//*************************************************************************
size_t max_size() const
ETL_CONSTEXPR size_t max_size() const
{
return MAX_SIZE;
}

4
include/etl/version.h
View File

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

4
support/Release notes.txt
View File

@ -1,3 +1,7 @@
11.6.0
Added capacity() to etl::queue
Prefixed max_size() and capacity() with ETL_CONSTEXPR in all queue types.
===============================================================================
11.5.0
Added etl::permutations and etl::combinations constant templates.