Sync to 20.27.2

library.json

@@ -1,6 +1,6 @@
 {
   "name": "Embedded Template Library - Arduino",
-  "version": "20.27.1",
+  "version": "20.27.2",
   "authors": {
     "name": "John Wellbelove",
     "email": "[email protected]"
@@ -16,6 +16,24 @@
   "build": {
     "includeDir": "include"
   },
+  "export": {
+    "include": [
+      "include",
+      "examples",
+      "LICENSE",
+      "README.md"
+    ],
+    "exclude": [
+      "include/etl/experimental",
+      "include/etl/deprecated",
+      "**/__vm",
+      "**/.vs",
+      "**/*.filters",
+      "**/*.log",
+      "**/*.tmp"
+    ]
+  },
   "platforms": "*",
   "frameworks": "*"
 }
+

library.properties

@@ -1,5 +1,5 @@
 name=Embedded Template Library - Arduino
-version=20.27.1
+version=20.27.2
 author= John Wellbelove <[email protected]>
 maintainer=John Wellbelove <[email protected]>
 license=MIT

src/etl/algorithm.h

@@ -295,8 +295,6 @@ namespace etl
   typename etl::enable_if<etl::is_pointer<TIterator>::value, void>::type
     reverse(TIterator b, TIterator e)
   {
-    typedef typename etl::iterator_traits<TIterator>::value_type value_type;
-
     if (b != e)
     {
       while (b < --e)
@@ -1217,6 +1215,7 @@ namespace etl
                         TCompare  compare)
   {
     TIterator minimum = begin;
+    ++begin;
 
     while (begin != end)
     {
@@ -1260,6 +1259,7 @@ namespace etl
                         TCompare  compare)
   {
     TIterator maximum = begin;
+    ++begin;
 
     while (begin != end)
     {
@@ -1304,6 +1304,7 @@ namespace etl
   {
     TIterator minimum = begin;
     TIterator maximum = begin;
+    ++begin;
 
     while (begin != end)
     {

src/etl/char_traits.h

@@ -44,7 +44,7 @@ SOFTWARE.
 //*****************************************************************************
 
 // Define the large character types if necessary.
-#if (ETL_NO_LARGE_CHAR_SUPPORT)
+#if ETL_NO_LARGE_CHAR_SUPPORT
 #if ETL_USING_8BIT_TYPES
 typedef int8_t char8_t;
 #endif

src/etl/circular_buffer.h

@@ -95,7 +95,15 @@ namespace etl
     //*************************************************************************
     bool full() const
     {
-      return (in + 1U) % BUFFER_SIZE == out;
+      size_t i = in;
+
+      ++i;
+      if (i == BUFFER_SIZE) ETL_UNLIKELY
+      {
+        i = 0U;
+      }
+
+      return i == out;
     }
 
     //*************************************************************************
@@ -126,6 +134,26 @@ namespace etl
     {
     }
 
+    //*************************************************************************
+    void increment_in()
+    {
+      ++in;
+      if (in == BUFFER_SIZE) ETL_UNLIKELY
+      {
+        in = 0U;
+      }
+    }
+
+    //*************************************************************************
+    void increment_out()
+    {
+      ++out;
+      if (out == BUFFER_SIZE) ETL_UNLIKELY
+      {
+        out = 0U;
+      }
+    }
+
     const size_type BUFFER_SIZE;
     size_type in;            ///< Index to the next write.
     size_type out;           ///< Index to the next read.
@@ -835,14 +863,14 @@ namespace etl
     void push(const_reference item)
     {
       ::new (&pbuffer[in]) T(item);
-      in = (in + 1U) % BUFFER_SIZE;
+      increment_in();
 
       // Did we catch up with the 'out' index?
       if (in == out)
       {
         // Forget about the oldest one.
         pbuffer[out].~T();
-        out = (out + 1U) % BUFFER_SIZE;
+        this->increment_out();
       }
       else
       {
@@ -859,14 +887,14 @@ namespace etl
     void push(rvalue_reference item)
     {
       ::new (&pbuffer[in]) T(etl::move(item));
-      in = (in + 1U) % BUFFER_SIZE;
+      increment_in();
 
       // Did we catch up with the 'out' index?
       if (in == out)
       {
         // Forget about the oldest item.
         pbuffer[out].~T();
-        out = (out + 1U) % BUFFER_SIZE;
+        increment_out();
       }
       else
       {
@@ -895,7 +923,7 @@ namespace etl
     {
       ETL_ASSERT(!empty(), ETL_ERROR(circular_buffer_empty));
       pbuffer[out].~T();
-      out = (out + 1U) % BUFFER_SIZE;
+      increment_out();
       ETL_DECREMENT_DEBUG_COUNT
     }
 
@@ -1013,6 +1041,8 @@ namespace etl
       }
     }
 
+
+
     pointer pbuffer;
 
   private:

src/etl/cyclic_value.h

@@ -172,7 +172,7 @@ namespace etl
     //*************************************************************************
     cyclic_value& operator ++()
     {
-      if (value >= LAST)
+      if (value >= LAST) ETL_UNLIKELY
       {
         value = FIRST;
       }
@@ -201,7 +201,7 @@ namespace etl
     //*************************************************************************
     cyclic_value& operator --()
     {
-      if (value <= FIRST)
+      if (value <= FIRST) ETL_UNLIKELY
       {
         value = LAST;
       }

src/etl/nth_type.h

@@ -34,28 +34,16 @@ SOFTWARE.
 namespace etl
 {
 #if ETL_USING_CPP11
-  //***************************************************************************
-  // nth_type
-  //***************************************************************************
-  namespace private_nth_type
+  template <size_t N, typename T1, typename... TRest>
+  struct nth_type
   {
-    template <size_t N, typename T1, typename... TRest>
-    struct nth_type_helper
-    {
-      using type = typename nth_type_helper<N - 1U, TRest...>::type;
-    };
-
-    template <size_t N, typename T1>
-    struct nth_type_helper<N, T1>
-    {
-      using type = T1;
-    };
-  }
+    using type = typename nth_type<N - 1U, TRest...>::type;
+  };
 
-  template <size_t N, typename... TTypes>
-  struct nth_type
+  template <typename T1, typename... TRest>
+  struct nth_type<0U, T1, TRest...>
   {
-    using type = typename private_nth_type::nth_type_helper<N, TTypes...>::type;
+    using type = T1;
   };
 
   template <size_t N, typename... TTypes>

src/etl/platform.h

@@ -377,7 +377,7 @@ namespace etl
     static ETL_CONSTANT bool has_mutable_array_view           = (ETL_HAS_MUTABLE_ARRAY_VIEW == 1);
     static ETL_CONSTANT bool has_ideque_repair                = (ETL_HAS_IDEQUE_REPAIR == 1);
     static ETL_CONSTANT bool is_debug_build                   = (ETL_IS_DEBUG_BUILD == 1);
-    static ETL_CONSTANT  int cplusplus                        = __cplusplus;
+    static ETL_CONSTANT long cplusplus                        = __cplusplus;
   }
 }
 

src/etl/queue.h

@@ -187,7 +187,7 @@ namespace etl
     //*************************************************************************
     void add_in()
     {
-      if (++in == CAPACITY)
+      if (++in == CAPACITY) ETL_UNLIKELY
       {
         in = 0;
       }
@@ -201,7 +201,7 @@ namespace etl
     //*************************************************************************
     void del_out()
     {
-      if (++out == CAPACITY)
+      if (++out == CAPACITY) ETL_UNLIKELY
       {
         out = 0;
       }

src/etl/queue_lockable.h

@@ -185,7 +185,7 @@ namespace etl
     {
       ++index;
 
-      if (index == maximum)
+      if (index == maximum) ETL_UNLIKELY
       {
         index = 0;
       }

src/etl/queue_mpmc_mutex.h

@@ -89,7 +89,7 @@ namespace etl
     {
       ++index;
 
-      if (index == maximum)
+      if (index == maximum) ETL_UNLIKELY
       {
         index = 0;
       }

src/etl/queue_spsc_atomic.h

@@ -141,7 +141,7 @@ namespace etl
     {
       ++index;
 
-      if (index == maximum)
+      if (index == maximum) ETL_UNLIKELY
       {
         index = 0;
       }

src/etl/queue_spsc_isr.h

@@ -421,7 +421,7 @@ namespace etl
     {
       ++index;
 
-      if (index == maximum)
+      if (index == maximum) ETL_UNLIKELY
       {
         index = 0;
       }

src/etl/queue_spsc_locked.h

@@ -118,7 +118,7 @@ namespace etl
     {
       ++index;
 
-      if (index == maximum)
+      if (index == maximum) ETL_UNLIKELY
       {
         index = 0;
       }

src/etl/version.h

@@ -31,6 +31,7 @@ SOFTWARE.
 #ifndef ETL_VERSION_INCLUDED
 #define ETL_VERSION_INCLUDED
 
+#include "platform.h"
 #include "macros.h"
 
 ///\defgroup version version
@@ -39,12 +40,34 @@ SOFTWARE.
 
 #define ETL_VERSION_MAJOR 20
 #define ETL_VERSION_MINOR 27
-#define ETL_VERSION_PATCH  1
+#define ETL_VERSION_PATCH 2
+
+
 #define ETL_VERSION       ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH)
 #define ETL_VERSION_W     ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH)
 #define ETL_VERSION_U16   ETL_STRINGIFY(ETL_VERSION_MAJOR) u"." ETL_STRINGIFY(ETL_VERSION_MINOR) u"." ETL_STRINGIFY(ETL_VERSION_PATCH)
 #define ETL_VERSION_U32   ETL_STRINGIFY(ETL_VERSION_MAJOR) U"." ETL_STRINGIFY(ETL_VERSION_MINOR) U"." ETL_STRINGIFY(ETL_VERSION_PATCH)
 #define ETL_VERSION_VALUE ((ETL_VERSION_MAJOR * 10000) + (ETL_VERSION_MINOR * 100) + ETL_VERSION_PATCH)
 
+namespace etl
+{
+  namespace traits
+  {
+    static ETL_CONSTANT long version                   = ETL_VERSION_VALUE;
+    static ETL_CONSTANT long version_major             = ETL_VERSION_MAJOR;
+    static ETL_CONSTANT long version_minor             = ETL_VERSION_MINOR;
+    static ETL_CONSTANT long version_patch             = ETL_VERSION_PATCH;
+#if ETL_USING_CPP11
+    static constexpr const char*     version_string    = ETL_VERSION;
+    static constexpr const wchar_t*  version_wstring   = ETL_VERSION_W;
+    static constexpr const char16_t* version_u16string = ETL_VERSION_U16;
+    static constexpr const char32_t* version_u32string = ETL_VERSION_U32;
+#else
+    static const char*     version_string              = ETL_VERSION;
+    static const wchar_t*  version_wstring             = ETL_VERSION_W;
+#endif
+  }
+}
+
 #endif