diff --git a/include/etl/atomic/atomic_gcc_sync.h b/include/etl/atomic/atomic_gcc_sync.h index c866d85e..2bdcea49 100644 --- a/include/etl/atomic/atomic_gcc_sync.h +++ b/include/etl/atomic/atomic_gcc_sync.h @@ -222,12 +222,12 @@ namespace etl } // Load - T load(etl::memory_order order = etl::memory_order_seq_cst) + T load(etl::memory_order order = etl::memory_order_seq_cst) const { return __sync_fetch_and_add(&value, 0); } - T load(etl::memory_order order = etl::memory_order_seq_cst) volatile + T load(etl::memory_order order = etl::memory_order_seq_cst) const volatile { return __sync_fetch_and_add(&value, 0); } @@ -429,7 +429,7 @@ namespace etl atomic& operator =(const atomic&); atomic& operator =(const atomic&) volatile; - volatile T value; + mutable volatile T value; }; template @@ -562,12 +562,12 @@ namespace etl } // Load - T* load(etl::memory_order order = etl::memory_order_seq_cst) + T* load(etl::memory_order order = etl::memory_order_seq_cst) const { return __sync_fetch_and_add(&value, 0); } - T* load(etl::memory_order order = etl::memory_order_seq_cst) volatile + T* load(etl::memory_order order = etl::memory_order_seq_cst) const volatile { return __sync_fetch_and_add(&value, 0); } @@ -736,7 +736,7 @@ namespace etl atomic& operator =(const atomic&); atomic& operator =(const atomic&) volatile; - volatile T* value; + mutable volatile T* value; }; typedef etl::atomic atomic_char; diff --git a/include/etl/atomic/atomic_std.h b/include/etl/atomic/atomic_std.h index 7c957cab..fe663ff1 100644 --- a/include/etl/atomic/atomic_std.h +++ b/include/etl/atomic/atomic_std.h @@ -210,12 +210,12 @@ namespace etl } // Load - T load(etl::memory_order order = etl::memory_order_seq_cst) + T load(etl::memory_order order = etl::memory_order_seq_cst) const { return value.load(order); } - T load(etl::memory_order order = etl::memory_order_seq_cst) volatile + T load(etl::memory_order order = etl::memory_order_seq_cst) const volatile { return value.load(order); } diff --git a/include/etl/version.h b/include/etl/version.h index fb81796b..c13c8c8e 100644 --- a/include/etl/version.h +++ b/include/etl/version.h @@ -37,10 +37,10 @@ SOFTWARE. /// Definitions of the ETL version ///\ingroup utilities -#define ETL_VERSION "11.12.0" +#define ETL_VERSION "11.12.1" #define ETL_VERSION_MAJOR 11 #define ETL_VERSION_MINOR 12 -#define ETL_VERSION_PATCH 0 +#define ETL_VERSION_PATCH 1 #endif diff --git a/support/Release notes.txt b/support/Release notes.txt index fc86ae10..7ef5910e 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -1,3 +1,7 @@ +=============================================================================== +11.12.1 +Made atomic load const for non STL vesions + =============================================================================== 11.12.0 Renamed STATIC_ASSERT to ETL_STATIC_ASSERT