Merge remote-tracking branch 'origin/hotfix/timer_const_expr_error' i…

…nto development
ETLCPP · Jul 2, 2019 · 48f2d28 · 48f2d28
2 parents 34327f0 + d715880
commit 48f2d28
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/include/etl/message_timer.h b/include/etl/message_timer.h
@@ -441,7 +441,7 @@ namespace etl
     {
       if (enabled)
       {
-        if ETL_IF_CONSTEXPR(ETL_TIMER_UPDATES_ENABLED)
+        if (ETL_TIMER_UPDATES_ENABLED)
         {
           // We have something to do?
           bool has_active = !active_list.empty();

diff --git a/include/etl/version.h b/include/etl/version.h
@@ -39,7 +39,7 @@ SOFTWARE.
 
 #define ETL_VERSION_MAJOR 14
 #define ETL_VERSION_MINOR 27
-#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_WIDE_STRING(ETL_CONCAT(ETL_CONCAT(ETL_VERSION_MAJOR, ETL_VERSION_MINOR), ETL_VERSION_PATCH))

diff --git a/support/Release notes.txt b/support/Release notes.txt
@@ -1,3 +1,7 @@
+===============================================================================
+14.27.1
+Removed ETL_IF_CONSTEXPR from etl::message_timer 'tick()'
+
 ===============================================================================
 14.27.0
 ETL's random number generators are now non-polymorphic by default.