From c3603c4d7e29a275be81c3918fcc05a83d528e4c Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Wed, 29 Nov 2023 18:21:47 +0000
Subject: [PATCH 001/131] Improved display of CHECK_EQUAL_HEX in unittest++

---
 test/UnitTest++/Checks.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/UnitTest++/Checks.h b/test/UnitTest++/Checks.h
index a2571e02..88f1a1c3 100644
--- a/test/UnitTest++/Checks.h
+++ b/test/UnitTest++/Checks.h
@@ -190,7 +190,9 @@ namespace UnitTest
      if (!(expected == actual))
      {
        UnitTest::MemoryOutStream stream;
-       stream << std::hex << std::uppercase << std::setfill('0') << "Expected 0x" << std::setw(2 * sizeof(Expected)) << expected << " but was 0x" << std::setw(2 * sizeof(Actual)) << actual;
+       stream << std::hex << std::uppercase << std::setfill('0') 
+              << "Expected 0x" << std::setw(2 * sizeof(Expected)) << (expected & ~(typename std::make_unsigned<Expected>::type(0))) 
+              << " but was 0x" << std::setw(2 * sizeof(Actual))   << (actual   & ~(typename std::make_unsigned<Actual>::type(0)));
 
        results.OnTestFailure(details, stream.GetText());
      }
@@ -214,7 +216,8 @@ namespace UnitTest
      if (expected == actual)
      {
        UnitTest::MemoryOutStream stream;
-       stream << std::hex << std::uppercase << std::setfill('0') << std::setw(2 * sizeof(Actual)) << "Expected not equal, but both values are " << actual;
+       stream << std::hex << std::uppercase << std::setfill('0') << std::setw(2 * sizeof(Actual)) 
+              << "Expected not equal, but both values are " << (actual & ~(typename std::make_unsigned<Actual>::type(0)));
 
        results.OnTestFailure(details, stream.GetText());
      }

From 863dd24cc4713225d45f3ede0bc03103c684f18a Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Wed, 29 Nov 2023 18:22:34 +0000
Subject: [PATCH 002/131] Work in progress for etl::bitset::extract

---
 include/etl/private/bitset_new.h              | 309 +++++++++++++++++-
 test/test_bitset_new_default_element_type.cpp |  70 ++++
 ...itset_new_explicit_single_element_type.cpp |  69 ++++
 ...st_bitset_new_ext_default_element_type.cpp |  74 +++++
 ...t_new_ext_explicit_single_element_type.cpp |  74 +++++
 test/vs2022/etl.vcxproj                       |  22 +-
 test/vs2022/etl.vcxproj.filters               |  14 +-
 7 files changed, 597 insertions(+), 35 deletions(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 63462f21..058d8f45 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -192,7 +192,7 @@ namespace etl
       size_t    index = 0;
       element_type bit = 0;
 
-      if (number_of_elements == 0)
+      if (number_of_elements == 0) ETL_UNLIKELY
       {
         return;
       }
@@ -229,12 +229,12 @@ namespace etl
       else
       {
         size_t string_length = etl::strlen(text);
-        size_t element_index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
+        size_t index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
 
         // Only reset elements we need to.
-        while (element_index != number_of_elements)
+        while (index != number_of_elements)
         {
-          pbuffer[element_index++] = All_Clear_Element;
+          pbuffer[index++] = All_Clear_Element;
         }
 
         // Build from the string.
@@ -259,12 +259,12 @@ namespace etl
       else
       {
         size_t string_length = etl::strlen(text);
-        size_t element_index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
+        size_t index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
 
         // Only reset elements we need to.
-        while (element_index != number_of_elements)
+        while (index != number_of_elements)
         {
-          pbuffer[element_index++] = All_Clear_Element;
+          pbuffer[index++] = All_Clear_Element;
         }
 
         // Build from the string.
@@ -289,12 +289,12 @@ namespace etl
       else
       {
         size_t string_length = etl::strlen(text);
-        size_t element_index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
+        size_t index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
 
         // Only reset elements we need to.
-        while (element_index != number_of_elements)
+        while (index != number_of_elements)
         {
-          pbuffer[element_index++] = All_Clear_Element;
+          pbuffer[index++] = All_Clear_Element;
         }
 
         // Build from the string.
@@ -319,12 +319,12 @@ namespace etl
       else
       {
         size_t string_length = etl::strlen(text);
-        size_t element_index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
+        size_t index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
 
         // Only reset elements we need to.
-        while (element_index != number_of_elements)
+        while (index != number_of_elements)
         {
-          pbuffer[element_index++] = All_Clear_Element;
+          pbuffer[index++] = All_Clear_Element;
         }
 
         // Build from the string.
@@ -395,6 +395,141 @@ namespace etl
       return v;
     }
 
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    T extract_from_single_element(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
+    {
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value(0);
+
+      const unsigned_t value_mask = etl::integral_limits<unsigned_t>::max;
+      const int        element_index = (position + length - 1) >> etl::log2<Bits_Per_Element>::value;
+      const unsigned_t Shift = position % Bits_Per_Element;
+
+      value = static_cast<unsigned_t>(pbuffer[element_index] >> Shift) & value_mask;
+
+      return static_cast<T>(value);
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    T extract_from_multi_element(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
+    {
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value(0);
+
+      // The mask for the value type.
+      const unsigned_t value_mask = etl::integral_limits<unsigned_t>::max;
+
+      // Find the index of the element containing the msb.
+      int element_index = (position + length - 1) >> etl::log2<Bits_Per_Element>::value;
+
+      // The value is spread over multiple elements.       
+      element_type bit_mask = element_type(1) << ((position + length - 1) % Bits_Per_Element);
+
+      while (length != 0)
+      {
+        // TODO Optimise this to read whole element values.
+
+        value <<= 1;
+
+        const bool is_set = (pbuffer[element_index] & bit_mask) != 0;
+
+        if (is_set)
+        {
+          value |= unsigned_t(1);
+        }
+
+        bit_mask >>= 1;
+
+        if (bit_mask == 0)
+        {
+          bit_mask = element_type(1) << (Bits_Per_Element - 1);
+          --element_index;
+        }
+
+        --length;
+      }
+
+      return static_cast<T>(value);
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T, size_t Position, size_t Length>
+    ETL_CONSTEXPR14
+    T extract_from_single_element(const_pointer pbuffer) const
+    {
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value(0);
+
+      const unsigned_t value_mask    = etl::integral_limits<unsigned_t>::max;
+      const int        element_index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
+      const unsigned_t Shift         = Position % Bits_Per_Element;
+
+      value = static_cast<unsigned_t>(pbuffer[element_index] >> Shift) & value_mask;
+
+      return static_cast<T>(value);
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T, size_t Position, size_t Length>
+    ETL_CONSTEXPR14
+    T extract_from_multi_element(const_pointer pbuffer) const
+    {
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value(0);
+
+      // The mask for the value type.
+      const unsigned_t value_mask = etl::integral_limits<unsigned_t>::max;
+
+      // Find the index of the element containing the msb.
+      int element_index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
+
+      // The value is spread over multiple elements.       
+      size_t       length   = Length;
+      element_type bit_mask = element_type(1) << ((Position + Length - 1) % Bits_Per_Element);
+
+      while (length != 0)
+      {
+        // TODO Optimise this to read whole element values.
+
+        value <<= 1;
+
+        const bool is_set = (pbuffer[element_index] & bit_mask) != 0;
+
+        if (is_set)
+        {
+          value |= unsigned_t(1);
+        }      
+
+        bit_mask >>= 1;
+
+        if (bit_mask == 0)
+        {
+          bit_mask = element_type(1) << (Bits_Per_Element - 1);
+          --element_index;
+        }
+
+        --length;
+      }
+
+      return static_cast<T>(value);
+    }
+
     //*************************************************************************
     /// Reset the bit at the position.
     //*************************************************************************
@@ -403,7 +538,7 @@ namespace etl
       size_t       index = 0U;
       element_type bit = element_type(0);
 
-      if (number_of_elements == 0)
+      if (number_of_elements == 0) ETL_UNLIKELY
       {
         return;
       }
@@ -440,7 +575,7 @@ namespace etl
       size_t       index = 0U;
       element_type bit = element_type(0);
       
-      if (number_of_elements == 0)
+      if (number_of_elements == 0) ETL_UNLIKELY
       {
         return;
       }
@@ -1251,7 +1386,7 @@ namespace etl
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-      typename etl::enable_if<etl::is_integral<T>::value, T>::type
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
       value() const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Only integral types are supported");
@@ -1269,6 +1404,40 @@ namespace etl
       return v;
     }
 
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract(size_t position, size_t length = etl::integral_limits<T>::bits) const
+    {
+      ETL_ASSERT_OR_RETURN_VALUE(length <= etl::integral_limits<T>::bits, ETL_ERROR(bitset_overflow), 0);
+      ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits,      ETL_ERROR(bitset_overflow), 0);
+
+      element_type mask = (~(~0u << length) << position);
+      T value((buffer & mask) >> position);
+
+      return value;
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract() const ETL_NOEXCEPT
+    {
+      ETL_STATIC_ASSERT(Length <= etl::integral_limits<T>::bits, "Length is larger that the required type");
+      ETL_STATIC_ASSERT((Position + Length) <= Active_Bits,      "Position/Length overflows bitset");
+      
+      element_type mask = (~(~0u << Length) << Position);
+      T value((buffer & mask) >> Position);
+
+      return value;
+    }
+
     //*************************************************************************
     /// Get as an unsigned long.
     //*************************************************************************
@@ -2027,6 +2196,42 @@ namespace etl
       return ibitset.template value<T>(buffer, Number_Of_Elements);
     }
 
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract(size_t position, size_t length = etl::integral_limits<T>::bits) const
+    {
+      ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
+
+      return ibitset.extract_from_multi_element<T>(buffer, position, length);
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
+    ETL_CONSTEXPR14
+      typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract() const ETL_NOEXCEPT
+    {
+      ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
+
+      const int active_bits_in_element = ((Position + Length) % Bits_Per_Element);
+
+      // Is the value contained within one element?
+      if (active_bits_in_element == Length)
+      {
+        return ibitset.extract_from_single_element<T, Position, Length>(buffer);
+      }
+      else
+      {
+        return ibitset.extract_from_multi_element<T, Position, Length>(buffer);
+      }
+    }
+
     //*************************************************************************
     /// Get as an unsigned long.
     //*************************************************************************
@@ -2963,7 +3168,7 @@ namespace etl
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-      typename etl::enable_if<etl::is_integral<T>::value, T>::type
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
       value() const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Only integral types are supported");
@@ -2981,6 +3186,38 @@ namespace etl
       return v;
     }
 
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract(size_t position, size_t length = etl::integral_limits<T>::bits) const
+    {
+      ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
+
+      element_type mask = (~(~0u << length) << position);
+      T v((*pbuffer & mask) >> position);
+
+      return v;
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
+    ETL_CONSTEXPR14
+      typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract() const ETL_NOEXCEPT
+    {
+      ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
+
+      element_type mask = (~(~0u << Length) << Position);
+      T v((*pbuffer & mask) >> Position);
+
+      return v;
+    }
+
     //*************************************************************************
     /// Get as an unsigned long.
     //*************************************************************************
@@ -3733,7 +3970,7 @@ namespace etl
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-      typename etl::enable_if<etl::is_integral<T>::value, T>::type
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
       value() const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Only integral types are supported");
@@ -3742,6 +3979,42 @@ namespace etl
       return ibitset.template value<T>(pbuffer, Number_Of_Elements);
     }
 
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract(size_t position, size_t length = etl::integral_limits<T>::bits) const
+    {
+      ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
+
+      return ibitset.extract_from_multi_element<T>(pbuffer, position, length);
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract() const ETL_NOEXCEPT
+    {
+      ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
+
+      const int active_bits_in_element = ((Position + Length) % Bits_Per_Element);
+
+      // Is the value contained within one element?
+      if (active_bits_in_element == Length)
+      {
+        return ibitset.extract_from_single_element<T, Position, Length>(pbuffer);
+      }
+      else
+      {
+        return ibitset.extract_from_multi_element<T, Position, Length>(pbuffer);
+      }
+    }
+
     //*************************************************************************
     /// Get as an unsigned long.
     //*************************************************************************
diff --git a/test/test_bitset_new_default_element_type.cpp b/test/test_bitset_new_default_element_type.cpp
index 67f703a3..f41ac262 100644
--- a/test/test_bitset_new_default_element_type.cpp
+++ b/test/test_bitset_new_default_element_type.cpp
@@ -2096,5 +2096,75 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(text.c_str()));
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
+
+    //*************************************************************************
+    TEST(test_extract_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint8_t(0x78), b.extract<uint8_t>( 0, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), b.extract<uint8_t>( 1, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), b.extract<uint8_t>( 2, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), b.extract<uint8_t>( 3, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x67), b.extract<uint8_t>( 4, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), b.extract<uint8_t>( 5, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x59), b.extract<uint8_t>( 6, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), b.extract<uint8_t>( 7, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x56), b.extract<uint8_t>( 8, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), b.extract<uint8_t>( 9, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x15), b.extract<uint8_t>(10, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), b.extract<uint8_t>(11, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x45), b.extract<uint8_t>(12, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), b.extract<uint8_t>(13, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), b.extract<uint8_t>(14, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x68), b.extract<uint8_t>(15, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x34), b.extract<uint8_t>(16, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), b.extract<uint8_t>(17, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), b.extract<uint8_t>(18, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x46), b.extract<uint8_t>(19, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x23), b.extract<uint8_t>(20, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x91), b.extract<uint8_t>(21, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x48), b.extract<uint8_t>(22, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
+      
+      CHECK_THROW(b.extract<uint8_t>(25, 8), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint8_t(0x78), (b.extract<uint8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), (b.extract<uint8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), (b.extract<uint8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x67), (b.extract<uint8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), (b.extract<uint8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x59), (b.extract<uint8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), (b.extract<uint8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x56), (b.extract<uint8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), (b.extract<uint8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x45), (b.extract<uint8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), (b.extract<uint8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), (b.extract<uint8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x68), (b.extract<uint8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), (b.extract<uint8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x46), (b.extract<uint8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x91), (b.extract<uint8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x48), (b.extract<uint8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
+
+      // The lines below should static assert.
+      //uint8_t v = b.extract<uint8_t, 25, 8>();
+      //uint8_t v = b.extract<uint8_t, 25, 9>();
+    }
   };
 }
diff --git a/test/test_bitset_new_explicit_single_element_type.cpp b/test/test_bitset_new_explicit_single_element_type.cpp
index b9c0c84b..0f25e6da 100644
--- a/test/test_bitset_new_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_explicit_single_element_type.cpp
@@ -1585,5 +1585,74 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(text.c_str()));
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
+
+    //*************************************************************************
+    TEST(test_extract_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL(0x78, b.extract<uint8_t>(0, 8));
+      CHECK_EQUAL(0x3C, b.extract<uint8_t>(1, 8));
+      CHECK_EQUAL(0x9E, b.extract<uint8_t>(2, 8));
+      CHECK_EQUAL(0xCF, b.extract<uint8_t>(3, 8));
+      CHECK_EQUAL(0x67, b.extract<uint8_t>(4, 8));
+      CHECK_EQUAL(0xB3, b.extract<uint8_t>(5, 8));
+      CHECK_EQUAL(0x59, b.extract<uint8_t>(6, 8));
+      CHECK_EQUAL(0xAC, b.extract<uint8_t>(7, 8));
+      CHECK_EQUAL(0x56, b.extract<uint8_t>(8, 8));
+      CHECK_EQUAL(0x2B, b.extract<uint8_t>(9, 8));
+      CHECK_EQUAL(0x15, b.extract<uint8_t>(10, 8));
+      CHECK_EQUAL(0x8A, b.extract<uint8_t>(11, 8));
+      CHECK_EQUAL(0x45, b.extract<uint8_t>(12, 8));
+      CHECK_EQUAL(0xA2, b.extract<uint8_t>(13, 8));
+      CHECK_EQUAL(0xD1, b.extract<uint8_t>(14, 8));
+      CHECK_EQUAL(0x68, b.extract<uint8_t>(15, 8));
+      CHECK_EQUAL(0x34, b.extract<uint8_t>(16, 8));
+      CHECK_EQUAL(0x1A, b.extract<uint8_t>(17, 8));
+      CHECK_EQUAL(0x8D, b.extract<uint8_t>(18, 8));
+      CHECK_EQUAL(0x46, b.extract<uint8_t>(19, 8));
+      CHECK_EQUAL(0x23, b.extract<uint8_t>(20, 8));
+      CHECK_EQUAL(0x91, b.extract<uint8_t>(21, 8));
+      CHECK_EQUAL(0x48, b.extract<uint8_t>(22, 8));
+      CHECK_EQUAL(0x24, b.extract<uint8_t>(23, 8));
+      CHECK_EQUAL(0x12, b.extract<uint8_t>(24, 8));
+      CHECK_THROW(b.extract<uint8_t>(25, 8), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL(0x78, (b.extract<uint8_t, 0, 8>()));
+      CHECK_EQUAL(0x3C, (b.extract<uint8_t, 1, 8>()));
+      CHECK_EQUAL(0x9E, (b.extract<uint8_t, 2, 8>()));
+      CHECK_EQUAL(0xCF, (b.extract<uint8_t, 3, 8>()));
+      CHECK_EQUAL(0x67, (b.extract<uint8_t, 4, 8>()));
+      CHECK_EQUAL(0xB3, (b.extract<uint8_t, 5, 8>()));
+      CHECK_EQUAL(0x59, (b.extract<uint8_t, 6, 8>()));
+      CHECK_EQUAL(0xAC, (b.extract<uint8_t, 7, 8>()));
+      CHECK_EQUAL(0x56, (b.extract<uint8_t, 8, 8>()));
+      CHECK_EQUAL(0x2B, (b.extract<uint8_t, 9, 8>()));
+      CHECK_EQUAL(0x15, (b.extract<uint8_t, 10, 8>()));
+      CHECK_EQUAL(0x8A, (b.extract<uint8_t, 11, 8>()));
+      CHECK_EQUAL(0x45, (b.extract<uint8_t, 12, 8>()));
+      CHECK_EQUAL(0xA2, (b.extract<uint8_t, 13, 8>()));
+      CHECK_EQUAL(0xD1, (b.extract<uint8_t, 14, 8>()));
+      CHECK_EQUAL(0x68, (b.extract<uint8_t, 15, 8>()));
+      CHECK_EQUAL(0x34, (b.extract<uint8_t, 16, 8>()));
+      CHECK_EQUAL(0x1A, (b.extract<uint8_t, 17, 8>()));
+      CHECK_EQUAL(0x8D, (b.extract<uint8_t, 18, 8>()));
+      CHECK_EQUAL(0x46, (b.extract<uint8_t, 19, 8>()));
+      CHECK_EQUAL(0x23, (b.extract<uint8_t, 20, 8>()));
+      CHECK_EQUAL(0x91, (b.extract<uint8_t, 21, 8>()));
+      CHECK_EQUAL(0x48, (b.extract<uint8_t, 22, 8>()));
+      CHECK_EQUAL(0x24, (b.extract<uint8_t, 23, 8>()));
+      CHECK_EQUAL(0x12, (b.extract<uint8_t, 24, 8>()));
+
+      // The lines below should static assert.
+      //uint8_t v = b.extract<uint8_t, 25, 8>();
+      //uint8_t v = b.extract<uint8_t, 25, 9>();
+    }
   };
 }
diff --git a/test/test_bitset_new_ext_default_element_type.cpp b/test/test_bitset_new_ext_default_element_type.cpp
index aeeea766..c5e12541 100644
--- a/test/test_bitset_new_ext_default_element_type.cpp
+++ b/test/test_bitset_new_ext_default_element_type.cpp
@@ -1957,5 +1957,79 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(text.c_str()));
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
+
+    //*************************************************************************
+    TEST(test_extract_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x78), b.extract<uint8_t>( 0, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), b.extract<uint8_t>( 1, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), b.extract<uint8_t>( 2, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), b.extract<uint8_t>( 3, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x67), b.extract<uint8_t>( 4, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), b.extract<uint8_t>( 5, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x59), b.extract<uint8_t>( 6, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), b.extract<uint8_t>( 7, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x56), b.extract<uint8_t>( 8, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), b.extract<uint8_t>( 9, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x15), b.extract<uint8_t>(10, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), b.extract<uint8_t>(11, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x45), b.extract<uint8_t>(12, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), b.extract<uint8_t>(13, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), b.extract<uint8_t>(14, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x68), b.extract<uint8_t>(15, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x34), b.extract<uint8_t>(16, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), b.extract<uint8_t>(17, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), b.extract<uint8_t>(18, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x46), b.extract<uint8_t>(19, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x23), b.extract<uint8_t>(20, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x91), b.extract<uint8_t>(21, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x48), b.extract<uint8_t>(22, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
+    }
+
+    //*************************************************************************
+    TEST(test_extract_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x78), (b.extract<uint8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), (b.extract<uint8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), (b.extract<uint8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x67), (b.extract<uint8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), (b.extract<uint8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x59), (b.extract<uint8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), (b.extract<uint8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x56), (b.extract<uint8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), (b.extract<uint8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x45), (b.extract<uint8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), (b.extract<uint8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), (b.extract<uint8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x68), (b.extract<uint8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), (b.extract<uint8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x46), (b.extract<uint8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x91), (b.extract<uint8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x48), (b.extract<uint8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
+
+      // The line below should static assert.
+      //uint8_t v = b.extract<uint8_t, 25, 8>();
+      //uint8_t v = b.extract<uint8_t, 25, 9>();
+    }
   };
 }
diff --git a/test/test_bitset_new_ext_explicit_single_element_type.cpp b/test/test_bitset_new_ext_explicit_single_element_type.cpp
index b7bc74ef..308259a4 100644
--- a/test/test_bitset_new_ext_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_ext_explicit_single_element_type.cpp
@@ -1309,5 +1309,79 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(text.c_str()));
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
+
+    //*************************************************************************
+    TEST(test_extract_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, int32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x78), b.extract<uint8_t>( 0, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), b.extract<uint8_t>( 1, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), b.extract<uint8_t>( 2, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), b.extract<uint8_t>( 3, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x67), b.extract<uint8_t>( 4, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), b.extract<uint8_t>( 5, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x59), b.extract<uint8_t>( 6, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), b.extract<uint8_t>( 7, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x56), b.extract<uint8_t>( 8, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), b.extract<uint8_t>( 9, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x15), b.extract<uint8_t>(10, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), b.extract<uint8_t>(11, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x45), b.extract<uint8_t>(12, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), b.extract<uint8_t>(13, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), b.extract<uint8_t>(14, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x68), b.extract<uint8_t>(15, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x34), b.extract<uint8_t>(16, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), b.extract<uint8_t>(17, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), b.extract<uint8_t>(18, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x46), b.extract<uint8_t>(19, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x23), b.extract<uint8_t>(20, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x91), b.extract<uint8_t>(21, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x48), b.extract<uint8_t>(22, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
+    }
+
+    //*************************************************************************
+    TEST(test_extract_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, int32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x78), (b.extract<uint8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), (b.extract<uint8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), (b.extract<uint8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x67), (b.extract<uint8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), (b.extract<uint8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x59), (b.extract<uint8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), (b.extract<uint8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x56), (b.extract<uint8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), (b.extract<uint8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x45), (b.extract<uint8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), (b.extract<uint8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), (b.extract<uint8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x68), (b.extract<uint8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), (b.extract<uint8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x46), (b.extract<uint8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x91), (b.extract<uint8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x48), (b.extract<uint8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
+
+      // The line below should static assert.
+      //uint8_t v = b.extract<uint8_t, 25, 8>();
+      //uint8_t v = b.extract<uint8_t, 25, 9>();
+    }
   };
 }
diff --git a/test/vs2022/etl.vcxproj b/test/vs2022/etl.vcxproj
index 50d71f98..346223ed 100644
--- a/test/vs2022/etl.vcxproj
+++ b/test/vs2022/etl.vcxproj
@@ -839,17 +839,17 @@
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
@@ -859,37 +859,37 @@
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
@@ -935,7 +935,7 @@
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
diff --git a/test/vs2022/etl.vcxproj.filters b/test/vs2022/etl.vcxproj.filters
index d4dfc25b..cea19458 100644
--- a/test/vs2022/etl.vcxproj.filters
+++ b/test/vs2022/etl.vcxproj.filters
@@ -3334,12 +3334,6 @@
     <None Include="..\..\appveyor.yml">
       <Filter>Resource Files\CI\Appveyor</Filter>
     </None>
-    <None Include="..\..\.github\workflows\clang.yml">
-      <Filter>Resource Files\CI\Github</Filter>
-    </None>
-    <None Include="..\..\.github\workflows\gcc.yml">
-      <Filter>Resource Files\CI\Github</Filter>
-    </None>
     <None Include="..\..\.clang-format">
       <Filter>Resource Files</Filter>
     </None>
@@ -3406,6 +3400,14 @@
     <None Include="..\..\scripts\update_version.py">
       <Filter>Tests\Scripts</Filter>
     </None>
+    <None Include="..\..\.github\workflows\clang-c++11.yml" />
+    <None Include="..\..\.github\workflows\clang-c++14.yml" />
+    <None Include="..\..\.github\workflows\clang-c++17.yml" />
+    <None Include="..\..\.github\workflows\clang-c++20.yml" />
+    <None Include="..\..\.github\workflows\gcc-c++11.yml" />
+    <None Include="..\..\.github\workflows\gcc-c++14.yml" />
+    <None Include="..\..\.github\workflows\gcc-c++17.yml" />
+    <None Include="..\..\.github\workflows\gcc-c++20.yml" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\support\Release notes.txt">

From 3d3f87564dc964ea8f55d01175f75a1d9583d663 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Fri, 1 Dec 2023 17:21:48 +0000
Subject: [PATCH 003/131] Work in progress for etl::bitset::extract

---
 include/etl/private/bitset_new.h              | 186 +++++-----
 test/test_bitset_new_default_element_type.cpp | 326 +++++++++++++++++-
 ...itset_new_explicit_single_element_type.cpp |   4 +-
 ...st_bitset_new_ext_default_element_type.cpp |   4 +-
 ...t_new_ext_explicit_single_element_type.cpp |   4 +-
 5 files changed, 412 insertions(+), 112 deletions(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 058d8f45..4dbfbef8 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -145,6 +145,12 @@ namespace etl
     static ETL_CONSTANT element_type All_Set_Element    = etl::integral_limits<element_type>::max;
     static ETL_CONSTANT element_type All_Clear_Element  = element_type(0);
 
+    template <size_t Position, size_t Length, size_t Bits_Per_Element>
+    struct value_is_in_one_element
+    {
+      static ETL_CONSTANT bool value = ((Position + Length - 1) >> etl::log2<Bits_Per_Element>::value) == (Position >> etl::log2<Bits_Per_Element>::value);
+    };
+
     //*************************************************************************
     /// Count the number of bits set.
     //*************************************************************************
@@ -400,63 +406,56 @@ namespace etl
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-    T extract_from_single_element(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
+    T extract_from_buffer(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
       unsigned_t value(0);
 
-      const unsigned_t value_mask = etl::integral_limits<unsigned_t>::max;
-      const int        element_index = (position + length - 1) >> etl::log2<Bits_Per_Element>::value;
-      const unsigned_t Shift = position % Bits_Per_Element;
+      const int Msb_Element_Index = (position + length - 1) >> etl::log2<Bits_Per_Element>::value;
+      const int Lsb_Element_Index = position >> etl::log2<Bits_Per_Element>::value;
 
-      value = static_cast<unsigned_t>(pbuffer[element_index] >> Shift) & value_mask;
-
-      return static_cast<T>(value);
-    }
-
-    //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
-    //*************************************************************************
-    template <typename T>
-    ETL_CONSTEXPR14
-    T extract_from_multi_element(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
-    {
-      typedef typename etl::make_unsigned<T>::type unsigned_t;
-
-      unsigned_t value(0);
-
-      // The mask for the value type.
-      const unsigned_t value_mask = etl::integral_limits<unsigned_t>::max;
-
-      // Find the index of the element containing the msb.
-      int element_index = (position + length - 1) >> etl::log2<Bits_Per_Element>::value;
-
-      // The value is spread over multiple elements.       
-      element_type bit_mask = element_type(1) << ((position + length - 1) % Bits_Per_Element);
-
-      while (length != 0)
+      // Is the value contained within one element?
+      if (Msb_Element_Index == Lsb_Element_Index)
       {
-        // TODO Optimise this to read whole element values.
+        const unsigned_t Mask = ~(~0 << length);
+        const unsigned_t Shift = position % Bits_Per_Element;
 
-        value <<= 1;
+        value = static_cast<unsigned_t>(pbuffer[Msb_Element_Index] >> Shift) & Mask;
+      }
+      else
+      {
+        // Get the number of active bits in the msb element 
+        size_t active_bits_in_msb = (position + length) - (Msb_Element_Index * Bits_Per_Element);
 
-        const bool is_set = (pbuffer[element_index] & bit_mask) != 0;
+        // Extract the first element if partially filled.
+        // Start with index of the element containing the msb.
+        int element_index = Msb_Element_Index;
 
-        if (is_set)
+        if (active_bits_in_msb < Bits_Per_Element)
         {
-          value |= unsigned_t(1);
-        }
-
-        bit_mask >>= 1;
-
-        if (bit_mask == 0)
-        {
-          bit_mask = element_type(1) << (Bits_Per_Element - 1);
+          element_type mask = ~(~element_type(0) << active_bits_in_msb);
+          value |= pbuffer[element_index] & mask;
+          length -= active_bits_in_msb;
           --element_index;
         }
 
-        --length;
+        // Loop through the fully filled elements
+        while (length >= Bits_Per_Element)
+        {
+          value <<= Bits_Per_Element;
+          value |= pbuffer[element_index];
+          length -= Bits_Per_Element;
+          --element_index;
+        }
+
+        // Check if the last element is partially filled and extract.
+        if (length != 0)
+        {
+          value <<= length;
+          element_type mask = ~(~element_type(0) << length);
+          value |= (pbuffer[element_index] >> (Bits_Per_Element - length)) & mask;
+        }
       }
 
       return static_cast<T>(value);
@@ -467,17 +466,16 @@ namespace etl
     //*************************************************************************
     template <typename T, size_t Position, size_t Length>
     ETL_CONSTEXPR14
-    T extract_from_single_element(const_pointer pbuffer) const
+    typename etl::enable_if<value_is_in_one_element<Position, Length, Bits_Per_Element>::value, T>::type
+      extract_from_buffer(const_pointer pbuffer) const
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
-      unsigned_t value(0);
-
-      const unsigned_t value_mask    = etl::integral_limits<unsigned_t>::max;
-      const int        element_index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
+      const int        Element_Index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
+      const unsigned_t Mask          = ~(~0 << Length);
       const unsigned_t Shift         = Position % Bits_Per_Element;
-
-      value = static_cast<unsigned_t>(pbuffer[element_index] >> Shift) & value_mask;
+      
+      unsigned_t value = static_cast<unsigned_t>(pbuffer[Element_Index] >> Shift) & Mask;
 
       return static_cast<T>(value);
     }
@@ -487,44 +485,48 @@ namespace etl
     //*************************************************************************
     template <typename T, size_t Position, size_t Length>
     ETL_CONSTEXPR14
-    T extract_from_multi_element(const_pointer pbuffer) const
+    typename etl::enable_if<!value_is_in_one_element<Position, Length, Bits_Per_Element>::value, T>::type
+      extract_from_buffer(const_pointer pbuffer) const
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
       unsigned_t value(0);
 
-      // The mask for the value type.
-      const unsigned_t value_mask = etl::integral_limits<unsigned_t>::max;
+      const int Msb_Element_Index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
 
-      // Find the index of the element containing the msb.
-      int element_index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
+      // Start with index of the element containing the msb.
+      int element_index = Msb_Element_Index;
 
       // The value is spread over multiple elements.       
-      size_t       length   = Length;
-      element_type bit_mask = element_type(1) << ((Position + Length - 1) % Bits_Per_Element);
+      size_t length = Length;
 
-      while (length != 0)
+      // Get the number of active bits in the first element 
+      size_t active_bits_in_element = ((Position + Length - 1) % Bits_Per_Element) + 1;
+
+      // Extract the first element if partially filled.
+      if (active_bits_in_element < Bits_Per_Element)
       {
-        // TODO Optimise this to read whole element values.
+        element_type mask = ~(~element_type(0) << active_bits_in_element);
+        value |= pbuffer[element_index] & mask;
+        length -= active_bits_in_element;
+        --element_index;
+      }
 
-        value <<= 1;
+      // Loop through the fully filled elements
+      while (length >= Bits_Per_Element)
+      {
+        value <<= Bits_Per_Element;
+        value |= pbuffer[element_index];
+        length -= Bits_Per_Element;
+        --element_index;
+      }
 
-        const bool is_set = (pbuffer[element_index] & bit_mask) != 0;
-
-        if (is_set)
-        {
-          value |= unsigned_t(1);
-        }      
-
-        bit_mask >>= 1;
-
-        if (bit_mask == 0)
-        {
-          bit_mask = element_type(1) << (Bits_Per_Element - 1);
-          --element_index;
-        }
-
-        --length;
+      // Check if the last element is partially filled and extract.
+      if (length != 0)
+      {
+        value <<= length;
+        element_type mask = ~(~element_type(0) << length);
+        value |= (pbuffer[element_index] >> (Bits_Per_Element - length)) & mask;
       }
 
       return static_cast<T>(value);
@@ -2187,7 +2189,7 @@ namespace etl
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-      typename etl::enable_if<etl::is_integral<T>::value, T>::type
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
       value() const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Only integral types are supported");
@@ -2206,7 +2208,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
 
-      return ibitset.extract_from_multi_element<T>(buffer, position, length);
+      return ibitset.extract_from_buffer<T>(buffer, position, length);
     }
 
     //*************************************************************************
@@ -2214,22 +2216,12 @@ namespace etl
     //*************************************************************************
     template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
     ETL_CONSTEXPR14
-      typename etl::enable_if<etl::is_integral<T>::value, T>::type
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
       extract() const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
 
-      const int active_bits_in_element = ((Position + Length) % Bits_Per_Element);
-
-      // Is the value contained within one element?
-      if (active_bits_in_element == Length)
-      {
-        return ibitset.extract_from_single_element<T, Position, Length>(buffer);
-      }
-      else
-      {
-        return ibitset.extract_from_multi_element<T, Position, Length>(buffer);
-      }
+      return ibitset.extract_from_buffer<T, Position, Length>(buffer);
     }
 
     //*************************************************************************
@@ -3989,7 +3981,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
 
-      return ibitset.extract_from_multi_element<T>(pbuffer, position, length);
+      return ibitset.extract_from_buffer<T>(pbuffer, position, length);
     }
 
     //*************************************************************************
@@ -4002,17 +3994,7 @@ namespace etl
     {
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
 
-      const int active_bits_in_element = ((Position + Length) % Bits_Per_Element);
-
-      // Is the value contained within one element?
-      if (active_bits_in_element == Length)
-      {
-        return ibitset.extract_from_single_element<T, Position, Length>(pbuffer);
-      }
-      else
-      {
-        return ibitset.extract_from_multi_element<T, Position, Length>(pbuffer);
-      }
+      return ibitset.extract_from_buffer<T, Position, Length>(pbuffer);
     }
 
     //*************************************************************************
diff --git a/test/test_bitset_new_default_element_type.cpp b/test/test_bitset_new_default_element_type.cpp
index f41ac262..199e18a0 100644
--- a/test/test_bitset_new_default_element_type.cpp
+++ b/test/test_bitset_new_default_element_type.cpp
@@ -2098,7 +2098,82 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_extract_with_run_time_parameters)
+    TEST(test_extract_6_bit_uint8_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t>(10, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t>(11, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t>(12, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t>(13, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(14, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t>(15, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t>(16, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t>(17, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t>(18, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t>(19, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t>(20, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(21, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t>(22, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t>(23, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t>(24, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t>(25, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<uint8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_uint8_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //uint8_t v1 = b.extract<uint8_t, 26, 7>();
+      //uint8_t v1 = b.extract<uint8_t, 27, 6>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint8_t_with_run_time_parameters)
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
@@ -2128,11 +2203,12 @@ namespace
       CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
       CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
       
+      CHECK_THROW(b.extract<uint8_t>(24, 9), etl::bitset_overflow);
       CHECK_THROW(b.extract<uint8_t>(25, 8), etl::bitset_overflow);
     }
 
     //*************************************************************************
-    TEST(test_extract_with_template_parameters)
+    TEST(test_extract_uint8_t_with_template_parameters)
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
@@ -2163,8 +2239,250 @@ namespace
       CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
 
       // The lines below should static assert.
-      //uint8_t v = b.extract<uint8_t, 25, 8>();
-      //uint8_t v = b.extract<uint8_t, 25, 9>();
+      //uint8_t v1 = b.extract<uint8_t, 24, 9>();
+      //uint8_t v2 = b.extract<uint8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), b.extract<int8_t>( 0, 8));
+      CHECK_EQUAL_HEX(int8_t(0x3C), b.extract<int8_t>( 1, 8));
+      CHECK_EQUAL_HEX(int8_t(0x9E), b.extract<int8_t>( 2, 8));
+      CHECK_EQUAL_HEX(int8_t(0xCF), b.extract<int8_t>( 3, 8));
+      CHECK_EQUAL_HEX(int8_t(0x67), b.extract<int8_t>( 4, 8));
+      CHECK_EQUAL_HEX(int8_t(0xB3), b.extract<int8_t>( 5, 8));
+      CHECK_EQUAL_HEX(int8_t(0x59), b.extract<int8_t>( 6, 8));
+      CHECK_EQUAL_HEX(int8_t(0xAC), b.extract<int8_t>( 7, 8));
+      CHECK_EQUAL_HEX(int8_t(0x56), b.extract<int8_t>( 8, 8));
+      CHECK_EQUAL_HEX(int8_t(0x2B), b.extract<int8_t>( 9, 8));
+      CHECK_EQUAL_HEX(int8_t(0x15), b.extract<int8_t>(10, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8A), b.extract<int8_t>(11, 8));
+      CHECK_EQUAL_HEX(int8_t(0x45), b.extract<int8_t>(12, 8));
+      CHECK_EQUAL_HEX(int8_t(0xA2), b.extract<int8_t>(13, 8));
+      CHECK_EQUAL_HEX(int8_t(0xD1), b.extract<int8_t>(14, 8));
+      CHECK_EQUAL_HEX(int8_t(0x68), b.extract<int8_t>(15, 8));
+      CHECK_EQUAL_HEX(int8_t(0x34), b.extract<int8_t>(16, 8));
+      CHECK_EQUAL_HEX(int8_t(0x1A), b.extract<int8_t>(17, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8D), b.extract<int8_t>(18, 8));
+      CHECK_EQUAL_HEX(int8_t(0x46), b.extract<int8_t>(19, 8));
+      CHECK_EQUAL_HEX(int8_t(0x23), b.extract<int8_t>(20, 8));
+      CHECK_EQUAL_HEX(int8_t(0x91), b.extract<int8_t>(21, 8));
+      CHECK_EQUAL_HEX(int8_t(0x48), b.extract<int8_t>(22, 8));
+      CHECK_EQUAL_HEX(int8_t(0x24), b.extract<int8_t>(23, 8));
+      CHECK_EQUAL_HEX(int8_t(0x12), b.extract<int8_t>(24, 8));
+
+      CHECK_THROW(b.extract<int8_t>(24, 9), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(25, 8), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), (b.extract<int8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x3C), (b.extract<int8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x9E), (b.extract<int8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xCF), (b.extract<int8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x67), (b.extract<int8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xB3), (b.extract<int8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x59), (b.extract<int8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xAC), (b.extract<int8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x56), (b.extract<int8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x2B), (b.extract<int8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8A), (b.extract<int8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x45), (b.extract<int8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xA2), (b.extract<int8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xD1), (b.extract<int8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x68), (b.extract<int8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x34), (b.extract<int8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8D), (b.extract<int8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x46), (b.extract<int8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x23), (b.extract<int8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x91), (b.extract<int8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x48), (b.extract<int8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x24), (b.extract<int8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 8>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 24, 9>();
+      //int8_t v2 = b.extract<int8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), b.extract<uint16_t>( 0, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), b.extract<uint16_t>( 1, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), b.extract<uint16_t>( 3, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), b.extract<uint16_t>( 4, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), b.extract<uint16_t>( 5, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), b.extract<uint16_t>( 6, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), b.extract<uint16_t>( 7, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), b.extract<uint16_t>( 8, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), b.extract<uint16_t>(10, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), b.extract<uint16_t>(11, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), b.extract<uint16_t>(12, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), b.extract<uint16_t>(13, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), b.extract<uint16_t>(14, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), b.extract<uint16_t>(15, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), b.extract<uint16_t>(17, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), b.extract<uint16_t>(18, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), b.extract<uint16_t>(19, 13));
+
+      CHECK_THROW(b.extract<uint16_t>(19, 14), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(20, 13), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), (b.extract<uint16_t,  0,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), (b.extract<uint16_t,  1,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), (b.extract<uint16_t,  3,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), (b.extract<uint16_t,  4,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), (b.extract<uint16_t,  5,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), (b.extract<uint16_t,  6,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), (b.extract<uint16_t,  7,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), (b.extract<uint16_t,  8,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), (b.extract<uint16_t, 10,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), (b.extract<uint16_t, 11,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), (b.extract<uint16_t, 12,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), (b.extract<uint16_t, 13,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), (b.extract<uint16_t, 14,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), (b.extract<uint16_t, 15,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), (b.extract<uint16_t, 17,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), (b.extract<uint16_t, 18,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), (b.extract<uint16_t, 19,13>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 19, 14);
+      //uint16_t v2 = b.extract<uint16_t, 20, 13);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), b.extract<uint16_t>( 0, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), b.extract<uint16_t>( 1, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), b.extract<uint16_t>( 3, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), b.extract<uint16_t>( 4, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), b.extract<uint16_t>( 5, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), b.extract<uint16_t>( 6, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), b.extract<uint16_t>( 7, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), b.extract<uint16_t>( 8, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), b.extract<uint16_t>(10, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), b.extract<uint16_t>(11, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), b.extract<uint16_t>(12, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), b.extract<uint16_t>(13, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), b.extract<uint16_t>(14, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), b.extract<uint16_t>(15, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 16));
+
+      CHECK_THROW(b.extract<uint16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), (b.extract<uint16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), (b.extract<uint16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), (b.extract<uint16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), (b.extract<uint16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), (b.extract<uint16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), (b.extract<uint16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), (b.extract<uint16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), (b.extract<uint16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), (b.extract<uint16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), (b.extract<uint16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), (b.extract<uint16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), (b.extract<uint16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), (b.extract<uint16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), (b.extract<uint16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 16, 17>();
+      //uint16_t v2 = b.extract<uint16_t, 17, 16>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>(0, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>(1, 16));
+      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>(2, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>(3, 16));
+      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>(4, 16));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>(5, 16));
+      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>(6, 16));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>(7, 16));
+      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>(8, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>(9, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), b.extract<int16_t>(10, 16));
+      CHECK_EQUAL_HEX(int16_t(0x468A), b.extract<int16_t>(11, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2345), b.extract<int16_t>(12, 16));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), b.extract<int16_t>(13, 16));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), b.extract<int16_t>(14, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2468), b.extract<int16_t>(15, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1234), b.extract<int16_t>(16, 16));
+
+      CHECK_THROW(b.extract<int16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t, 0, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t, 1, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t, 2, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t, 3, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t, 4, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t, 5, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t, 6, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t, 7, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t, 8, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t, 9, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), (b.extract<int16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x468A), (b.extract<int16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2345), (b.extract<int16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), (b.extract<int16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), (b.extract<int16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2468), (b.extract<int16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1234), (b.extract<int16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //int16_t v1 = b.extract<int16_t, 16, 17>());
+      //int16_t v2 = b.extract<int16_t, 17, 16>());
     }
   };
 }
diff --git a/test/test_bitset_new_explicit_single_element_type.cpp b/test/test_bitset_new_explicit_single_element_type.cpp
index 0f25e6da..8e161389 100644
--- a/test/test_bitset_new_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_explicit_single_element_type.cpp
@@ -1587,7 +1587,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_extract_with_run_time_parameters)
+    TEST(test_extract_uint8_t_with_run_time_parameters)
     {
       ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
 
@@ -1620,7 +1620,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_extract_with_template_parameters)
+    TEST(test_extract_uint8_t_with_template_parameters)
     {
       ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
 
diff --git a/test/test_bitset_new_ext_default_element_type.cpp b/test/test_bitset_new_ext_default_element_type.cpp
index c5e12541..7e377a95 100644
--- a/test/test_bitset_new_ext_default_element_type.cpp
+++ b/test/test_bitset_new_ext_default_element_type.cpp
@@ -1959,7 +1959,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_extract_with_run_time_parameters)
+    TEST(test_extract_uint8_t_with_run_time_parameters)
     {
       using bs32 = etl::bitset_ext<32>;
 
@@ -1994,7 +1994,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_extract_with_template_parameters)
+    TEST(test_extract_uint8_t_with_template_parameters)
     {
       using bs32 = etl::bitset_ext<32>;
 
diff --git a/test/test_bitset_new_ext_explicit_single_element_type.cpp b/test/test_bitset_new_ext_explicit_single_element_type.cpp
index 308259a4..d0b489be 100644
--- a/test/test_bitset_new_ext_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_ext_explicit_single_element_type.cpp
@@ -1311,7 +1311,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_extract_with_run_time_parameters)
+    TEST(test_extract_uint8_t_with_run_time_parameters)
     {
       using bs32 = etl::bitset_ext<32, int32_t>;
 
@@ -1346,7 +1346,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_extract_with_template_parameters)
+    TEST(test_extract_uint8_t_with_template_parameters)
     {
       using bs32 = etl::bitset_ext<32, int32_t>;
 

From 9064eecee2b11e2faab861856dd6d3497f1d9405 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 2 Dec 2023 17:46:38 +0000
Subject: [PATCH 004/131] Work in progress for etl::bitset::extract

---
 include/etl/private/bitset_new.h              | 148 ++++++++++--------
 test/test_bitset_new_default_element_type.cpp |  77 +++++++++
 test/vs2022/etl.vcxproj.filters               |  32 +++-
 3 files changed, 182 insertions(+), 75 deletions(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 4dbfbef8..65128c75 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -401,12 +401,62 @@ namespace etl
       return v;
     }
 
+    //*************************************************************************
+    /// Extract an value from multiple elements.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    typename etl::make_unsigned<T>::type extract_from_multiple_elements(const element_type* pbuffer,
+                                                                        int                 element_index,
+                                                                        size_t              active_bits_in_msb,
+                                                                        size_t              length) const ETL_NOEXCEPT
+    {
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value(0);
+
+      // Extract the first element, if partially filled.
+      if (active_bits_in_msb < Bits_Per_Element)
+      {
+        element_type mask = ~(~element_type(0) << active_bits_in_msb);
+        value = pbuffer[element_index] & mask;
+        length -= active_bits_in_msb;
+        if (length >= Bits_Per_Element)
+        {
+          value = value << Bits_Per_Element;
+        }
+        --element_index;
+      }
+
+      // Loop through the fully filled elements
+      while (length >= Bits_Per_Element)
+      {
+        value |= pbuffer[element_index];
+        length -= Bits_Per_Element;
+        if (length >= Bits_Per_Element)
+        {
+          value = value << Bits_Per_Element;
+        }
+        --element_index;
+      }
+
+      // Extract the last element, if partially filled.
+      if (length != 0)
+      {
+        value = value << length;
+        element_type mask = ~(~element_type(0) << length);
+        value |= (pbuffer[element_index] >> (Bits_Per_Element - length)) & mask;
+      }
+
+      return value;
+    }
+
     //*************************************************************************
     /// Extract an integral value from an arbitary position and length.
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-    T extract_from_buffer(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
+    typename etl::make_unsigned<T>::type extract_from_buffer(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
@@ -428,37 +478,13 @@ namespace etl
         // Get the number of active bits in the msb element 
         size_t active_bits_in_msb = (position + length) - (Msb_Element_Index * Bits_Per_Element);
 
-        // Extract the first element if partially filled.
         // Start with index of the element containing the msb.
         int element_index = Msb_Element_Index;
 
-        if (active_bits_in_msb < Bits_Per_Element)
-        {
-          element_type mask = ~(~element_type(0) << active_bits_in_msb);
-          value |= pbuffer[element_index] & mask;
-          length -= active_bits_in_msb;
-          --element_index;
-        }
-
-        // Loop through the fully filled elements
-        while (length >= Bits_Per_Element)
-        {
-          value <<= Bits_Per_Element;
-          value |= pbuffer[element_index];
-          length -= Bits_Per_Element;
-          --element_index;
-        }
-
-        // Check if the last element is partially filled and extract.
-        if (length != 0)
-        {
-          value <<= length;
-          element_type mask = ~(~element_type(0) << length);
-          value |= (pbuffer[element_index] >> (Bits_Per_Element - length)) & mask;
-        }
+        value = extract_from_multiple_elements<T>(pbuffer, element_index, active_bits_in_msb, length);
       }
 
-      return static_cast<T>(value);
+      return value;
     }
 
     //*************************************************************************
@@ -466,7 +492,7 @@ namespace etl
     //*************************************************************************
     template <typename T, size_t Position, size_t Length>
     ETL_CONSTEXPR14
-    typename etl::enable_if<value_is_in_one_element<Position, Length, Bits_Per_Element>::value, T>::type
+    typename etl::enable_if<value_is_in_one_element<Position, Length, Bits_Per_Element>::value, typename etl::make_unsigned<T>::type>::type
       extract_from_buffer(const_pointer pbuffer) const
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
@@ -475,9 +501,7 @@ namespace etl
       const unsigned_t Mask          = ~(~0 << Length);
       const unsigned_t Shift         = Position % Bits_Per_Element;
       
-      unsigned_t value = static_cast<unsigned_t>(pbuffer[Element_Index] >> Shift) & Mask;
-
-      return static_cast<T>(value);
+      return  static_cast<unsigned_t>(pbuffer[Element_Index] >> Shift) & Mask;
     }
 
     //*************************************************************************
@@ -485,13 +509,11 @@ namespace etl
     //*************************************************************************
     template <typename T, size_t Position, size_t Length>
     ETL_CONSTEXPR14
-    typename etl::enable_if<!value_is_in_one_element<Position, Length, Bits_Per_Element>::value, T>::type
+    typename etl::enable_if<!value_is_in_one_element<Position, Length, Bits_Per_Element>::value, typename etl::make_unsigned<T>::type>::type
       extract_from_buffer(const_pointer pbuffer) const
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
-
-      unsigned_t value(0);
-
+       
       const int Msb_Element_Index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
 
       // Start with index of the element containing the msb.
@@ -501,35 +523,9 @@ namespace etl
       size_t length = Length;
 
       // Get the number of active bits in the first element 
-      size_t active_bits_in_element = ((Position + Length - 1) % Bits_Per_Element) + 1;
+      size_t active_bits_in_msb = ((Position + Length - 1) % Bits_Per_Element) + 1;
 
-      // Extract the first element if partially filled.
-      if (active_bits_in_element < Bits_Per_Element)
-      {
-        element_type mask = ~(~element_type(0) << active_bits_in_element);
-        value |= pbuffer[element_index] & mask;
-        length -= active_bits_in_element;
-        --element_index;
-      }
-
-      // Loop through the fully filled elements
-      while (length >= Bits_Per_Element)
-      {
-        value <<= Bits_Per_Element;
-        value |= pbuffer[element_index];
-        length -= Bits_Per_Element;
-        --element_index;
-      }
-
-      // Check if the last element is partially filled and extract.
-      if (length != 0)
-      {
-        value <<= length;
-        element_type mask = ~(~element_type(0) << length);
-        value |= (pbuffer[element_index] >> (Bits_Per_Element - length)) & mask;
-      }
-
-      return static_cast<T>(value);
+      return extract_from_multiple_elements<T>(pbuffer, element_index, active_bits_in_msb, length);
     }
 
     //*************************************************************************
@@ -2208,7 +2204,16 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
 
-      return ibitset.extract_from_buffer<T>(buffer, position, length);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value = ibitset.template extract_from_buffer<T>(buffer, position, length);;
+
+      if ((length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T>(value, length);
+      }
+
+      return value;
     }
 
     //*************************************************************************
@@ -2221,7 +2226,16 @@ namespace etl
     {
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
 
-      return ibitset.extract_from_buffer<T, Position, Length>(buffer);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value = ibitset.template extract_from_buffer<T, Position, Length>(buffer);
+
+      if ETL_IF_CONSTEXPR((Length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T, Length>(value);
+      }
+
+      return value;
     }
 
     //*************************************************************************
@@ -3981,7 +3995,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
 
-      return ibitset.extract_from_buffer<T>(pbuffer, position, length);
+      return ibitset.template extract_from_buffer<T>(pbuffer, position, length);
     }
 
     //*************************************************************************
@@ -3994,7 +4008,7 @@ namespace etl
     {
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
 
-      return ibitset.extract_from_buffer<T, Position, Length>(pbuffer);
+      return ibitset.template extract_from_buffer<T, Position, Length>(pbuffer);
     }
 
     //*************************************************************************
diff --git a/test/test_bitset_new_default_element_type.cpp b/test/test_bitset_new_default_element_type.cpp
index 199e18a0..a0980425 100644
--- a/test/test_bitset_new_default_element_type.cpp
+++ b/test/test_bitset_new_default_element_type.cpp
@@ -2172,6 +2172,83 @@ namespace
       //uint8_t v1 = b.extract<uint8_t, 27, 6>();
     }
 
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      auto v = b.extract<int8_t>(1, 6);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>(0, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>(1, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>(2, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>(3, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>(4, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>(5, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>(6, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>(7, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>(8, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>(9, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t>(10, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t>(11, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t>(12, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t>(13, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(14, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t>(15, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t>(16, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t>(17, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t>(18, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t>(19, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t>(20, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(21, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t>(22, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t>(23, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t>(24, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t>(25, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<int8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t, 0, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t, 1, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t, 2, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t, 3, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t, 4, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t, 5, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t, 6, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t, 7, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t, 8, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t, 9, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 26, 7>();
+      //int8_t v1 = b.extract<int8_t, 27, 6>();
+    }
+
     //*************************************************************************
     TEST(test_extract_uint8_t_with_run_time_parameters)
     {
diff --git a/test/vs2022/etl.vcxproj.filters b/test/vs2022/etl.vcxproj.filters
index cea19458..5430cd00 100644
--- a/test/vs2022/etl.vcxproj.filters
+++ b/test/vs2022/etl.vcxproj.filters
@@ -3400,14 +3400,30 @@
     <None Include="..\..\scripts\update_version.py">
       <Filter>Tests\Scripts</Filter>
     </None>
-    <None Include="..\..\.github\workflows\clang-c++11.yml" />
-    <None Include="..\..\.github\workflows\clang-c++14.yml" />
-    <None Include="..\..\.github\workflows\clang-c++17.yml" />
-    <None Include="..\..\.github\workflows\clang-c++20.yml" />
-    <None Include="..\..\.github\workflows\gcc-c++11.yml" />
-    <None Include="..\..\.github\workflows\gcc-c++14.yml" />
-    <None Include="..\..\.github\workflows\gcc-c++17.yml" />
-    <None Include="..\..\.github\workflows\gcc-c++20.yml" />
+    <None Include="..\..\.github\workflows\clang-c++11.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\clang-c++14.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\clang-c++17.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\clang-c++20.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++11.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++14.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++17.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++20.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\support\Release notes.txt">

From 18a1c76ec67531e170e0e218db1f5bdc8d0a473e Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 2 Dec 2023 17:46:38 +0000
Subject: [PATCH 005/131] Work in progress for etl::bitset::extract

---
 include/etl/private/bitset_new.h              | 148 ++++++++++--------
 test/run-tests.sh                             |   2 +-
 test/test_bitset_new_default_element_type.cpp |  77 +++++++++
 test/vs2022/etl.vcxproj.filters               |  32 +++-
 4 files changed, 183 insertions(+), 76 deletions(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 4dbfbef8..65128c75 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -401,12 +401,62 @@ namespace etl
       return v;
     }
 
+    //*************************************************************************
+    /// Extract an value from multiple elements.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    typename etl::make_unsigned<T>::type extract_from_multiple_elements(const element_type* pbuffer,
+                                                                        int                 element_index,
+                                                                        size_t              active_bits_in_msb,
+                                                                        size_t              length) const ETL_NOEXCEPT
+    {
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value(0);
+
+      // Extract the first element, if partially filled.
+      if (active_bits_in_msb < Bits_Per_Element)
+      {
+        element_type mask = ~(~element_type(0) << active_bits_in_msb);
+        value = pbuffer[element_index] & mask;
+        length -= active_bits_in_msb;
+        if (length >= Bits_Per_Element)
+        {
+          value = value << Bits_Per_Element;
+        }
+        --element_index;
+      }
+
+      // Loop through the fully filled elements
+      while (length >= Bits_Per_Element)
+      {
+        value |= pbuffer[element_index];
+        length -= Bits_Per_Element;
+        if (length >= Bits_Per_Element)
+        {
+          value = value << Bits_Per_Element;
+        }
+        --element_index;
+      }
+
+      // Extract the last element, if partially filled.
+      if (length != 0)
+      {
+        value = value << length;
+        element_type mask = ~(~element_type(0) << length);
+        value |= (pbuffer[element_index] >> (Bits_Per_Element - length)) & mask;
+      }
+
+      return value;
+    }
+
     //*************************************************************************
     /// Extract an integral value from an arbitary position and length.
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-    T extract_from_buffer(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
+    typename etl::make_unsigned<T>::type extract_from_buffer(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
@@ -428,37 +478,13 @@ namespace etl
         // Get the number of active bits in the msb element 
         size_t active_bits_in_msb = (position + length) - (Msb_Element_Index * Bits_Per_Element);
 
-        // Extract the first element if partially filled.
         // Start with index of the element containing the msb.
         int element_index = Msb_Element_Index;
 
-        if (active_bits_in_msb < Bits_Per_Element)
-        {
-          element_type mask = ~(~element_type(0) << active_bits_in_msb);
-          value |= pbuffer[element_index] & mask;
-          length -= active_bits_in_msb;
-          --element_index;
-        }
-
-        // Loop through the fully filled elements
-        while (length >= Bits_Per_Element)
-        {
-          value <<= Bits_Per_Element;
-          value |= pbuffer[element_index];
-          length -= Bits_Per_Element;
-          --element_index;
-        }
-
-        // Check if the last element is partially filled and extract.
-        if (length != 0)
-        {
-          value <<= length;
-          element_type mask = ~(~element_type(0) << length);
-          value |= (pbuffer[element_index] >> (Bits_Per_Element - length)) & mask;
-        }
+        value = extract_from_multiple_elements<T>(pbuffer, element_index, active_bits_in_msb, length);
       }
 
-      return static_cast<T>(value);
+      return value;
     }
 
     //*************************************************************************
@@ -466,7 +492,7 @@ namespace etl
     //*************************************************************************
     template <typename T, size_t Position, size_t Length>
     ETL_CONSTEXPR14
-    typename etl::enable_if<value_is_in_one_element<Position, Length, Bits_Per_Element>::value, T>::type
+    typename etl::enable_if<value_is_in_one_element<Position, Length, Bits_Per_Element>::value, typename etl::make_unsigned<T>::type>::type
       extract_from_buffer(const_pointer pbuffer) const
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
@@ -475,9 +501,7 @@ namespace etl
       const unsigned_t Mask          = ~(~0 << Length);
       const unsigned_t Shift         = Position % Bits_Per_Element;
       
-      unsigned_t value = static_cast<unsigned_t>(pbuffer[Element_Index] >> Shift) & Mask;
-
-      return static_cast<T>(value);
+      return  static_cast<unsigned_t>(pbuffer[Element_Index] >> Shift) & Mask;
     }
 
     //*************************************************************************
@@ -485,13 +509,11 @@ namespace etl
     //*************************************************************************
     template <typename T, size_t Position, size_t Length>
     ETL_CONSTEXPR14
-    typename etl::enable_if<!value_is_in_one_element<Position, Length, Bits_Per_Element>::value, T>::type
+    typename etl::enable_if<!value_is_in_one_element<Position, Length, Bits_Per_Element>::value, typename etl::make_unsigned<T>::type>::type
       extract_from_buffer(const_pointer pbuffer) const
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
-
-      unsigned_t value(0);
-
+       
       const int Msb_Element_Index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
 
       // Start with index of the element containing the msb.
@@ -501,35 +523,9 @@ namespace etl
       size_t length = Length;
 
       // Get the number of active bits in the first element 
-      size_t active_bits_in_element = ((Position + Length - 1) % Bits_Per_Element) + 1;
+      size_t active_bits_in_msb = ((Position + Length - 1) % Bits_Per_Element) + 1;
 
-      // Extract the first element if partially filled.
-      if (active_bits_in_element < Bits_Per_Element)
-      {
-        element_type mask = ~(~element_type(0) << active_bits_in_element);
-        value |= pbuffer[element_index] & mask;
-        length -= active_bits_in_element;
-        --element_index;
-      }
-
-      // Loop through the fully filled elements
-      while (length >= Bits_Per_Element)
-      {
-        value <<= Bits_Per_Element;
-        value |= pbuffer[element_index];
-        length -= Bits_Per_Element;
-        --element_index;
-      }
-
-      // Check if the last element is partially filled and extract.
-      if (length != 0)
-      {
-        value <<= length;
-        element_type mask = ~(~element_type(0) << length);
-        value |= (pbuffer[element_index] >> (Bits_Per_Element - length)) & mask;
-      }
-
-      return static_cast<T>(value);
+      return extract_from_multiple_elements<T>(pbuffer, element_index, active_bits_in_msb, length);
     }
 
     //*************************************************************************
@@ -2208,7 +2204,16 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
 
-      return ibitset.extract_from_buffer<T>(buffer, position, length);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value = ibitset.template extract_from_buffer<T>(buffer, position, length);;
+
+      if ((length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T>(value, length);
+      }
+
+      return value;
     }
 
     //*************************************************************************
@@ -2221,7 +2226,16 @@ namespace etl
     {
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
 
-      return ibitset.extract_from_buffer<T, Position, Length>(buffer);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value = ibitset.template extract_from_buffer<T, Position, Length>(buffer);
+
+      if ETL_IF_CONSTEXPR((Length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T, Length>(value);
+      }
+
+      return value;
     }
 
     //*************************************************************************
@@ -3981,7 +3995,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
 
-      return ibitset.extract_from_buffer<T>(pbuffer, position, length);
+      return ibitset.template extract_from_buffer<T>(pbuffer, position, length);
     }
 
     //*************************************************************************
@@ -3994,7 +4008,7 @@ namespace etl
     {
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
 
-      return ibitset.extract_from_buffer<T, Position, Length>(pbuffer);
+      return ibitset.template extract_from_buffer<T, Position, Length>(pbuffer);
     }
 
     //*************************************************************************
diff --git a/test/run-tests.sh b/test/run-tests.sh
index 90433c4e..0fa5d720 100644
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -165,7 +165,7 @@ etl_version=$(echo $etl_version_raw | sed -e 's/\r//g') # Remove trailing \r
 # Get the compiler versions
 #******************************************************************************
 gcc_compiler=$(g++ --version | grep g++)
-clang_compiler=$(clang++ --version | grep clang++)
+clang_compiler=$(clang++ --version | grep clang)
 
 #******************************************************************************
 # GCC
diff --git a/test/test_bitset_new_default_element_type.cpp b/test/test_bitset_new_default_element_type.cpp
index 199e18a0..a0980425 100644
--- a/test/test_bitset_new_default_element_type.cpp
+++ b/test/test_bitset_new_default_element_type.cpp
@@ -2172,6 +2172,83 @@ namespace
       //uint8_t v1 = b.extract<uint8_t, 27, 6>();
     }
 
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      auto v = b.extract<int8_t>(1, 6);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>(0, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>(1, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>(2, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>(3, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>(4, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>(5, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>(6, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>(7, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>(8, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>(9, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t>(10, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t>(11, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t>(12, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t>(13, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(14, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t>(15, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t>(16, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t>(17, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t>(18, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t>(19, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t>(20, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(21, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t>(22, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t>(23, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t>(24, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t>(25, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<int8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t, 0, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t, 1, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t, 2, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t, 3, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t, 4, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t, 5, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t, 6, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t, 7, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t, 8, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t, 9, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 26, 7>();
+      //int8_t v1 = b.extract<int8_t, 27, 6>();
+    }
+
     //*************************************************************************
     TEST(test_extract_uint8_t_with_run_time_parameters)
     {
diff --git a/test/vs2022/etl.vcxproj.filters b/test/vs2022/etl.vcxproj.filters
index cea19458..5430cd00 100644
--- a/test/vs2022/etl.vcxproj.filters
+++ b/test/vs2022/etl.vcxproj.filters
@@ -3400,14 +3400,30 @@
     <None Include="..\..\scripts\update_version.py">
       <Filter>Tests\Scripts</Filter>
     </None>
-    <None Include="..\..\.github\workflows\clang-c++11.yml" />
-    <None Include="..\..\.github\workflows\clang-c++14.yml" />
-    <None Include="..\..\.github\workflows\clang-c++17.yml" />
-    <None Include="..\..\.github\workflows\clang-c++20.yml" />
-    <None Include="..\..\.github\workflows\gcc-c++11.yml" />
-    <None Include="..\..\.github\workflows\gcc-c++14.yml" />
-    <None Include="..\..\.github\workflows\gcc-c++17.yml" />
-    <None Include="..\..\.github\workflows\gcc-c++20.yml" />
+    <None Include="..\..\.github\workflows\clang-c++11.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\clang-c++14.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\clang-c++17.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\clang-c++20.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++11.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++14.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++17.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++20.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\support\Release notes.txt">

From 5b4e991ee8f978bff79fb93825d92c4ad872695b Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 4 Dec 2023 08:37:10 +0000
Subject: [PATCH 006/131] Added additional etl::make_lsb_mask and
 etl::make_msb_mask binary functions

---
 include/etl/binary.h |  35 ++++++-
 test/test_binary.cpp | 218 +++++++++++++++++++++++++++++++++++--------
 2 files changed, 207 insertions(+), 46 deletions(-)

diff --git a/include/etl/binary.h b/include/etl/binary.h
index 1efd5f15..f6388562 100644
--- a/include/etl/binary.h
+++ b/include/etl/binary.h
@@ -2216,20 +2216,31 @@ namespace etl
   {
   public:
 
+    ETL_STATIC_ASSERT(NBits <= etl::integral_limits<T>::bits, "Mask exceeds type size");
+
     static ETL_CONSTANT T value = static_cast<T>(etl::max_value_for_nbits<NBits>::value);
   };
 
   template <typename T, size_t NBits>
   ETL_CONSTANT T lsb_mask<T, NBits>::value;
 
+  //***********************************
+  template <typename T, size_t NBits>
+  ETL_CONSTEXPR T make_lsb_mask()
+  {
+    ETL_STATIC_ASSERT(NBits <= etl::integral_limits<T>::bits, "Mask exceeds type size");
+
+    return lsb_mask<T, NBits>::value;
+  }
+
   //***********************************
   template <typename T>
-  ETL_CONSTEXPR14 T make_lsb_mask(size_t nbits)
+  ETL_CONSTEXPR T make_lsb_mask(size_t nbits)
   {
     typedef typename etl::make_unsigned<T>::type type;
 
-    return (nbits == etl::integral_limits<type>::bits) ? static_cast<T>(etl::integral_limits<type>::max)
-                                                       : static_cast<T>((static_cast<type>(1U) << nbits) - 1U);
+    return (nbits == 0U) ? static_cast<T>(0)
+      : static_cast<T>(static_cast<type>(~0) >> (etl::integral_limits<type>::bits - nbits));
   }
 
   //***********************************
@@ -2238,6 +2249,8 @@ namespace etl
   {
   public:
 
+    ETL_STATIC_ASSERT(NBits <= etl::integral_limits<T>::bits, "Mask exceeds type size");
+
     static ETL_CONSTANT T value = static_cast<T>(etl::reverse_bits_const<T, lsb_mask<T, NBits>::value>::value);
   };
 
@@ -2246,9 +2259,21 @@ namespace etl
 
   //***********************************
   template <typename T>
-  ETL_CONSTEXPR14 T make_msb_mask(size_t nbits)
+  ETL_CONSTEXPR T make_msb_mask(size_t nbits)
   {
-    return static_cast<T>(etl::reverse_bits(make_lsb_mask<T>(nbits)));
+    typedef typename etl::make_unsigned<T>::type type;
+
+    return (nbits == 0U) ? static_cast<T>(0)
+                         : static_cast<T>(static_cast<type>(~0) << (etl::integral_limits<type>::bits - nbits));
+  }
+
+  //***********************************
+  template <typename T, size_t NBits>
+  ETL_CONSTEXPR T make_msb_mask()
+  {
+    ETL_STATIC_ASSERT(NBits <= etl::integral_limits<T>::bits, "Mask exceeds type size");
+
+    return msb_mask<T, NBits>::value;
   }
 
   //***************************************************************************
diff --git a/test/test_binary.cpp b/test/test_binary.cpp
index 468758cd..56e5157d 100644
--- a/test/test_binary.cpp
+++ b/test/test_binary.cpp
@@ -2584,8 +2584,8 @@ namespace
     //*************************************************************************
     TEST(test_lsb_mask_64_bit)
     {
-      CHECK(int64_t(0x0000000000000000) == (etl::lsb_mask<int64_t, 0>::value));
-      CHECK(int64_t(0x00000000000000FF) == (etl::lsb_mask<int64_t, 8>::value));
+      CHECK(int64_t(0x0000000000000000) == (etl::lsb_mask<int64_t,  0>::value));
+      CHECK(int64_t(0x00000000000000FF) == (etl::lsb_mask<int64_t,  8>::value));
       CHECK(int64_t(0x000000000000FFFF) == (etl::lsb_mask<int64_t, 16>::value));
       CHECK(int64_t(0x0000000000FFFFFF) == (etl::lsb_mask<int64_t, 24>::value));
       CHECK(int64_t(0x00000000FFFFFFFF) == (etl::lsb_mask<int64_t, 32>::value));
@@ -2598,15 +2598,15 @@ namespace
     //*************************************************************************
     TEST(test_make_lsb_mask_8_bit)
     {
-      ETL_CONSTEXPR14 int8_t mask0 = etl::make_lsb_mask<int8_t>(0);
-      ETL_CONSTEXPR14 int8_t mask1 = etl::make_lsb_mask<int8_t>(1);
-      ETL_CONSTEXPR14 int8_t mask2 = etl::make_lsb_mask<int8_t>(2);
-      ETL_CONSTEXPR14 int8_t mask3 = etl::make_lsb_mask<int8_t>(3);
-      ETL_CONSTEXPR14 int8_t mask4 = etl::make_lsb_mask<int8_t>(4);
-      ETL_CONSTEXPR14 int8_t mask5 = etl::make_lsb_mask<int8_t>(5);
-      ETL_CONSTEXPR14 int8_t mask6 = etl::make_lsb_mask<int8_t>(6);
-      ETL_CONSTEXPR14 int8_t mask7 = etl::make_lsb_mask<int8_t>(7);
-      ETL_CONSTEXPR14 int8_t mask8 = etl::make_lsb_mask<int8_t>(8);
+      ETL_CONSTEXPR int8_t mask0 = etl::make_lsb_mask<int8_t>(0);
+      ETL_CONSTEXPR int8_t mask1 = etl::make_lsb_mask<int8_t>(1);
+      ETL_CONSTEXPR int8_t mask2 = etl::make_lsb_mask<int8_t>(2);
+      ETL_CONSTEXPR int8_t mask3 = etl::make_lsb_mask<int8_t>(3);
+      ETL_CONSTEXPR int8_t mask4 = etl::make_lsb_mask<int8_t>(4);
+      ETL_CONSTEXPR int8_t mask5 = etl::make_lsb_mask<int8_t>(5);
+      ETL_CONSTEXPR int8_t mask6 = etl::make_lsb_mask<int8_t>(6);
+      ETL_CONSTEXPR int8_t mask7 = etl::make_lsb_mask<int8_t>(7);
+      ETL_CONSTEXPR int8_t mask8 = etl::make_lsb_mask<int8_t>(8);
 
       CHECK(int8_t(etl::b00000000) == mask0);
       CHECK(int8_t(etl::b00000001) == mask1);
@@ -2629,18 +2629,52 @@ namespace
       CHECK(int8_t(etl::b11111111) == etl::make_lsb_mask<int8_t>(8));
     }
 
+    //*************************************************************************
+    TEST(test_make_lsb_mask_template_nbits_8_bit)
+    {
+      ETL_CONSTEXPR int8_t mask0 = etl::make_lsb_mask<int8_t, 0>();
+      ETL_CONSTEXPR int8_t mask1 = etl::make_lsb_mask<int8_t, 1>();
+      ETL_CONSTEXPR int8_t mask2 = etl::make_lsb_mask<int8_t, 2>();
+      ETL_CONSTEXPR int8_t mask3 = etl::make_lsb_mask<int8_t, 3>();
+      ETL_CONSTEXPR int8_t mask4 = etl::make_lsb_mask<int8_t, 4>();
+      ETL_CONSTEXPR int8_t mask5 = etl::make_lsb_mask<int8_t, 5>();
+      ETL_CONSTEXPR int8_t mask6 = etl::make_lsb_mask<int8_t, 6>();
+      ETL_CONSTEXPR int8_t mask7 = etl::make_lsb_mask<int8_t, 7>();
+      ETL_CONSTEXPR int8_t mask8 = etl::make_lsb_mask<int8_t, 8>();
+
+      CHECK(int8_t(etl::b00000000) == mask0);
+      CHECK(int8_t(etl::b00000001) == mask1);
+      CHECK(int8_t(etl::b00000011) == mask2);
+      CHECK(int8_t(etl::b00000111) == mask3);
+      CHECK(int8_t(etl::b00001111) == mask4);
+      CHECK(int8_t(etl::b00011111) == mask5);
+      CHECK(int8_t(etl::b00111111) == mask6);
+      CHECK(int8_t(etl::b01111111) == mask7);
+      CHECK(int8_t(etl::b11111111) == mask8);
+
+      CHECK(int8_t(etl::b00000000) == (etl::make_lsb_mask<int8_t, 0>()));
+      CHECK(int8_t(etl::b00000001) == (etl::make_lsb_mask<int8_t, 1>()));
+      CHECK(int8_t(etl::b00000011) == (etl::make_lsb_mask<int8_t, 2>()));
+      CHECK(int8_t(etl::b00000111) == (etl::make_lsb_mask<int8_t, 3>()));
+      CHECK(int8_t(etl::b00001111) == (etl::make_lsb_mask<int8_t, 4>()));
+      CHECK(int8_t(etl::b00011111) == (etl::make_lsb_mask<int8_t, 5>()));
+      CHECK(int8_t(etl::b00111111) == (etl::make_lsb_mask<int8_t, 6>()));
+      CHECK(int8_t(etl::b01111111) == (etl::make_lsb_mask<int8_t, 7>()));
+      CHECK(int8_t(etl::b11111111) == (etl::make_lsb_mask<int8_t, 8>()));
+    }
+
     //*************************************************************************
     TEST(test_make_lsb_mask_64_bit)
     {
-      ETL_CONSTEXPR14 int64_t mask0 = etl::make_lsb_mask<int64_t>(0);
-      ETL_CONSTEXPR14 int64_t mask1 = etl::make_lsb_mask<int64_t>(8);
-      ETL_CONSTEXPR14 int64_t mask2 = etl::make_lsb_mask<int64_t>(16);
-      ETL_CONSTEXPR14 int64_t mask3 = etl::make_lsb_mask<int64_t>(24);
-      ETL_CONSTEXPR14 int64_t mask4 = etl::make_lsb_mask<int64_t>(32);
-      ETL_CONSTEXPR14 int64_t mask5 = etl::make_lsb_mask<int64_t>(40);
-      ETL_CONSTEXPR14 int64_t mask6 = etl::make_lsb_mask<int64_t>(48);
-      ETL_CONSTEXPR14 int64_t mask7 = etl::make_lsb_mask<int64_t>(56);
-      ETL_CONSTEXPR14 int64_t mask8 = etl::make_lsb_mask<int64_t>(64);
+      ETL_CONSTEXPR int64_t mask0 = etl::make_lsb_mask<int64_t>(0);
+      ETL_CONSTEXPR int64_t mask1 = etl::make_lsb_mask<int64_t>(8);
+      ETL_CONSTEXPR int64_t mask2 = etl::make_lsb_mask<int64_t>(16);
+      ETL_CONSTEXPR int64_t mask3 = etl::make_lsb_mask<int64_t>(24);
+      ETL_CONSTEXPR int64_t mask4 = etl::make_lsb_mask<int64_t>(32);
+      ETL_CONSTEXPR int64_t mask5 = etl::make_lsb_mask<int64_t>(40);
+      ETL_CONSTEXPR int64_t mask6 = etl::make_lsb_mask<int64_t>(48);
+      ETL_CONSTEXPR int64_t mask7 = etl::make_lsb_mask<int64_t>(56);
+      ETL_CONSTEXPR int64_t mask8 = etl::make_lsb_mask<int64_t>(64);
 
       CHECK_EQUAL(int64_t(0x0000000000000000), mask0);
       CHECK_EQUAL(int64_t(0x00000000000000FF), mask1);
@@ -2664,7 +2698,41 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_msb_mask_8_bit_8_bit)
+    TEST(test_make_lsb_mask_template_nbits_64_bit)
+    {
+      ETL_CONSTEXPR int64_t mask0 = etl::make_lsb_mask<int64_t,  0>();
+      ETL_CONSTEXPR int64_t mask1 = etl::make_lsb_mask<int64_t,  8>();
+      ETL_CONSTEXPR int64_t mask2 = etl::make_lsb_mask<int64_t, 16>();
+      ETL_CONSTEXPR int64_t mask3 = etl::make_lsb_mask<int64_t, 24>();
+      ETL_CONSTEXPR int64_t mask4 = etl::make_lsb_mask<int64_t, 32>();
+      ETL_CONSTEXPR int64_t mask5 = etl::make_lsb_mask<int64_t, 40>();
+      ETL_CONSTEXPR int64_t mask6 = etl::make_lsb_mask<int64_t, 48>();
+      ETL_CONSTEXPR int64_t mask7 = etl::make_lsb_mask<int64_t, 56>();
+      ETL_CONSTEXPR int64_t mask8 = etl::make_lsb_mask<int64_t, 64>();
+
+      CHECK_EQUAL(int64_t(0x0000000000000000), mask0);
+      CHECK_EQUAL(int64_t(0x00000000000000FF), mask1);
+      CHECK_EQUAL(int64_t(0x000000000000FFFF), mask2);
+      CHECK_EQUAL(int64_t(0x0000000000FFFFFF), mask3);
+      CHECK_EQUAL(int64_t(0x00000000FFFFFFFF), mask4);
+      CHECK_EQUAL(int64_t(0x000000FFFFFFFFFF), mask5);
+      CHECK_EQUAL(int64_t(0x0000FFFFFFFFFFFF), mask6);
+      CHECK_EQUAL(int64_t(0x00FFFFFFFFFFFFFF), mask7);
+      CHECK_EQUAL(int64_t(0xFFFFFFFFFFFFFFFF), mask8);
+
+      CHECK_EQUAL(int64_t(0x0000000000000000), (etl::make_lsb_mask<int64_t,  0>()));
+      CHECK_EQUAL(int64_t(0x00000000000000FF), (etl::make_lsb_mask<int64_t,  8>()));
+      CHECK_EQUAL(int64_t(0x000000000000FFFF), (etl::make_lsb_mask<int64_t, 16>()));
+      CHECK_EQUAL(int64_t(0x0000000000FFFFFF), (etl::make_lsb_mask<int64_t, 24>()));
+      CHECK_EQUAL(int64_t(0x00000000FFFFFFFF), (etl::make_lsb_mask<int64_t, 32>()));
+      CHECK_EQUAL(int64_t(0x000000FFFFFFFFFF), (etl::make_lsb_mask<int64_t, 40>()));
+      CHECK_EQUAL(int64_t(0x0000FFFFFFFFFFFF), (etl::make_lsb_mask<int64_t, 48>()));
+      CHECK_EQUAL(int64_t(0x00FFFFFFFFFFFFFF), (etl::make_lsb_mask<int64_t, 56>()));
+      CHECK_EQUAL(int64_t(0xFFFFFFFFFFFFFFFF), (etl::make_lsb_mask<int64_t, 64>()));
+    }
+
+    //*************************************************************************
+    TEST(test_msb_mask_8_bit)
     {
       CHECK(int8_t(etl::b00000000) == (etl::msb_mask<int8_t, 0>::value));
       CHECK(int8_t(etl::b10000000) == (etl::msb_mask<int8_t, 1>::value));
@@ -2680,8 +2748,8 @@ namespace
     //*************************************************************************
     TEST(test_msb_mask_64_bit)
     {
-      CHECK(int64_t(0x0000000000000000) == (etl::msb_mask<int64_t, 0>::value));
-      CHECK(int64_t(0xFF00000000000000) == (etl::msb_mask<int64_t, 8>::value));
+      CHECK(int64_t(0x0000000000000000) == (etl::msb_mask<int64_t,  0>::value));
+      CHECK(int64_t(0xFF00000000000000) == (etl::msb_mask<int64_t,  8>::value));
       CHECK(int64_t(0xFFFF000000000000) == (etl::msb_mask<int64_t, 16>::value));
       CHECK(int64_t(0xFFFFFF0000000000) == (etl::msb_mask<int64_t, 24>::value));
       CHECK(int64_t(0xFFFFFFFF00000000) == (etl::msb_mask<int64_t, 32>::value));
@@ -2694,15 +2762,15 @@ namespace
     //*************************************************************************
     TEST(test_make_msb_mask_8_bit)
     {
-      ETL_CONSTEXPR14 int8_t mask0 = etl::make_msb_mask<int8_t>(0);
-      ETL_CONSTEXPR14 int8_t mask1 = etl::make_msb_mask<int8_t>(1);
-      ETL_CONSTEXPR14 int8_t mask2 = etl::make_msb_mask<int8_t>(2);
-      ETL_CONSTEXPR14 int8_t mask3 = etl::make_msb_mask<int8_t>(3);
-      ETL_CONSTEXPR14 int8_t mask4 = etl::make_msb_mask<int8_t>(4);
-      ETL_CONSTEXPR14 int8_t mask5 = etl::make_msb_mask<int8_t>(5);
-      ETL_CONSTEXPR14 int8_t mask6 = etl::make_msb_mask<int8_t>(6);
-      ETL_CONSTEXPR14 int8_t mask7 = etl::make_msb_mask<int8_t>(7);
-      ETL_CONSTEXPR14 int8_t mask8 = etl::make_msb_mask<int8_t>(8);
+      ETL_CONSTEXPR int8_t mask0 = etl::make_msb_mask<int8_t>(0);
+      ETL_CONSTEXPR int8_t mask1 = etl::make_msb_mask<int8_t>(1);
+      ETL_CONSTEXPR int8_t mask2 = etl::make_msb_mask<int8_t>(2);
+      ETL_CONSTEXPR int8_t mask3 = etl::make_msb_mask<int8_t>(3);
+      ETL_CONSTEXPR int8_t mask4 = etl::make_msb_mask<int8_t>(4);
+      ETL_CONSTEXPR int8_t mask5 = etl::make_msb_mask<int8_t>(5);
+      ETL_CONSTEXPR int8_t mask6 = etl::make_msb_mask<int8_t>(6);
+      ETL_CONSTEXPR int8_t mask7 = etl::make_msb_mask<int8_t>(7);
+      ETL_CONSTEXPR int8_t mask8 = etl::make_msb_mask<int8_t>(8);
 
       CHECK(int8_t(etl::b00000000) == mask0);
       CHECK(int8_t(etl::b10000000) == mask1);
@@ -2725,18 +2793,52 @@ namespace
       CHECK(int8_t(etl::b11111111) == etl::make_msb_mask<int8_t>(8));
     }
 
+    //*************************************************************************
+    TEST(test_make_msb_mask_template_nbits_8_bit)
+    {
+      ETL_CONSTEXPR int8_t mask0 = etl::make_msb_mask<int8_t, 0>();
+      ETL_CONSTEXPR int8_t mask1 = etl::make_msb_mask<int8_t, 1>();
+      ETL_CONSTEXPR int8_t mask2 = etl::make_msb_mask<int8_t, 2>();
+      ETL_CONSTEXPR int8_t mask3 = etl::make_msb_mask<int8_t, 3>();
+      ETL_CONSTEXPR int8_t mask4 = etl::make_msb_mask<int8_t, 4>();
+      ETL_CONSTEXPR int8_t mask5 = etl::make_msb_mask<int8_t, 5>();
+      ETL_CONSTEXPR int8_t mask6 = etl::make_msb_mask<int8_t, 6>();
+      ETL_CONSTEXPR int8_t mask7 = etl::make_msb_mask<int8_t, 7>();
+      ETL_CONSTEXPR int8_t mask8 = etl::make_msb_mask<int8_t, 8>();
+
+      CHECK(int8_t(etl::b00000000) == mask0);
+      CHECK(int8_t(etl::b10000000) == mask1);
+      CHECK(int8_t(etl::b11000000) == mask2);
+      CHECK(int8_t(etl::b11100000) == mask3);
+      CHECK(int8_t(etl::b11110000) == mask4);
+      CHECK(int8_t(etl::b11111000) == mask5);
+      CHECK(int8_t(etl::b11111100) == mask6);
+      CHECK(int8_t(etl::b11111110) == mask7);
+      CHECK(int8_t(etl::b11111111) == mask8);
+
+      CHECK(int8_t(etl::b00000000) == (etl::make_msb_mask<int8_t, 0>()));
+      CHECK(int8_t(etl::b10000000) == (etl::make_msb_mask<int8_t, 1>()));
+      CHECK(int8_t(etl::b11000000) == (etl::make_msb_mask<int8_t, 2>()));
+      CHECK(int8_t(etl::b11100000) == (etl::make_msb_mask<int8_t, 3>()));
+      CHECK(int8_t(etl::b11110000) == (etl::make_msb_mask<int8_t, 4>()));
+      CHECK(int8_t(etl::b11111000) == (etl::make_msb_mask<int8_t, 5>()));
+      CHECK(int8_t(etl::b11111100) == (etl::make_msb_mask<int8_t, 6>()));
+      CHECK(int8_t(etl::b11111110) == (etl::make_msb_mask<int8_t, 7>()));
+      CHECK(int8_t(etl::b11111111) == (etl::make_msb_mask<int8_t, 8>()));
+    }
+
     //*************************************************************************
     TEST(test_make_msb_mask_64_bit)
     {
-      ETL_CONSTEXPR14 int64_t mask0 = etl::make_msb_mask<int64_t>(0);
-      ETL_CONSTEXPR14 int64_t mask1 = etl::make_msb_mask<int64_t>(8);
-      ETL_CONSTEXPR14 int64_t mask2 = etl::make_msb_mask<int64_t>(16);
-      ETL_CONSTEXPR14 int64_t mask3 = etl::make_msb_mask<int64_t>(24);
-      ETL_CONSTEXPR14 int64_t mask4 = etl::make_msb_mask<int64_t>(32);
-      ETL_CONSTEXPR14 int64_t mask5 = etl::make_msb_mask<int64_t>(40);
-      ETL_CONSTEXPR14 int64_t mask6 = etl::make_msb_mask<int64_t>(48);
-      ETL_CONSTEXPR14 int64_t mask7 = etl::make_msb_mask<int64_t>(56);
-      ETL_CONSTEXPR14 int64_t mask8 = etl::make_msb_mask<int64_t>(64);
+      ETL_CONSTEXPR int64_t mask0 = etl::make_msb_mask<int64_t>(0);
+      ETL_CONSTEXPR int64_t mask1 = etl::make_msb_mask<int64_t>(8);
+      ETL_CONSTEXPR int64_t mask2 = etl::make_msb_mask<int64_t>(16);
+      ETL_CONSTEXPR int64_t mask3 = etl::make_msb_mask<int64_t>(24);
+      ETL_CONSTEXPR int64_t mask4 = etl::make_msb_mask<int64_t>(32);
+      ETL_CONSTEXPR int64_t mask5 = etl::make_msb_mask<int64_t>(40);
+      ETL_CONSTEXPR int64_t mask6 = etl::make_msb_mask<int64_t>(48);
+      ETL_CONSTEXPR int64_t mask7 = etl::make_msb_mask<int64_t>(56);
+      ETL_CONSTEXPR int64_t mask8 = etl::make_msb_mask<int64_t>(64);
 
       CHECK_EQUAL(int64_t(0x0000000000000000), mask0);
       CHECK_EQUAL(int64_t(0xFF00000000000000), mask1);
@@ -2758,6 +2860,40 @@ namespace
       CHECK_EQUAL(int64_t(0xFFFFFFFFFFFFFF00), etl::make_msb_mask<int64_t>(56));
       CHECK_EQUAL(int64_t(0xFFFFFFFFFFFFFFFF), etl::make_msb_mask<int64_t>(64));
     }
+
+    //*************************************************************************
+    TEST(test_make_msb_mask_template_nbits_64_bit)
+    {
+      ETL_CONSTEXPR int64_t mask0 = etl::make_msb_mask<int64_t,  0>();
+      ETL_CONSTEXPR int64_t mask1 = etl::make_msb_mask<int64_t,  8>();
+      ETL_CONSTEXPR int64_t mask2 = etl::make_msb_mask<int64_t, 16>();
+      ETL_CONSTEXPR int64_t mask3 = etl::make_msb_mask<int64_t, 24>();
+      ETL_CONSTEXPR int64_t mask4 = etl::make_msb_mask<int64_t, 32>();
+      ETL_CONSTEXPR int64_t mask5 = etl::make_msb_mask<int64_t, 40>();
+      ETL_CONSTEXPR int64_t mask6 = etl::make_msb_mask<int64_t, 48>();
+      ETL_CONSTEXPR int64_t mask7 = etl::make_msb_mask<int64_t, 56>();
+      ETL_CONSTEXPR int64_t mask8 = etl::make_msb_mask<int64_t, 64>();
+
+      CHECK_EQUAL(int64_t(0x0000000000000000), mask0);
+      CHECK_EQUAL(int64_t(0xFF00000000000000), mask1);
+      CHECK_EQUAL(int64_t(0xFFFF000000000000), mask2);
+      CHECK_EQUAL(int64_t(0xFFFFFF0000000000), mask3);
+      CHECK_EQUAL(int64_t(0xFFFFFFFF00000000), mask4);
+      CHECK_EQUAL(int64_t(0xFFFFFFFFFF000000), mask5);
+      CHECK_EQUAL(int64_t(0xFFFFFFFFFFFF0000), mask6);
+      CHECK_EQUAL(int64_t(0xFFFFFFFFFFFFFF00), mask7);
+      CHECK_EQUAL(int64_t(0xFFFFFFFFFFFFFFFF), mask8);
+
+      CHECK_EQUAL(int64_t(0x0000000000000000), (etl::make_msb_mask<int64_t,  0>()));
+      CHECK_EQUAL(int64_t(0xFF00000000000000), (etl::make_msb_mask<int64_t,  8>()));
+      CHECK_EQUAL(int64_t(0xFFFF000000000000), (etl::make_msb_mask<int64_t, 16>()));
+      CHECK_EQUAL(int64_t(0xFFFFFF0000000000), (etl::make_msb_mask<int64_t, 24>()));
+      CHECK_EQUAL(int64_t(0xFFFFFFFF00000000), (etl::make_msb_mask<int64_t, 32>()));
+      CHECK_EQUAL(int64_t(0xFFFFFFFFFF000000), (etl::make_msb_mask<int64_t, 40>()));
+      CHECK_EQUAL(int64_t(0xFFFFFFFFFFFF0000), (etl::make_msb_mask<int64_t, 48>()));
+      CHECK_EQUAL(int64_t(0xFFFFFFFFFFFFFF00), (etl::make_msb_mask<int64_t, 56>()));
+      CHECK_EQUAL(int64_t(0xFFFFFFFFFFFFFFFF), (etl::make_msb_mask<int64_t, 64>()));
+    }
   };
 }
 

From 11491333844ef7a7b39e1e047a9793a94040881a Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 4 Dec 2023 08:37:42 +0000
Subject: [PATCH 007/131] Updated script text

---
 test/run-syntax-checks.sh | 2 +-
 test/run-tests.sh         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/run-syntax-checks.sh b/test/run-syntax-checks.sh
index 76b5a7eb..2e62336e 100644
--- a/test/run-syntax-checks.sh
+++ b/test/run-syntax-checks.sh
@@ -32,7 +32,7 @@ PrintHeader()
 	echo " Configuration     : $configuration_name                                    " | tee -a log.txt
 	echo " Compiler          : $compiler                                              " | tee -a log.txt
 	echo " Language standard : C++$cxx_standard                                       " | tee -a log.txt
-	echo " ETL Version       : $etl_version                                           " | tee -a log.txt
+	echo " ETL version       : $etl_version                                           " | tee -a log.txt
 	echo " Git branch        : $(ParseGitBranch)                                      " | tee -a log.txt
 	echo " Processes         : ${CMAKE_BUILD_PARALLEL_LEVEL}                          " | tee -a log.txt
 	echo "============================================================================" | tee -a log.txt
diff --git a/test/run-tests.sh b/test/run-tests.sh
index 0fa5d720..956d9838 100644
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -43,7 +43,7 @@ PrintHeader()
 	echo " Language standard : C++$cxx_standard                                       " | tee -a log.txt
     echo " Optimisation      : $opt                                                   " | tee -a log.txt
 	echo " Sanitizer         : $sanitize                                              " | tee -a log.txt
-	echo " ETL Version       : $etl_version                                           " | tee -a log.txt
+	echo " ETL version       : $etl_version                                           " | tee -a log.txt
 	echo " Git branch        : $(ParseGitBranch)                                      " | tee -a log.txt
 	echo " Processes         : ${CMAKE_BUILD_PARALLEL_LEVEL}                          " | tee -a log.txt
 	echo "============================================================================" | tee -a log.txt

From 305f34fbede50ffa2927c198ca27da6b230a66ba Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 4 Dec 2023 08:37:59 +0000
Subject: [PATCH 008/131] Work in progress for etl::bitset::extract

---
 include/etl/private/bitset_new.h              | 100 +++-
 test/test_bitset_new_default_element_type.cpp |  82 ++-
 ...itset_new_explicit_single_element_type.cpp | 498 ++++++++++++++++--
 ...st_bitset_new_ext_default_element_type.cpp | 437 ++++++++++++++-
 ...t_new_ext_explicit_single_element_type.cpp | 441 +++++++++++++++-
 5 files changed, 1432 insertions(+), 126 deletions(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 65128c75..6894feb9 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -418,7 +418,7 @@ namespace etl
       // Extract the first element, if partially filled.
       if (active_bits_in_msb < Bits_Per_Element)
       {
-        element_type mask = ~(~element_type(0) << active_bits_in_msb);
+        element_type mask = etl::make_lsb_mask< element_type>(active_bits_in_msb);
         value = pbuffer[element_index] & mask;
         length -= active_bits_in_msb;
         if (length >= Bits_Per_Element)
@@ -444,7 +444,7 @@ namespace etl
       if (length != 0)
       {
         value = value << length;
-        element_type mask = ~(~element_type(0) << length);
+        element_type mask = etl::make_lsb_mask< element_type>(length);
         value |= (pbuffer[element_index] >> (Bits_Per_Element - length)) & mask;
       }
 
@@ -468,7 +468,7 @@ namespace etl
       // Is the value contained within one element?
       if (Msb_Element_Index == Lsb_Element_Index)
       {
-        const unsigned_t Mask = ~(~0 << length);
+        const unsigned_t Mask  = etl::make_lsb_mask< unsigned_t>(length);
         const unsigned_t Shift = position % Bits_Per_Element;
 
         value = static_cast<unsigned_t>(pbuffer[Msb_Element_Index] >> Shift) & Mask;
@@ -498,7 +498,7 @@ namespace etl
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
       const int        Element_Index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
-      const unsigned_t Mask          = ~(~0 << Length);
+      const unsigned_t Mask          = etl::lsb_mask<unsigned_t, Length>::value;
       const unsigned_t Shift         = Position % Bits_Per_Element;
       
       return  static_cast<unsigned_t>(pbuffer[Element_Index] >> Shift) & Mask;
@@ -511,9 +511,7 @@ namespace etl
     ETL_CONSTEXPR14
     typename etl::enable_if<!value_is_in_one_element<Position, Length, Bits_Per_Element>::value, typename etl::make_unsigned<T>::type>::type
       extract_from_buffer(const_pointer pbuffer) const
-    {
-      typedef typename etl::make_unsigned<T>::type unsigned_t;
-       
+    {      
       const int Msb_Element_Index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
 
       // Start with index of the element containing the msb.
@@ -978,7 +976,7 @@ namespace etl
   /// Specialisation that uses a single element if the element type is the 
   /// same size as the number of active bits.
   //***************************************************************************
-  template <size_t   Active_Bits, typename TElement>
+  template <size_t Active_Bits, typename TElement>
   class bitset<Active_Bits, TElement, true> : public bitset_constants<>
   {
   public:
@@ -1413,10 +1411,19 @@ namespace etl
       ETL_ASSERT_OR_RETURN_VALUE(length <= etl::integral_limits<T>::bits, ETL_ERROR(bitset_overflow), 0);
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits,      ETL_ERROR(bitset_overflow), 0);
 
-      element_type mask = (~(~0u << length) << position);
-      T value((buffer & mask) >> position);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
 
-      return value;
+      const unsigned_t Mask  = etl::make_lsb_mask< unsigned_t>(length);
+      const unsigned_t Shift = position % Bits_Per_Element;
+
+      unsigned_t value = static_cast<unsigned_t>(buffer >> Shift) & Mask;
+
+      if ((length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T>(value, length);
+      }
+
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
@@ -1430,10 +1437,19 @@ namespace etl
       ETL_STATIC_ASSERT(Length <= etl::integral_limits<T>::bits, "Length is larger that the required type");
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits,      "Position/Length overflows bitset");
       
-      element_type mask = (~(~0u << Length) << Position);
-      T value((buffer & mask) >> Position);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
 
-      return value;
+      const unsigned_t Mask  = etl::make_lsb_mask<unsigned_t, Length>();
+      const unsigned_t Shift = Position % Bits_Per_Element;
+
+      unsigned_t value = static_cast<unsigned_t>(buffer >> Shift) & Mask;
+
+      if ETL_IF_CONSTEXPR((Length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T, Length>(value);
+      }
+
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
@@ -2213,7 +2229,7 @@ namespace etl
         value = etl::sign_extend<T>(value, length);
       }
 
-      return value;
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
@@ -2235,7 +2251,7 @@ namespace etl
         value = etl::sign_extend<T, Length>(value);
       }
 
-      return value;
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
@@ -3202,10 +3218,19 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
 
-      element_type mask = (~(~0u << length) << position);
-      T v((*pbuffer & mask) >> position);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
 
-      return v;
+      const unsigned_t Mask = etl::make_lsb_mask<unsigned_t>(length);
+      const unsigned_t Shift = position % Bits_Per_Element;
+
+      unsigned_t value = static_cast<unsigned_t>(*pbuffer >> Shift) & Mask;
+
+      if ((length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T>(value, length);
+      }
+
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
@@ -3218,10 +3243,19 @@ namespace etl
     {
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
 
-      element_type mask = (~(~0u << Length) << Position);
-      T v((*pbuffer & mask) >> Position);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
 
-      return v;
+      const unsigned_t Mask = etl::make_lsb_mask<unsigned_t, Length>();
+      const unsigned_t Shift = Position % Bits_Per_Element;
+
+      unsigned_t value = static_cast<unsigned_t>(*pbuffer >> Shift) & Mask;
+
+      if ETL_IF_CONSTEXPR((Length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T, Length>(value);
+      }
+
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
@@ -3995,7 +4029,16 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
 
-      return ibitset.template extract_from_buffer<T>(pbuffer, position, length);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value = ibitset.template extract_from_buffer<T>(pbuffer, position, length);
+
+      if ((length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T>(value, length);
+      }
+
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
@@ -4008,7 +4051,16 @@ namespace etl
     {
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
 
-      return ibitset.template extract_from_buffer<T, Position, Length>(pbuffer);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value = ibitset.template extract_from_buffer<T, Position, Length>(pbuffer);
+
+      if ETL_IF_CONSTEXPR((Length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T, Length>(value);
+      }
+
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
diff --git a/test/test_bitset_new_default_element_type.cpp b/test/test_bitset_new_default_element_type.cpp
index a0980425..266243f7 100644
--- a/test/test_bitset_new_default_element_type.cpp
+++ b/test/test_bitset_new_default_element_type.cpp
@@ -2177,18 +2177,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      auto v = b.extract<int8_t>(1, 6);
-
-      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>(0, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>(1, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>(2, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>(3, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>(4, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>(5, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>(6, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>(7, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>(8, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>(9, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>( 9, 6)));
       CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t>(10, 6)));
       CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t>(11, 6)));
       CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t>(12, 6)));
@@ -2216,16 +2214,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t, 0, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t, 1, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t, 2, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t, 3, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t, 4, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t, 5, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t, 6, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t, 7, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t, 8, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t, 9, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t,  9, 6>()));
       CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 6>()));
       CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t, 11, 6>()));
       CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t, 12, 6>()));
@@ -2512,16 +2510,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>(0, 16));
-      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>(1, 16));
-      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>(2, 16));
-      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>(3, 16));
-      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>(4, 16));
-      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>(5, 16));
-      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>(6, 16));
-      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>(7, 16));
-      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>(8, 16));
-      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>(9, 16));
+      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>( 0, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>( 1, 16));
+      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>( 2, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>( 3, 16));
+      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>( 4, 16));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>( 5, 16));
+      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>( 6, 16));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>( 7, 16));
+      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>( 8, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>( 9, 16));
       CHECK_EQUAL_HEX(int16_t(0x8D15), b.extract<int16_t>(10, 16));
       CHECK_EQUAL_HEX(int16_t(0x468A), b.extract<int16_t>(11, 16));
       CHECK_EQUAL_HEX(int16_t(0x2345), b.extract<int16_t>(12, 16));
@@ -2539,16 +2537,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t, 0, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t, 1, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t, 2, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t, 3, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t, 4, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t, 5, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t, 6, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t, 7, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t, 8, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t, 9, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t,  9, 16>()));
       CHECK_EQUAL_HEX(int16_t(0x8D15), (b.extract<int16_t, 10, 16>()));
       CHECK_EQUAL_HEX(int16_t(0x468A), (b.extract<int16_t, 11, 16>()));
       CHECK_EQUAL_HEX(int16_t(0x2345), (b.extract<int16_t, 12, 16>()));
diff --git a/test/test_bitset_new_explicit_single_element_type.cpp b/test/test_bitset_new_explicit_single_element_type.cpp
index 8e161389..ad8f8fe1 100644
--- a/test/test_bitset_new_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_explicit_single_element_type.cpp
@@ -1586,36 +1586,188 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
 
+    //*************************************************************************
+    TEST(test_extract_6_bit_uint8_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t>(10, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t>(11, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t>(12, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t>(13, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(14, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t>(15, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t>(16, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t>(17, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t>(18, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t>(19, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t>(20, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(21, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t>(22, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t>(23, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t>(24, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t>(25, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<uint8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_uint8_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //uint8_t v1 = b.extract<uint8_t, 26, 7>();
+      //uint8_t v1 = b.extract<uint8_t, 27, 6>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t>(10, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t>(11, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t>(12, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t>(13, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(14, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t>(15, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t>(16, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t>(17, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t>(18, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t>(19, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t>(20, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(21, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t>(22, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t>(23, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t>(24, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t>(25, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<int8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 26, 7>();
+      //int8_t v1 = b.extract<int8_t, 27, 6>();
+    }
+
     //*************************************************************************
     TEST(test_extract_uint8_t_with_run_time_parameters)
     {
       ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
 
-      CHECK_EQUAL(0x78, b.extract<uint8_t>(0, 8));
-      CHECK_EQUAL(0x3C, b.extract<uint8_t>(1, 8));
-      CHECK_EQUAL(0x9E, b.extract<uint8_t>(2, 8));
-      CHECK_EQUAL(0xCF, b.extract<uint8_t>(3, 8));
-      CHECK_EQUAL(0x67, b.extract<uint8_t>(4, 8));
-      CHECK_EQUAL(0xB3, b.extract<uint8_t>(5, 8));
-      CHECK_EQUAL(0x59, b.extract<uint8_t>(6, 8));
-      CHECK_EQUAL(0xAC, b.extract<uint8_t>(7, 8));
-      CHECK_EQUAL(0x56, b.extract<uint8_t>(8, 8));
-      CHECK_EQUAL(0x2B, b.extract<uint8_t>(9, 8));
-      CHECK_EQUAL(0x15, b.extract<uint8_t>(10, 8));
-      CHECK_EQUAL(0x8A, b.extract<uint8_t>(11, 8));
-      CHECK_EQUAL(0x45, b.extract<uint8_t>(12, 8));
-      CHECK_EQUAL(0xA2, b.extract<uint8_t>(13, 8));
-      CHECK_EQUAL(0xD1, b.extract<uint8_t>(14, 8));
-      CHECK_EQUAL(0x68, b.extract<uint8_t>(15, 8));
-      CHECK_EQUAL(0x34, b.extract<uint8_t>(16, 8));
-      CHECK_EQUAL(0x1A, b.extract<uint8_t>(17, 8));
-      CHECK_EQUAL(0x8D, b.extract<uint8_t>(18, 8));
-      CHECK_EQUAL(0x46, b.extract<uint8_t>(19, 8));
-      CHECK_EQUAL(0x23, b.extract<uint8_t>(20, 8));
-      CHECK_EQUAL(0x91, b.extract<uint8_t>(21, 8));
-      CHECK_EQUAL(0x48, b.extract<uint8_t>(22, 8));
-      CHECK_EQUAL(0x24, b.extract<uint8_t>(23, 8));
-      CHECK_EQUAL(0x12, b.extract<uint8_t>(24, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x78), b.extract<uint8_t>( 0, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), b.extract<uint8_t>( 1, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), b.extract<uint8_t>( 2, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), b.extract<uint8_t>( 3, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x67), b.extract<uint8_t>( 4, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), b.extract<uint8_t>( 5, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x59), b.extract<uint8_t>( 6, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), b.extract<uint8_t>( 7, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x56), b.extract<uint8_t>( 8, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), b.extract<uint8_t>( 9, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x15), b.extract<uint8_t>(10, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), b.extract<uint8_t>(11, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x45), b.extract<uint8_t>(12, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), b.extract<uint8_t>(13, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), b.extract<uint8_t>(14, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x68), b.extract<uint8_t>(15, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x34), b.extract<uint8_t>(16, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), b.extract<uint8_t>(17, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), b.extract<uint8_t>(18, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x46), b.extract<uint8_t>(19, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x23), b.extract<uint8_t>(20, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x91), b.extract<uint8_t>(21, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x48), b.extract<uint8_t>(22, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
+
+      CHECK_THROW(b.extract<uint8_t>(24, 9), etl::bitset_overflow);
       CHECK_THROW(b.extract<uint8_t>(25, 8), etl::bitset_overflow);
     }
 
@@ -1624,35 +1776,277 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
 
-      CHECK_EQUAL(0x78, (b.extract<uint8_t, 0, 8>()));
-      CHECK_EQUAL(0x3C, (b.extract<uint8_t, 1, 8>()));
-      CHECK_EQUAL(0x9E, (b.extract<uint8_t, 2, 8>()));
-      CHECK_EQUAL(0xCF, (b.extract<uint8_t, 3, 8>()));
-      CHECK_EQUAL(0x67, (b.extract<uint8_t, 4, 8>()));
-      CHECK_EQUAL(0xB3, (b.extract<uint8_t, 5, 8>()));
-      CHECK_EQUAL(0x59, (b.extract<uint8_t, 6, 8>()));
-      CHECK_EQUAL(0xAC, (b.extract<uint8_t, 7, 8>()));
-      CHECK_EQUAL(0x56, (b.extract<uint8_t, 8, 8>()));
-      CHECK_EQUAL(0x2B, (b.extract<uint8_t, 9, 8>()));
-      CHECK_EQUAL(0x15, (b.extract<uint8_t, 10, 8>()));
-      CHECK_EQUAL(0x8A, (b.extract<uint8_t, 11, 8>()));
-      CHECK_EQUAL(0x45, (b.extract<uint8_t, 12, 8>()));
-      CHECK_EQUAL(0xA2, (b.extract<uint8_t, 13, 8>()));
-      CHECK_EQUAL(0xD1, (b.extract<uint8_t, 14, 8>()));
-      CHECK_EQUAL(0x68, (b.extract<uint8_t, 15, 8>()));
-      CHECK_EQUAL(0x34, (b.extract<uint8_t, 16, 8>()));
-      CHECK_EQUAL(0x1A, (b.extract<uint8_t, 17, 8>()));
-      CHECK_EQUAL(0x8D, (b.extract<uint8_t, 18, 8>()));
-      CHECK_EQUAL(0x46, (b.extract<uint8_t, 19, 8>()));
-      CHECK_EQUAL(0x23, (b.extract<uint8_t, 20, 8>()));
-      CHECK_EQUAL(0x91, (b.extract<uint8_t, 21, 8>()));
-      CHECK_EQUAL(0x48, (b.extract<uint8_t, 22, 8>()));
-      CHECK_EQUAL(0x24, (b.extract<uint8_t, 23, 8>()));
-      CHECK_EQUAL(0x12, (b.extract<uint8_t, 24, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x78), (b.extract<uint8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), (b.extract<uint8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), (b.extract<uint8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x67), (b.extract<uint8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), (b.extract<uint8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x59), (b.extract<uint8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), (b.extract<uint8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x56), (b.extract<uint8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), (b.extract<uint8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x45), (b.extract<uint8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), (b.extract<uint8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), (b.extract<uint8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x68), (b.extract<uint8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), (b.extract<uint8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x46), (b.extract<uint8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x91), (b.extract<uint8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x48), (b.extract<uint8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
 
       // The lines below should static assert.
-      //uint8_t v = b.extract<uint8_t, 25, 8>();
-      //uint8_t v = b.extract<uint8_t, 25, 9>();
+      //uint8_t v1 = b.extract<uint8_t, 24, 9>();
+      //uint8_t v2 = b.extract<uint8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), b.extract<int8_t>( 0, 8));
+      CHECK_EQUAL_HEX(int8_t(0x3C), b.extract<int8_t>( 1, 8));
+      CHECK_EQUAL_HEX(int8_t(0x9E), b.extract<int8_t>( 2, 8));
+      CHECK_EQUAL_HEX(int8_t(0xCF), b.extract<int8_t>( 3, 8));
+      CHECK_EQUAL_HEX(int8_t(0x67), b.extract<int8_t>( 4, 8));
+      CHECK_EQUAL_HEX(int8_t(0xB3), b.extract<int8_t>( 5, 8));
+      CHECK_EQUAL_HEX(int8_t(0x59), b.extract<int8_t>( 6, 8));
+      CHECK_EQUAL_HEX(int8_t(0xAC), b.extract<int8_t>( 7, 8));
+      CHECK_EQUAL_HEX(int8_t(0x56), b.extract<int8_t>( 8, 8));
+      CHECK_EQUAL_HEX(int8_t(0x2B), b.extract<int8_t>( 9, 8));
+      CHECK_EQUAL_HEX(int8_t(0x15), b.extract<int8_t>(10, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8A), b.extract<int8_t>(11, 8));
+      CHECK_EQUAL_HEX(int8_t(0x45), b.extract<int8_t>(12, 8));
+      CHECK_EQUAL_HEX(int8_t(0xA2), b.extract<int8_t>(13, 8));
+      CHECK_EQUAL_HEX(int8_t(0xD1), b.extract<int8_t>(14, 8));
+      CHECK_EQUAL_HEX(int8_t(0x68), b.extract<int8_t>(15, 8));
+      CHECK_EQUAL_HEX(int8_t(0x34), b.extract<int8_t>(16, 8));
+      CHECK_EQUAL_HEX(int8_t(0x1A), b.extract<int8_t>(17, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8D), b.extract<int8_t>(18, 8));
+      CHECK_EQUAL_HEX(int8_t(0x46), b.extract<int8_t>(19, 8));
+      CHECK_EQUAL_HEX(int8_t(0x23), b.extract<int8_t>(20, 8));
+      CHECK_EQUAL_HEX(int8_t(0x91), b.extract<int8_t>(21, 8));
+      CHECK_EQUAL_HEX(int8_t(0x48), b.extract<int8_t>(22, 8));
+      CHECK_EQUAL_HEX(int8_t(0x24), b.extract<int8_t>(23, 8));
+      CHECK_EQUAL_HEX(int8_t(0x12), b.extract<int8_t>(24, 8));
+
+      CHECK_THROW(b.extract<int8_t>(24, 9), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(25, 8), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), (b.extract<int8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x3C), (b.extract<int8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x9E), (b.extract<int8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xCF), (b.extract<int8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x67), (b.extract<int8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xB3), (b.extract<int8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x59), (b.extract<int8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xAC), (b.extract<int8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x56), (b.extract<int8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x2B), (b.extract<int8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8A), (b.extract<int8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x45), (b.extract<int8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xA2), (b.extract<int8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xD1), (b.extract<int8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x68), (b.extract<int8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x34), (b.extract<int8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8D), (b.extract<int8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x46), (b.extract<int8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x23), (b.extract<int8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x91), (b.extract<int8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x48), (b.extract<int8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x24), (b.extract<int8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 8>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 24, 9>();
+      //int8_t v2 = b.extract<int8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), b.extract<uint16_t>( 0, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), b.extract<uint16_t>( 1, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), b.extract<uint16_t>( 3, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), b.extract<uint16_t>( 4, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), b.extract<uint16_t>( 5, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), b.extract<uint16_t>( 6, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), b.extract<uint16_t>( 7, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), b.extract<uint16_t>( 8, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), b.extract<uint16_t>(10, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), b.extract<uint16_t>(11, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), b.extract<uint16_t>(12, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), b.extract<uint16_t>(13, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), b.extract<uint16_t>(14, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), b.extract<uint16_t>(15, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), b.extract<uint16_t>(17, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), b.extract<uint16_t>(18, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), b.extract<uint16_t>(19, 13));
+
+      CHECK_THROW(b.extract<uint16_t>(19, 14), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(20, 13), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), (b.extract<uint16_t,  0, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), (b.extract<uint16_t,  1, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), (b.extract<uint16_t,  3, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), (b.extract<uint16_t,  4, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), (b.extract<uint16_t,  5, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), (b.extract<uint16_t,  6, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), (b.extract<uint16_t,  7, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), (b.extract<uint16_t,  8, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), (b.extract<uint16_t, 10, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), (b.extract<uint16_t, 11, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), (b.extract<uint16_t, 12, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), (b.extract<uint16_t, 13, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), (b.extract<uint16_t, 14, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), (b.extract<uint16_t, 15, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), (b.extract<uint16_t, 17, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), (b.extract<uint16_t, 18, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), (b.extract<uint16_t, 19, 13>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 19, 14);
+      //uint16_t v2 = b.extract<uint16_t, 20, 13);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), b.extract<uint16_t>( 0, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), b.extract<uint16_t>( 1, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), b.extract<uint16_t>( 3, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), b.extract<uint16_t>( 4, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), b.extract<uint16_t>( 5, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), b.extract<uint16_t>( 6, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), b.extract<uint16_t>( 7, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), b.extract<uint16_t>( 8, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), b.extract<uint16_t>(10, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), b.extract<uint16_t>(11, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), b.extract<uint16_t>(12, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), b.extract<uint16_t>(13, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), b.extract<uint16_t>(14, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), b.extract<uint16_t>(15, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 16));
+
+      CHECK_THROW(b.extract<uint16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), (b.extract<uint16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), (b.extract<uint16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), (b.extract<uint16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), (b.extract<uint16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), (b.extract<uint16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), (b.extract<uint16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), (b.extract<uint16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), (b.extract<uint16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), (b.extract<uint16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), (b.extract<uint16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), (b.extract<uint16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), (b.extract<uint16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), (b.extract<uint16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), (b.extract<uint16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 16, 17>();
+      //uint16_t v2 = b.extract<uint16_t, 17, 16>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>( 0, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>( 1, 16));
+      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>( 2, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>( 3, 16));
+      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>( 4, 16));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>( 5, 16));
+      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>( 6, 16));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>( 7, 16));
+      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>( 8, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>( 9, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), b.extract<int16_t>(10, 16));
+      CHECK_EQUAL_HEX(int16_t(0x468A), b.extract<int16_t>(11, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2345), b.extract<int16_t>(12, 16));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), b.extract<int16_t>(13, 16));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), b.extract<int16_t>(14, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2468), b.extract<int16_t>(15, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1234), b.extract<int16_t>(16, 16));
+
+      CHECK_THROW(b.extract<int16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), (b.extract<int16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x468A), (b.extract<int16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2345), (b.extract<int16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), (b.extract<int16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), (b.extract<int16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2468), (b.extract<int16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1234), (b.extract<int16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //int16_t v1 = b.extract<int16_t, 16, 17>());
+      //int16_t v2 = b.extract<int16_t, 17, 16>());
     }
   };
 }
diff --git a/test/test_bitset_new_ext_default_element_type.cpp b/test/test_bitset_new_ext_default_element_type.cpp
index 7e377a95..201e98e6 100644
--- a/test/test_bitset_new_ext_default_element_type.cpp
+++ b/test/test_bitset_new_ext_default_element_type.cpp
@@ -1958,6 +1958,168 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
 
+    //*************************************************************************
+    TEST(test_extract_6_bit_uint8_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t>(10, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t>(11, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t>(12, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t>(13, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(14, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t>(15, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t>(16, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t>(17, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t>(18, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t>(19, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t>(20, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(21, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t>(22, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t>(23, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t>(24, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t>(25, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<uint8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_uint8_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //uint8_t v1 = b.extract<uint8_t, 26, 7>();
+      //uint8_t v1 = b.extract<uint8_t, 27, 6>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t>(10, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t>(11, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t>(12, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t>(13, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(14, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t>(15, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t>(16, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t>(17, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t>(18, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t>(19, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t>(20, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(21, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t>(22, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t>(23, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t>(24, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t>(25, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<int8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 26, 7>();
+      //int8_t v1 = b.extract<int8_t, 27, 6>();
+    }
+
     //*************************************************************************
     TEST(test_extract_uint8_t_with_run_time_parameters)
     {
@@ -1991,6 +2153,9 @@ namespace
       CHECK_EQUAL_HEX(uint8_t(0x48), b.extract<uint8_t>(22, 8));
       CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
       CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
+
+      CHECK_THROW(b.extract<uint8_t>(24, 9), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(25, 8), etl::bitset_overflow);
     }
 
     //*************************************************************************
@@ -2027,9 +2192,275 @@ namespace
       CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 8>()));
       CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
 
-      // The line below should static assert.
-      //uint8_t v = b.extract<uint8_t, 25, 8>();
-      //uint8_t v = b.extract<uint8_t, 25, 9>();
+      // The lines below should static assert.
+      //uint8_t v1 = b.extract<uint8_t, 24, 9>();
+      //uint8_t v2 = b.extract<uint8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), b.extract<int8_t>( 0, 8));
+      CHECK_EQUAL_HEX(int8_t(0x3C), b.extract<int8_t>( 1, 8));
+      CHECK_EQUAL_HEX(int8_t(0x9E), b.extract<int8_t>( 2, 8));
+      CHECK_EQUAL_HEX(int8_t(0xCF), b.extract<int8_t>( 3, 8));
+      CHECK_EQUAL_HEX(int8_t(0x67), b.extract<int8_t>( 4, 8));
+      CHECK_EQUAL_HEX(int8_t(0xB3), b.extract<int8_t>( 5, 8));
+      CHECK_EQUAL_HEX(int8_t(0x59), b.extract<int8_t>( 6, 8));
+      CHECK_EQUAL_HEX(int8_t(0xAC), b.extract<int8_t>( 7, 8));
+      CHECK_EQUAL_HEX(int8_t(0x56), b.extract<int8_t>( 8, 8));
+      CHECK_EQUAL_HEX(int8_t(0x2B), b.extract<int8_t>( 9, 8));
+      CHECK_EQUAL_HEX(int8_t(0x15), b.extract<int8_t>(10, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8A), b.extract<int8_t>(11, 8));
+      CHECK_EQUAL_HEX(int8_t(0x45), b.extract<int8_t>(12, 8));
+      CHECK_EQUAL_HEX(int8_t(0xA2), b.extract<int8_t>(13, 8));
+      CHECK_EQUAL_HEX(int8_t(0xD1), b.extract<int8_t>(14, 8));
+      CHECK_EQUAL_HEX(int8_t(0x68), b.extract<int8_t>(15, 8));
+      CHECK_EQUAL_HEX(int8_t(0x34), b.extract<int8_t>(16, 8));
+      CHECK_EQUAL_HEX(int8_t(0x1A), b.extract<int8_t>(17, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8D), b.extract<int8_t>(18, 8));
+      CHECK_EQUAL_HEX(int8_t(0x46), b.extract<int8_t>(19, 8));
+      CHECK_EQUAL_HEX(int8_t(0x23), b.extract<int8_t>(20, 8));
+      CHECK_EQUAL_HEX(int8_t(0x91), b.extract<int8_t>(21, 8));
+      CHECK_EQUAL_HEX(int8_t(0x48), b.extract<int8_t>(22, 8));
+      CHECK_EQUAL_HEX(int8_t(0x24), b.extract<int8_t>(23, 8));
+      CHECK_EQUAL_HEX(int8_t(0x12), b.extract<int8_t>(24, 8));
+
+      CHECK_THROW(b.extract<int8_t>(24, 9), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(25, 8), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), (b.extract<int8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x3C), (b.extract<int8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x9E), (b.extract<int8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xCF), (b.extract<int8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x67), (b.extract<int8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xB3), (b.extract<int8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x59), (b.extract<int8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xAC), (b.extract<int8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x56), (b.extract<int8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x2B), (b.extract<int8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8A), (b.extract<int8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x45), (b.extract<int8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xA2), (b.extract<int8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xD1), (b.extract<int8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x68), (b.extract<int8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x34), (b.extract<int8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8D), (b.extract<int8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x46), (b.extract<int8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x23), (b.extract<int8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x91), (b.extract<int8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x48), (b.extract<int8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x24), (b.extract<int8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 8>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 24, 9>();
+      //int8_t v2 = b.extract<int8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), b.extract<uint16_t>( 0, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), b.extract<uint16_t>( 1, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), b.extract<uint16_t>( 3, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), b.extract<uint16_t>( 4, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), b.extract<uint16_t>( 5, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), b.extract<uint16_t>( 6, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), b.extract<uint16_t>( 7, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), b.extract<uint16_t>( 8, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), b.extract<uint16_t>(10, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), b.extract<uint16_t>(11, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), b.extract<uint16_t>(12, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), b.extract<uint16_t>(13, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), b.extract<uint16_t>(14, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), b.extract<uint16_t>(15, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), b.extract<uint16_t>(17, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), b.extract<uint16_t>(18, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), b.extract<uint16_t>(19, 13));
+
+      CHECK_THROW(b.extract<uint16_t>(19, 14), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(20, 13), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), (b.extract<uint16_t,  0, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), (b.extract<uint16_t,  1, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), (b.extract<uint16_t,  3, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), (b.extract<uint16_t,  4, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), (b.extract<uint16_t,  5, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), (b.extract<uint16_t,  6, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), (b.extract<uint16_t,  7, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), (b.extract<uint16_t,  8, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), (b.extract<uint16_t, 10, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), (b.extract<uint16_t, 11, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), (b.extract<uint16_t, 12, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), (b.extract<uint16_t, 13, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), (b.extract<uint16_t, 14, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), (b.extract<uint16_t, 15, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), (b.extract<uint16_t, 17, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), (b.extract<uint16_t, 18, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), (b.extract<uint16_t, 19, 13>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 19, 14);
+      //uint16_t v2 = b.extract<uint16_t, 20, 13);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), b.extract<uint16_t>( 0, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), b.extract<uint16_t>( 1, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), b.extract<uint16_t>( 3, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), b.extract<uint16_t>( 4, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), b.extract<uint16_t>( 5, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), b.extract<uint16_t>( 6, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), b.extract<uint16_t>( 7, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), b.extract<uint16_t>( 8, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), b.extract<uint16_t>(10, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), b.extract<uint16_t>(11, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), b.extract<uint16_t>(12, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), b.extract<uint16_t>(13, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), b.extract<uint16_t>(14, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), b.extract<uint16_t>(15, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 16));
+
+      CHECK_THROW(b.extract<uint16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), (b.extract<uint16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), (b.extract<uint16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), (b.extract<uint16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), (b.extract<uint16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), (b.extract<uint16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), (b.extract<uint16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), (b.extract<uint16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), (b.extract<uint16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), (b.extract<uint16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), (b.extract<uint16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), (b.extract<uint16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), (b.extract<uint16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), (b.extract<uint16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), (b.extract<uint16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 16, 17>();
+      //uint16_t v2 = b.extract<uint16_t, 17, 16>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>( 0, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>( 1, 16));
+      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>( 2, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>( 3, 16));
+      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>( 4, 16));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>( 5, 16));
+      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>( 6, 16));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>( 7, 16));
+      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>( 8, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>( 9, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), b.extract<int16_t>(10, 16));
+      CHECK_EQUAL_HEX(int16_t(0x468A), b.extract<int16_t>(11, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2345), b.extract<int16_t>(12, 16));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), b.extract<int16_t>(13, 16));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), b.extract<int16_t>(14, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2468), b.extract<int16_t>(15, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1234), b.extract<int16_t>(16, 16));
+
+      CHECK_THROW(b.extract<int16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), (b.extract<int16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x468A), (b.extract<int16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2345), (b.extract<int16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), (b.extract<int16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), (b.extract<int16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2468), (b.extract<int16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1234), (b.extract<int16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //int16_t v1 = b.extract<int16_t, 16, 17>());
+      //int16_t v2 = b.extract<int16_t, 17, 16>());
     }
   };
 }
diff --git a/test/test_bitset_new_ext_explicit_single_element_type.cpp b/test/test_bitset_new_ext_explicit_single_element_type.cpp
index d0b489be..163d1865 100644
--- a/test/test_bitset_new_ext_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_ext_explicit_single_element_type.cpp
@@ -1310,10 +1310,172 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
 
+    //*************************************************************************
+    TEST(test_extract_6_bit_uint8_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t>(10, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t>(11, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t>(12, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t>(13, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(14, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t>(15, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t>(16, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t>(17, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t>(18, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t>(19, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t>(20, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(21, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t>(22, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t>(23, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t>(24, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t>(25, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<uint8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_uint8_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //uint8_t v1 = b.extract<uint8_t, 26, 7>();
+      //uint8_t v1 = b.extract<uint8_t, 27, 6>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t>(10, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t>(11, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t>(12, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t>(13, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(14, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t>(15, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t>(16, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t>(17, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t>(18, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t>(19, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t>(20, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(21, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t>(22, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t>(23, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t>(24, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t>(25, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<int8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 26, 7>();
+      //int8_t v1 = b.extract<int8_t, 27, 6>();
+    }
+
     //*************************************************************************
     TEST(test_extract_uint8_t_with_run_time_parameters)
     {
-      using bs32 = etl::bitset_ext<32, int32_t>;
+      using bs32 = etl::bitset_ext<32, uint32_t>;
 
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
@@ -1343,12 +1505,15 @@ namespace
       CHECK_EQUAL_HEX(uint8_t(0x48), b.extract<uint8_t>(22, 8));
       CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
       CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
+
+      CHECK_THROW(b.extract<uint8_t>(24, 9), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(25, 8), etl::bitset_overflow);
     }
 
     //*************************************************************************
     TEST(test_extract_uint8_t_with_template_parameters)
     {
-      using bs32 = etl::bitset_ext<32, int32_t>;
+      using bs32 = etl::bitset_ext<32, uint32_t>;
 
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
@@ -1379,9 +1544,275 @@ namespace
       CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 8>()));
       CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
 
-      // The line below should static assert.
-      //uint8_t v = b.extract<uint8_t, 25, 8>();
-      //uint8_t v = b.extract<uint8_t, 25, 9>();
+      // The lines below should static assert.
+      //uint8_t v1 = b.extract<uint8_t, 24, 9>();
+      //uint8_t v2 = b.extract<uint8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), b.extract<int8_t>( 0, 8));
+      CHECK_EQUAL_HEX(int8_t(0x3C), b.extract<int8_t>( 1, 8));
+      CHECK_EQUAL_HEX(int8_t(0x9E), b.extract<int8_t>( 2, 8));
+      CHECK_EQUAL_HEX(int8_t(0xCF), b.extract<int8_t>( 3, 8));
+      CHECK_EQUAL_HEX(int8_t(0x67), b.extract<int8_t>( 4, 8));
+      CHECK_EQUAL_HEX(int8_t(0xB3), b.extract<int8_t>( 5, 8));
+      CHECK_EQUAL_HEX(int8_t(0x59), b.extract<int8_t>( 6, 8));
+      CHECK_EQUAL_HEX(int8_t(0xAC), b.extract<int8_t>( 7, 8));
+      CHECK_EQUAL_HEX(int8_t(0x56), b.extract<int8_t>( 8, 8));
+      CHECK_EQUAL_HEX(int8_t(0x2B), b.extract<int8_t>( 9, 8));
+      CHECK_EQUAL_HEX(int8_t(0x15), b.extract<int8_t>(10, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8A), b.extract<int8_t>(11, 8));
+      CHECK_EQUAL_HEX(int8_t(0x45), b.extract<int8_t>(12, 8));
+      CHECK_EQUAL_HEX(int8_t(0xA2), b.extract<int8_t>(13, 8));
+      CHECK_EQUAL_HEX(int8_t(0xD1), b.extract<int8_t>(14, 8));
+      CHECK_EQUAL_HEX(int8_t(0x68), b.extract<int8_t>(15, 8));
+      CHECK_EQUAL_HEX(int8_t(0x34), b.extract<int8_t>(16, 8));
+      CHECK_EQUAL_HEX(int8_t(0x1A), b.extract<int8_t>(17, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8D), b.extract<int8_t>(18, 8));
+      CHECK_EQUAL_HEX(int8_t(0x46), b.extract<int8_t>(19, 8));
+      CHECK_EQUAL_HEX(int8_t(0x23), b.extract<int8_t>(20, 8));
+      CHECK_EQUAL_HEX(int8_t(0x91), b.extract<int8_t>(21, 8));
+      CHECK_EQUAL_HEX(int8_t(0x48), b.extract<int8_t>(22, 8));
+      CHECK_EQUAL_HEX(int8_t(0x24), b.extract<int8_t>(23, 8));
+      CHECK_EQUAL_HEX(int8_t(0x12), b.extract<int8_t>(24, 8));
+
+      CHECK_THROW(b.extract<int8_t>(24, 9), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(25, 8), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), (b.extract<int8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x3C), (b.extract<int8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x9E), (b.extract<int8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xCF), (b.extract<int8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x67), (b.extract<int8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xB3), (b.extract<int8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x59), (b.extract<int8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xAC), (b.extract<int8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x56), (b.extract<int8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x2B), (b.extract<int8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8A), (b.extract<int8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x45), (b.extract<int8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xA2), (b.extract<int8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xD1), (b.extract<int8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x68), (b.extract<int8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x34), (b.extract<int8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8D), (b.extract<int8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x46), (b.extract<int8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x23), (b.extract<int8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x91), (b.extract<int8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x48), (b.extract<int8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x24), (b.extract<int8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 8>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 24, 9>();
+      //int8_t v2 = b.extract<int8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), b.extract<uint16_t>( 0, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), b.extract<uint16_t>( 1, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), b.extract<uint16_t>( 3, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), b.extract<uint16_t>( 4, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), b.extract<uint16_t>( 5, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), b.extract<uint16_t>( 6, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), b.extract<uint16_t>( 7, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), b.extract<uint16_t>( 8, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), b.extract<uint16_t>(10, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), b.extract<uint16_t>(11, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), b.extract<uint16_t>(12, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), b.extract<uint16_t>(13, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), b.extract<uint16_t>(14, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), b.extract<uint16_t>(15, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), b.extract<uint16_t>(17, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), b.extract<uint16_t>(18, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), b.extract<uint16_t>(19, 13));
+
+      CHECK_THROW(b.extract<uint16_t>(19, 14), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(20, 13), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), (b.extract<uint16_t,  0, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), (b.extract<uint16_t,  1, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), (b.extract<uint16_t,  3, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), (b.extract<uint16_t,  4, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), (b.extract<uint16_t,  5, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), (b.extract<uint16_t,  6, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), (b.extract<uint16_t,  7, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), (b.extract<uint16_t,  8, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), (b.extract<uint16_t, 10, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), (b.extract<uint16_t, 11, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), (b.extract<uint16_t, 12, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), (b.extract<uint16_t, 13, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), (b.extract<uint16_t, 14, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), (b.extract<uint16_t, 15, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), (b.extract<uint16_t, 17, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), (b.extract<uint16_t, 18, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), (b.extract<uint16_t, 19, 13>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 19, 14);
+      //uint16_t v2 = b.extract<uint16_t, 20, 13);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), b.extract<uint16_t>( 0, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), b.extract<uint16_t>( 1, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), b.extract<uint16_t>( 3, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), b.extract<uint16_t>( 4, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), b.extract<uint16_t>( 5, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), b.extract<uint16_t>( 6, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), b.extract<uint16_t>( 7, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), b.extract<uint16_t>( 8, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), b.extract<uint16_t>(10, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), b.extract<uint16_t>(11, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), b.extract<uint16_t>(12, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), b.extract<uint16_t>(13, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), b.extract<uint16_t>(14, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), b.extract<uint16_t>(15, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 16));
+
+      CHECK_THROW(b.extract<uint16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), (b.extract<uint16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), (b.extract<uint16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), (b.extract<uint16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), (b.extract<uint16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), (b.extract<uint16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), (b.extract<uint16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), (b.extract<uint16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), (b.extract<uint16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), (b.extract<uint16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), (b.extract<uint16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), (b.extract<uint16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), (b.extract<uint16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), (b.extract<uint16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), (b.extract<uint16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 16, 17>();
+      //uint16_t v2 = b.extract<uint16_t, 17, 16>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>( 0, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>( 1, 16));
+      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>( 2, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>( 3, 16));
+      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>( 4, 16));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>( 5, 16));
+      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>( 6, 16));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>( 7, 16));
+      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>( 8, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>( 9, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), b.extract<int16_t>(10, 16));
+      CHECK_EQUAL_HEX(int16_t(0x468A), b.extract<int16_t>(11, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2345), b.extract<int16_t>(12, 16));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), b.extract<int16_t>(13, 16));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), b.extract<int16_t>(14, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2468), b.extract<int16_t>(15, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1234), b.extract<int16_t>(16, 16));
+
+      CHECK_THROW(b.extract<int16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), (b.extract<int16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x468A), (b.extract<int16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2345), (b.extract<int16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), (b.extract<int16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), (b.extract<int16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2468), (b.extract<int16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1234), (b.extract<int16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //int16_t v1 = b.extract<int16_t, 16, 17>());
+      //int16_t v2 = b.extract<int16_t, 17, 16>());
     }
   };
 }

From 489429bd7c113ea9b410aca28a75e29ca423d566 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Wed, 13 Dec 2023 09:58:44 +0000
Subject: [PATCH 009/131] Fixed operator == implementations

---
 include/etl/unordered_map.h      | 34 +++++++++++++++++++++-----
 include/etl/unordered_multimap.h | 41 +++++++++++++++++++++++++++-----
 include/etl/unordered_multiset.h | 40 ++++++++++++++++++++++++++-----
 include/etl/unordered_set.h      | 33 ++++++++++++++++++++-----
 test/test_unordered_map.cpp      | 14 +++++++++++
 test/test_unordered_multimap.cpp | 15 ++++++++++++
 test/test_unordered_multiset.cpp | 14 +++++++++++
 test/test_unordered_set.cpp      | 14 +++++++++++
 8 files changed, 181 insertions(+), 24 deletions(-)

diff --git a/include/etl/unordered_map.h b/include/etl/unordered_map.h
index 0e5b9e35..507ae872 100644
--- a/include/etl/unordered_map.h
+++ b/include/etl/unordered_map.h
@@ -1569,20 +1569,41 @@ namespace etl
   ///\return <b>true</b> if the arrays are equal, otherwise <b>false</b>
   ///\ingroup unordered_map
   //***************************************************************************
-  template <typename TKey, typename T, typename TKeyCompare>
-  bool operator ==(const etl::iunordered_map<TKey, T, TKeyCompare>& lhs, const etl::iunordered_map<TKey, T, TKeyCompare>& rhs)
+  template <typename TKey, typename T, typename THash, typename TKeyEqual>
+  bool operator ==(const etl::iunordered_map<TKey, T, THash, TKeyEqual>& lhs, 
+                   const etl::iunordered_map<TKey, T, THash, TKeyEqual>& rhs)
   {
     const bool sizes_match = (lhs.size() == rhs.size());
     bool elements_match = true;
 
+    typedef typename etl::iunordered_map<TKey, T, THash, TKeyEqual>::const_iterator itr_t;
+    
     if (sizes_match)
     {
-      for (size_t i = 0; (i < lhs.bucket_count()) && elements_match; ++i)
+      itr_t l_begin = lhs.begin();
+      itr_t l_end   = lhs.end();
+
+      while ((l_begin != l_end) && elements_match)
       {
-        if (!etl::is_permutation(lhs.begin(i), lhs.end(i), rhs.begin(i)))
+        const TKey key     = l_begin->first;
+        const T    l_value = l_begin->second;
+
+        // See if the lhs key exists in the rhs.
+        ETL_OR_STD::pair<itr_t, itr_t> range = rhs.equal_range(key);
+
+        if (range.first != rhs.end())
+        {
+          // See if the values match
+          const T r_value = range.first->second;
+
+          elements_match = (r_value == l_value);
+        }
+        else
         {
           elements_match = false;
         }
+
+        ++l_begin;
       }
     }
 
@@ -1596,8 +1617,9 @@ namespace etl
   ///\return <b>true</b> if the arrays are not equal, otherwise <b>false</b>
   ///\ingroup unordered_map
   //***************************************************************************
-  template <typename TKey, typename T, typename TKeyCompare>
-  bool operator !=(const etl::iunordered_map<TKey, T, TKeyCompare>& lhs, const etl::iunordered_map<TKey, T, TKeyCompare>& rhs)
+  template <typename TKey, typename T, typename THash, typename TKeyEqual>
+  bool operator !=(const etl::iunordered_map<TKey, T, THash, TKeyEqual>& lhs, 
+                   const etl::iunordered_map<TKey, T, THash, TKeyEqual>& rhs)
   {
     return !(lhs == rhs);
   }
diff --git a/include/etl/unordered_multimap.h b/include/etl/unordered_multimap.h
index 174b5978..b698374c 100644
--- a/include/etl/unordered_multimap.h
+++ b/include/etl/unordered_multimap.h
@@ -1423,20 +1423,48 @@ namespace etl
   ///\return <b>true</b> if the arrays are equal, otherwise <b>false</b>
   ///\ingroup unordered_multimap
   //***************************************************************************
-  template <typename TKey, typename TMapped, typename TKeyCompare>
-  bool operator ==(const etl::iunordered_multimap<TKey, TMapped, TKeyCompare>& lhs, const etl::iunordered_multimap<TKey, TMapped, TKeyCompare>& rhs)
+  template <typename TKey, typename T, typename THash, typename TKeyEqual>
+  bool operator ==(const etl::iunordered_multimap<TKey, T, THash, TKeyEqual>& lhs, 
+                   const etl::iunordered_multimap<TKey, T, THash, TKeyEqual>& rhs)
   {
     const bool sizes_match = (lhs.size() == rhs.size());
     bool elements_match = true;
 
+    typedef typename etl::iunordered_multimap<TKey, T, THash, TKeyEqual>::const_iterator itr_t;
+
     if (sizes_match)
     {
-      for (size_t i = 0; (i < lhs.bucket_count()) && elements_match; ++i)
+      itr_t l_begin = lhs.begin();
+      itr_t l_end   = lhs.end();
+
+      while ((l_begin != l_end) && elements_match)
       {
-        if (!etl::is_permutation(lhs.begin(i), lhs.end(i), rhs.begin(i)))
+        const TKey key     = l_begin->first;
+        const T    l_value = l_begin->second;
+
+        // See if the lhs keys exist in the rhs.
+        ETL_OR_STD::pair<itr_t, itr_t> l_range = lhs.equal_range(key);
+        ETL_OR_STD::pair<itr_t, itr_t> r_range = rhs.equal_range(key);
+
+        if (r_range.first != rhs.end())
+        {
+          bool distance_match = (etl::distance(l_range.first, l_range.second) == etl::distance(r_range.first, r_range.second));
+
+          if (distance_match)
+          {
+            elements_match = etl::is_permutation(l_range.first, l_range.second, r_range.first, r_range.second);
+          }
+          else
+          {
+            elements_match = false;
+          }
+        }
+        else
         {
           elements_match = false;
         }
+
+        ++l_begin;
       }
     }
 
@@ -1450,8 +1478,9 @@ namespace etl
   ///\return <b>true</b> if the arrays are not equal, otherwise <b>false</b>
   ///\ingroup unordered_multimap
   //***************************************************************************
-  template <typename TKey, typename TMapped, typename TKeyCompare>
-  bool operator !=(const etl::iunordered_multimap<TKey, TMapped, TKeyCompare>& lhs, const etl::iunordered_multimap<TKey, TMapped, TKeyCompare>& rhs)
+  template <typename TKey, typename T, typename THash, typename TKeyEqual>
+  bool operator !=(const etl::iunordered_multimap<TKey, T, THash, TKeyEqual>& lhs, 
+                   const etl::iunordered_multimap<TKey, T, THash, TKeyEqual>& rhs)
   {
     return !(lhs == rhs);
   }
diff --git a/include/etl/unordered_multiset.h b/include/etl/unordered_multiset.h
index be1acee7..21ff6dcb 100644
--- a/include/etl/unordered_multiset.h
+++ b/include/etl/unordered_multiset.h
@@ -1401,20 +1401,47 @@ namespace etl
   ///\return <b>true</b> if the arrays are equal, otherwise <b>false</b>
   ///\ingroup unordered_multiset
   //***************************************************************************
-  template <typename TKey, typename TMapped, typename TKeyCompare>
-  bool operator ==(const etl::iunordered_multiset<TKey, TMapped, TKeyCompare>& lhs, const etl::iunordered_multiset<TKey, TMapped, TKeyCompare>& rhs)
+  template <typename TKey, typename THash = etl::hash<TKey>, typename TKeyEqual>
+  bool operator ==(const etl::iunordered_multiset<TKey, THash, TKeyEqual>& lhs, 
+                   const etl::iunordered_multiset<TKey, THash, TKeyEqual>& rhs)
   {
     const bool sizes_match = (lhs.size() == rhs.size());
     bool elements_match = true;
 
+    typedef typename etl::iunordered_multiset<TKey, THash, TKeyEqual>::const_iterator itr_t;
+
     if (sizes_match)
     {
-      for (size_t i = 0; (i < lhs.bucket_count()) && elements_match; ++i)
+      itr_t l_begin = lhs.begin();
+      itr_t l_end   = lhs.end();
+
+      while ((l_begin != l_end) && elements_match)
       {
-        if (!etl::is_permutation(lhs.begin(i), lhs.end(i), rhs.begin(i)))
+        const TKey l_value = *l_begin;
+
+        // See if the lhs keys exist in the rhs.
+        ETL_OR_STD::pair<itr_t, itr_t> l_range = lhs.equal_range(l_value);
+        ETL_OR_STD::pair<itr_t, itr_t> r_range = rhs.equal_range(l_value);
+
+        if (r_range.first != rhs.end())
+        {
+          bool distance_match = (etl::distance(l_range.first, l_range.second) == etl::distance(r_range.first, r_range.second));
+
+          if (distance_match)
+          {
+            elements_match = etl::is_permutation(l_range.first, l_range.second, r_range.first, r_range.second);
+          }
+          else
+          {
+            elements_match = false;
+          }
+        }
+        else
         {
           elements_match = false;
         }
+
+        ++l_begin;
       }
     }
 
@@ -1428,8 +1455,9 @@ namespace etl
   ///\return <b>true</b> if the arrays are not equal, otherwise <b>false</b>
   ///\ingroup unordered_multiset
   //***************************************************************************
-  template <typename TKey, typename TMapped, typename TKeyCompare>
-  bool operator !=(const etl::iunordered_multiset<TKey, TMapped, TKeyCompare>& lhs, const etl::iunordered_multiset<TKey, TMapped, TKeyCompare>& rhs)
+  template <typename TKey, typename THash = etl::hash<TKey>, typename TKeyEqual>
+  bool operator !=(const etl::iunordered_multiset<TKey, THash, TKeyEqual>& lhs, 
+                   const etl::iunordered_multiset<TKey, THash, TKeyEqual>& rhs)
   {
     return !(lhs == rhs);
   }
diff --git a/include/etl/unordered_set.h b/include/etl/unordered_set.h
index 35dce097..24f929b8 100644
--- a/include/etl/unordered_set.h
+++ b/include/etl/unordered_set.h
@@ -1427,20 +1427,40 @@ namespace etl
   ///\return <b>true</b> if the sets are equal, otherwise <b>false</b>
   ///\ingroup unordered_set
   //***************************************************************************
-  template <typename TKey, typename TMapped, typename TKeyCompare>
-  bool operator ==(const etl::iunordered_set<TKey, TMapped, TKeyCompare>& lhs, const etl::iunordered_set<TKey, TMapped, TKeyCompare>& rhs)
+  template <typename TKey, typename THash, typename TKeyEqual>
+  bool operator ==(const etl::iunordered_set<TKey, THash, TKeyEqual>& lhs, 
+                   const etl::iunordered_set<TKey, THash, TKeyEqual>& rhs)
   {
     const bool sizes_match = (lhs.size() == rhs.size());
     bool elements_match = true;
 
+    typedef typename etl::iunordered_set<TKey, THash, TKeyEqual>::const_iterator itr_t;
+
     if (sizes_match)
     {
-      for (size_t i = 0; (i < lhs.bucket_count()) && elements_match; ++i)
+      itr_t l_begin = lhs.begin();
+      itr_t l_end   = lhs.end();
+
+      while ((l_begin != l_end) && elements_match)
       {
-        if (!etl::is_permutation(lhs.begin(i), lhs.end(i), rhs.begin(i)))
+        const TKey l_value = *l_begin;
+
+        // See if the lhs key exists in the rhs.
+        ETL_OR_STD::pair<itr_t, itr_t> range = rhs.equal_range(l_value);
+
+        if (range.first != rhs.end())
+        {
+          // See if the values match
+          const TKey r_value = *(range.first);
+
+          elements_match = (r_value == l_value);
+        }
+        else
         {
           elements_match = false;
         }
+
+        ++l_begin;
       }
     }
 
@@ -1454,8 +1474,9 @@ namespace etl
   ///\return <b>true</b> if the sets are not equal, otherwise <b>false</b>
   ///\ingroup unordered_set
   //***************************************************************************
-  template <typename TKey, typename TMapped, typename TKeyCompare>
-  bool operator !=(const etl::iunordered_set<TKey, TMapped, TKeyCompare>& lhs, const etl::iunordered_set<TKey, TMapped, TKeyCompare>& rhs)
+  template <typename TKey, typename THash, typename TKeyEqual>
+  bool operator !=(const etl::iunordered_set<TKey, THash, TKeyEqual>& lhs, 
+                   const etl::iunordered_set<TKey, THash, TKeyEqual>& rhs)
   {
     return !(lhs == rhs);
   }
diff --git a/test/test_unordered_map.cpp b/test/test_unordered_map.cpp
index 45a28397..93f66457 100644
--- a/test/test_unordered_map.cpp
+++ b/test/test_unordered_map.cpp
@@ -1193,5 +1193,19 @@ namespace
       using Map = etl::unordered_map<int, int, 1, 1>;
       CHECK((!std::is_same<typename Map::const_iterator::value_type, typename Map::iterator::value_type>::value));
     }
+
+    //*************************************************************************
+    TEST(test_iterator_value_types_bug_803)
+    {
+      using Map1 = etl::unordered_map<std::string, NDC, SIZE, 5>;
+      using Map2 = etl::unordered_map<std::string, NDC, 2 * SIZE, 10>;
+      
+      Map1 map1(initial_data.begin(), initial_data.end());
+      Map2 map2a(initial_data.begin(), initial_data.end());
+      Map2 map2b(different_data.begin(), different_data.end());
+      
+      CHECK_TRUE(map1 == map2a);
+      CHECK_FALSE(map1 == map2b);
+    }
   };
 }
diff --git a/test/test_unordered_multimap.cpp b/test/test_unordered_multimap.cpp
index 8bd86523..38d198bf 100644
--- a/test/test_unordered_multimap.cpp
+++ b/test/test_unordered_multimap.cpp
@@ -1030,6 +1030,7 @@ namespace
       CHECK((!std::is_same<typename Map::const_iterator::value_type, typename Map::iterator::value_type>::value));
     }
 
+    //*************************************************************************
     TEST(test_parameterized_eq)
     {
       constexpr std::size_t MODULO = 4;
@@ -1053,5 +1054,19 @@ namespace
         CHECK_EQUAL(std::distance(range.first, range.second), 3);
       }
     }
+
+    //*************************************************************************
+    TEST(test_iterator_value_types_bug_803)
+    {
+      using Map1 = etl::unordered_multimap<std::string, NDC, SIZE, 5>;
+      using Map2 = etl::unordered_multimap<std::string, NDC, 2 * SIZE, 10>;
+
+      Map1 map1(initial_data.begin(), initial_data.end());
+      Map2 map2a(initial_data.begin(), initial_data.end());
+      Map2 map2b(different_data.begin(), different_data.end());
+
+      CHECK_TRUE(map1 == map2a);
+      CHECK_FALSE(map1 == map2b);
+    }
   };
 }
diff --git a/test/test_unordered_multiset.cpp b/test/test_unordered_multiset.cpp
index c891730a..8337a015 100644
--- a/test/test_unordered_multiset.cpp
+++ b/test/test_unordered_multiset.cpp
@@ -929,5 +929,19 @@ namespace
         CHECK_EQUAL(std::distance(range.first, range.second), 3);
       }
     }
+
+    //*************************************************************************
+    TEST(test_iterator_value_types_bug_803)
+    {
+      using Set1 = etl::unordered_multiset<NDC, SIZE, 5>;
+      using Set2 = etl::unordered_multiset<NDC, 2 * SIZE, 10>;
+
+      Set1 set1(initial_data.begin(), initial_data.end());
+      Set2 set2a(initial_data.begin(), initial_data.end());
+      Set2 set2b(different_data.begin(), different_data.end());
+
+      CHECK_TRUE(set1 == set2a);
+      CHECK_FALSE(set1 == set2b);
+    }
   };
 }
diff --git a/test/test_unordered_set.cpp b/test/test_unordered_set.cpp
index 8ef20ad3..7a4210cc 100644
--- a/test/test_unordered_set.cpp
+++ b/test/test_unordered_set.cpp
@@ -895,5 +895,19 @@ namespace
       using Set = etl::unordered_set<int, 1, 1>;
       CHECK((!std::is_same<typename Set::const_iterator::value_type, typename Set::iterator::value_type>::value));
     }
+
+    //*************************************************************************
+    TEST(test_iterator_value_types_bug_803)
+    {
+      using Set1 = etl::unordered_set<NDC, SIZE, 5>;
+      using Set2 = etl::unordered_set<NDC, 2 * SIZE, 10>;
+
+      Set1 set1(initial_data.begin(), initial_data.end());
+      Set2 set2a(initial_data.begin(), initial_data.end());
+      Set2 set2b(different_data.begin(), different_data.end());
+
+      CHECK_TRUE(set1 == set2a);
+      CHECK_FALSE(set1 == set2b);
+    }
   };
 }

From 8f88aa0141ad95ba40fc6627e1ba8dc01aa7f9d6 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Fri, 15 Dec 2023 10:06:21 +0000
Subject: [PATCH 010/131] Fixed etl::optional operator =() for invalid values
 with non-pod types

---
 include/etl/optional.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/etl/optional.h b/include/etl/optional.h
index d85763d2..8eefd588 100644
--- a/include/etl/optional.h
+++ b/include/etl/optional.h
@@ -783,7 +783,11 @@ namespace etl
     {
       if (this != &other)
       {
-        storage.value = etl::move(other.storage.value);
+        if (other.has_value())
+        {
+          storage.value = etl::move(other.storage.value);
+        }
+
         valid = other.valid;
       }
 

From 59cd9e66d765262e7f96d0e5e3ac8faefb1d1acb Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 16 Dec 2023 12:57:36 +0000
Subject: [PATCH 011/131] #807 Change in legacy etl::bitset with nullptr
 construction + error handling

Harmonised operation of legacy and new etl::bitset
Added ETL_ASSERT checks for nullptr buffer pointers for etl::bitset_ext
---
 include/etl/private/bitset_legacy.h           |  42 +++-
 include/etl/private/bitset_new.h              |  63 ++++--
 test/test_bit_stream_reader_big_endian.cpp    |   2 +-
 test/test_bit_stream_reader_little_endian.cpp |   2 +-
 test/test_bit_stream_writer_big_endian.cpp    |   2 +-
 test/test_bit_stream_writer_little_endian.cpp |   2 +-
 test/test_bitset_legacy.cpp                   | 154 ++++++++++++++-
 test/test_bitset_new_default_element_type.cpp | 155 ++++++++++++++-
 ...itset_new_explicit_single_element_type.cpp | 154 ++++++++++++++-
 ...st_bitset_new_ext_default_element_type.cpp | 187 +++++++++++++++++-
 ...t_new_ext_explicit_single_element_type.cpp | 185 ++++++++++++++++-
 11 files changed, 882 insertions(+), 66 deletions(-)

diff --git a/include/etl/private/bitset_legacy.h b/include/etl/private/bitset_legacy.h
index 24052e41..30c152ae 100644
--- a/include/etl/private/bitset_legacy.h
+++ b/include/etl/private/bitset_legacy.h
@@ -429,7 +429,14 @@ namespace etl
     //*************************************************************************
     ibitset& set(const char* text)
     {
-      from_string(text);
+      if (text == ETL_NULLPTR)
+      {
+        reset();
+      }
+      else
+      {
+        from_string(text);
+      }
 
       return *this;
     }
@@ -439,7 +446,14 @@ namespace etl
     //*************************************************************************
     ibitset& set(const wchar_t* text)
     {
-      from_string(text);
+      if (text == ETL_NULLPTR)
+      {
+        reset();
+      }
+      else
+      {
+        from_string(text);
+      }
 
       return *this;
     }
@@ -449,7 +463,14 @@ namespace etl
     //*************************************************************************
     ibitset& set(const char16_t* text)
     {
-      from_string(text);
+      if (text == ETL_NULLPTR)
+      {
+        reset();
+      }
+      else
+      {
+        from_string(text);
+      }
 
       return *this;
     }
@@ -459,7 +480,14 @@ namespace etl
     //*************************************************************************
     ibitset& set(const char32_t* text)
     {
-      from_string(text);
+      if (text == ETL_NULLPTR)
+      {
+        reset();
+      }
+      else
+      {
+        from_string(text);
+      }
 
       return *this;
     }
@@ -512,7 +540,7 @@ namespace etl
     //*************************************************************************
     ibitset& reset()
     {
-      ::memset(pdata, 0x00, Number_Of_Elements);
+      ::memset(pdata, 0, Number_Of_Elements * sizeof(element_type));
 
       return *this;
     }
@@ -1194,7 +1222,6 @@ namespace etl
     //*************************************************************************
     bitset<MaxN>& set(const char* text)
     {
-      ETL_ASSERT_OR_RETURN_VALUE(text != 0, ETL_ERROR(bitset_nullptr), *this);
       etl::ibitset::set(text);
 
       return *this;
@@ -1205,7 +1232,6 @@ namespace etl
     //*************************************************************************
     bitset<MaxN>& set(const wchar_t* text)
     {
-      ETL_ASSERT_OR_RETURN_VALUE(text != 0, ETL_ERROR(bitset_nullptr), *this);
       etl::ibitset::set(text);
 
       return *this;
@@ -1216,7 +1242,6 @@ namespace etl
     //*************************************************************************
     bitset<MaxN>& set(const char16_t* text)
     {
-      ETL_ASSERT_OR_RETURN_VALUE(text != 0, ETL_ERROR(bitset_nullptr), *this);
       etl::ibitset::set(text);
 
       return *this;
@@ -1227,7 +1252,6 @@ namespace etl
     //*************************************************************************
     bitset<MaxN>& set(const char32_t* text)
     {
-      ETL_ASSERT_OR_RETURN_VALUE(text != 0, ETL_ERROR(bitset_nullptr), *this);
       etl::ibitset::set(text);
 
       return *this;
diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 63462f21..28497238 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -127,6 +127,20 @@ namespace etl
     }
   };
 
+  //***************************************************************************
+  /// Bitset nullptr buffer exception.
+  ///\ingroup bitset
+  //***************************************************************************
+  class bitset_invalid_buffer : public bitset_exception
+  {
+  public:
+
+    bitset_invalid_buffer(string_type file_name_, numeric_type line_number_)
+      : bitset_exception(ETL_ERROR_TEXT("bitset:invalid buffer", ETL_BITSET_FILE_ID"D"), file_name_, line_number_)
+    {
+    }
+  };
+
   //*************************************************************************
   /// The implementation class for multi-element etl::bitset
   ///\ingroup bitset
@@ -2598,16 +2612,17 @@ namespace etl
     //*************************************************************************
     /// Default constructor.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(element_type* pbuffer_) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 explicit bitset_ext(element_type* pbuffer_)
       : pbuffer(pbuffer_)
     {
+      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
       *pbuffer = All_Clear_Element;
     }
 
     //*************************************************************************
     /// Default constructor.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(buffer_type& buffer) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 explicit bitset_ext(buffer_type& buffer) ETL_NOEXCEPT
       : pbuffer(&buffer)
     {
       *pbuffer = All_Clear_Element;
@@ -2616,9 +2631,10 @@ namespace etl
     //*************************************************************************
     /// Construct copy.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const bitset_ext<Active_Bits, TElement, true>& other, element_type* pbuffer_) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext(const bitset_ext<Active_Bits, TElement, true>& other, element_type* pbuffer_)
       : pbuffer(pbuffer_)
     {
+      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
       *pbuffer = *other.pbuffer;
     }
 
@@ -2639,9 +2655,10 @@ namespace etl
     //*************************************************************************
     /// Construct from a value.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(unsigned long long value, element_type* pbuffer_) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext(unsigned long long value, element_type* pbuffer_)
       : pbuffer(pbuffer_)
     {
+      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
       *pbuffer = element_type(value);
     }
 
@@ -2657,9 +2674,10 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char* text, element_type* pbuffer_) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext(const char* text, element_type* pbuffer_)
       : pbuffer(pbuffer_)
     {
+      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
       *pbuffer = All_Clear_Element;
       set(text);
     }
@@ -2677,9 +2695,10 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const wchar_t* text, element_type* pbuffer_) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext(const wchar_t* text, element_type* pbuffer_)
       : pbuffer(pbuffer_)
     {
+      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
       *pbuffer = All_Clear_Element;
       set(text);
     }
@@ -2697,9 +2716,10 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char16_t* text, element_type* pbuffer_) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext(const char16_t* text, element_type* pbuffer_)
       : pbuffer(pbuffer_)
     {
+      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
       *pbuffer = All_Clear_Element;
       set(text);
     }
@@ -2717,9 +2737,10 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char32_t* text, element_type* pbuffer_) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext(const char32_t* text, element_type* pbuffer_)
       : pbuffer(pbuffer_)
     {
+      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
       *pbuffer = All_Clear_Element;
       set(text);
     }
@@ -2963,7 +2984,7 @@ namespace etl
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-      typename etl::enable_if<etl::is_integral<T>::value, T>::type
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
       value() const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Only integral types are supported");
@@ -3476,27 +3497,30 @@ namespace etl
     //*************************************************************************
     /// Default constructor.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(element_type* pbuffer_) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 explicit bitset_ext(element_type* pbuffer_)
       : pbuffer(pbuffer_)
     {
+      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
       reset();
     }
 
     //*************************************************************************
     /// Default constructor.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(buffer_type& buffer) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 explicit bitset_ext(buffer_type& buffer)
       : pbuffer(buffer.data())
     {
+      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
       reset();
     }
 
     //*************************************************************************
     /// Construct copy.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const bitset_ext<Active_Bits, TElement, false>& other, element_type* pbuffer_) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext(const bitset_ext<Active_Bits, TElement, false>& other, element_type* pbuffer_)
       : pbuffer(pbuffer_)
     {
+      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
       etl::copy_n(other.pbuffer, Number_Of_Elements, pbuffer);
     }
 
@@ -3517,9 +3541,10 @@ namespace etl
     //*************************************************************************
     /// Construct from a value.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(unsigned long long value, element_type* pbuffer_) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext(unsigned long long value, element_type* pbuffer_)
       : pbuffer(pbuffer_)
     {
+      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
       ibitset.initialise(pbuffer, Number_Of_Elements, value);
       clear_unused_bits_in_msb();
     }
@@ -3537,9 +3562,10 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char* text, element_type* pbuffer_) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext(const char* text, element_type* pbuffer_)
       : pbuffer(pbuffer_)
     {
+      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
       ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
       clear_unused_bits_in_msb();
     }
@@ -3557,9 +3583,10 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const wchar_t* text, element_type* pbuffer_) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext(const wchar_t* text, element_type* pbuffer_)
       : pbuffer(pbuffer_)
     {
+      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
       ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
       clear_unused_bits_in_msb();
     }
@@ -3577,9 +3604,10 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char16_t* text, element_type* pbuffer_) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext(const char16_t* text, element_type* pbuffer_)
       : pbuffer(pbuffer_)
     {
+      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
       ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
       clear_unused_bits_in_msb();
     }
@@ -3597,9 +3625,10 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char32_t* text, element_type* pbuffer_) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext(const char32_t* text, element_type* pbuffer_)
       : pbuffer(pbuffer_)
     {
+      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
       ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
       clear_unused_bits_in_msb();
     }
diff --git a/test/test_bit_stream_reader_big_endian.cpp b/test/test_bit_stream_reader_big_endian.cpp
index c71977b1..4cdf3d29 100644
--- a/test/test_bit_stream_reader_big_endian.cpp
+++ b/test/test_bit_stream_reader_big_endian.cpp
@@ -94,7 +94,7 @@ namespace etl
 
 namespace
 {
-  SUITE(test_bit_stream_reader)
+  SUITE(test_bit_stream_reader_big_endian)
   {
     //*************************************************************************
     TEST(test_read_bool)
diff --git a/test/test_bit_stream_reader_little_endian.cpp b/test/test_bit_stream_reader_little_endian.cpp
index 776d2023..22c724ff 100644
--- a/test/test_bit_stream_reader_little_endian.cpp
+++ b/test/test_bit_stream_reader_little_endian.cpp
@@ -95,7 +95,7 @@ namespace etl
 
 namespace
 {
-  SUITE(test_bit_stream_reader)
+  SUITE(test_bit_stream_reader_little_endian)
   {
     //*************************************************************************
     TEST(test_read_bool)
diff --git a/test/test_bit_stream_writer_big_endian.cpp b/test/test_bit_stream_writer_big_endian.cpp
index be7ff681..675edbbb 100644
--- a/test/test_bit_stream_writer_big_endian.cpp
+++ b/test/test_bit_stream_writer_big_endian.cpp
@@ -114,7 +114,7 @@ namespace
     std::vector<char> data;
   };
 
-  SUITE(test_bit_stream_big_endian)
+  SUITE(test_bit_stream_writer_big_endian)
   {
     //*************************************************************************
     TEST(test_bit_stream_writer_construction)
diff --git a/test/test_bit_stream_writer_little_endian.cpp b/test/test_bit_stream_writer_little_endian.cpp
index e66c46c2..3051bc7f 100644
--- a/test/test_bit_stream_writer_little_endian.cpp
+++ b/test/test_bit_stream_writer_little_endian.cpp
@@ -114,7 +114,7 @@ namespace
     std::vector<char> data;
   };
 
-  SUITE(test_bit_stream_little_endian)
+  SUITE(test_bit_stream_writer_little_endian)
   {
     //*************************************************************************
     TEST(test_bit_stream_writer_construction)
diff --git a/test/test_bitset_legacy.cpp b/test/test_bitset_legacy.cpp
index ce664c4c..a64722ba 100644
--- a/test/test_bitset_legacy.cpp
+++ b/test/test_bitset_legacy.cpp
@@ -143,6 +143,50 @@ namespace
       }
     }
 
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_char_string)
+    {
+      const char* s = nullptr;
+
+      etl::bitset<60> data(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_wchar_t_string)
+    {
+      const wchar_t* s = nullptr;
+
+      etl::bitset<60> data(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_char16_t_string)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset<60> data(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_char32_t_string)
+    {
+      const char32_t* s = nullptr;
+
+      etl::bitset<60> data(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
     //*************************************************************************
     TEST(test_construct_from_excess_string)
     {
@@ -206,7 +250,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_char_string_set)
+    TEST(test_set_with_char_string)
     {
       std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<60> data;
@@ -226,7 +270,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_wchar_t_string_set)
+    TEST(test_set_with_wchar_t_string)
     {
       std::bitset<60> compare(L"110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<60> data;
@@ -246,7 +290,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_char16_t_string_set)
+    TEST(test_set_with_char16_t_string)
     {
       std::bitset<60> compare(u"110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<60> data;
@@ -266,7 +310,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_char32_t_string_set)
+    TEST(test_set_with_char32_t_string)
     {
       std::bitset<60> compare(U"110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<60> data;
@@ -286,7 +330,55 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_char_string)
+    TEST(test_set_from_char_nullptr)
+    {
+      const char* s = nullptr;
+
+      etl::bitset<60> data;
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_set_from_wchar_t_nullptr)
+    {
+      const wchar_t* s = nullptr;
+
+      etl::bitset<60> data;
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_set_from_char16_t_nullptr)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset<60> data;
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_set_from_char32_t_nullptr)
+    {
+      const char32_t* s = nullptr;
+
+      etl::bitset<60> data;
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_char)
     {
       std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<60> data;
@@ -306,7 +398,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_wchar_t_string)
+    TEST(test_from_string_with_wchar_t)
     {
       std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<60> data;
@@ -346,7 +438,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_char32_t_string)
+    TEST(test_from_string_with_char32_t)
     {
       std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<60> data;
@@ -365,6 +457,54 @@ namespace
       }
     }
 
+    //*************************************************************************
+    TEST(test_from_string_with_char_nullptr)
+    {
+      const char* s = nullptr;
+
+      etl::bitset<60> data;
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_wchar_t_nullptr)
+    {
+      const wchar_t* s = nullptr;
+
+      etl::bitset<60> data;
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_char16_t_nullptr)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset<60> data;
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_char32_t_nullptr)
+    {
+      const char32_t* s = nullptr;
+
+      etl::bitset<60> data;
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
     //*************************************************************************
     TEST(test_value_u8_min)
     {
diff --git a/test/test_bitset_new_default_element_type.cpp b/test/test_bitset_new_default_element_type.cpp
index 67f703a3..95da4aad 100644
--- a/test/test_bitset_new_default_element_type.cpp
+++ b/test/test_bitset_new_default_element_type.cpp
@@ -925,6 +925,51 @@ namespace
       }
     }
 
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_char_string)
+    {
+      const char* s = nullptr;
+
+      etl::bitset<60> data(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_wchar_t_string)
+    {
+      const wchar_t* s = nullptr;
+
+      etl::bitset<60> data(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_char16_t_string)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset<60> data(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_char32_t_string)
+    {
+      const char32_t* s = nullptr;
+
+      etl::bitset<60> data(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
     //*************************************************************************
     TEST(test_construct_from_excess_string)
     {
@@ -965,7 +1010,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_char_string_set)
+    TEST(test_set_with_char_string)
     {
       std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<60> data;
@@ -985,7 +1030,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_wchar_t_string_set)
+    TEST(test_set_with_wchar_t_string)
     {
       std::bitset<60> compare(L"110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<60> data;
@@ -1005,7 +1050,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_char16_t_string_set)
+    TEST(test_set_with_char16_t_string)
     {
       std::bitset<60> compare(u"110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<60> data;
@@ -1025,7 +1070,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_char32_t_string_set)
+    TEST(test_set_with_char32_t_string)
     {
       std::bitset<60> compare(U"110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<60> data;
@@ -1045,7 +1090,55 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_char_string)
+    TEST(test_set_from_char_nullptr)
+    {
+      const char* s = nullptr;
+
+      etl::bitset<60> data;
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_set_from_wchar_t_nullptr)
+    {
+      const wchar_t* s = nullptr;
+
+      etl::bitset<60> data;
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_set_from_char16_t_nullptr)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset<60> data;
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_set_from_char32_t_nullptr)
+    {
+      const char32_t* s = nullptr;
+
+      etl::bitset<60> data;
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_char)
     {
       std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<60> data;
@@ -1065,7 +1158,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_wchar_t_string)
+    TEST(test_from_string_with_wchar_t)
     {
       std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<60> data;
@@ -1105,7 +1198,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_char32_t_string)
+    TEST(test_from_string_with_char32_t)
     {
       std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<60> data;
@@ -1124,6 +1217,54 @@ namespace
       }
     }
 
+    //*************************************************************************
+    TEST(test_from_string_with_char_nullptr)
+    {
+      const char* s = nullptr;
+
+      etl::bitset<60> data;
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_wchar_t_nullptr)
+    {
+      const wchar_t* s = nullptr;
+
+      etl::bitset<60> data;
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_char16_t_nullptr)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset<60> data;
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_char32_t_nullptr)
+    {
+      const char32_t* s = nullptr;
+
+      etl::bitset<60> data;
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
     //*************************************************************************
     TEST(test_value_u16_min)
     {
diff --git a/test/test_bitset_new_explicit_single_element_type.cpp b/test/test_bitset_new_explicit_single_element_type.cpp
index b9c0c84b..78de4ef3 100644
--- a/test/test_bitset_new_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_explicit_single_element_type.cpp
@@ -255,6 +255,50 @@ namespace
       }
     }
 
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_char_string)
+    {
+      const char* s = nullptr;
+
+      etl::bitset<60, int64_t> data(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_wchar_t_string)
+    {
+      const wchar_t* s = nullptr;
+
+      etl::bitset<60, int64_t> data(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_char16_t_string)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset<60, int64_t> data(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_char32_t_string)
+    {
+      const char32_t* s = nullptr;
+
+      etl::bitset<60, int64_t> data(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
     //*************************************************************************
     TEST(test_construct_from_excess_string)
     {
@@ -310,7 +354,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_char_string_set)
+    TEST(test_set_with_char_string)
     {
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<64, int64_t> data;
@@ -330,7 +374,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_wchar_t_string_set)
+    TEST(test_set_with_wchar_t_string)
     {
       std::bitset<64> compare(L"110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<64, int64_t> data;
@@ -350,7 +394,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_char16_t_string_set)
+    TEST(test_set_with_char16_t_string)
     {
       std::bitset<64> compare(u"110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<64, int64_t> data;
@@ -370,7 +414,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_char32_t_string_set)
+    TEST(test_set_with_char32_t_string)
     {
       std::bitset<64> compare(U"110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<64, int64_t> data;
@@ -390,7 +434,55 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_char_string)
+    TEST(test_set_from_char_nullptr)
+    {
+      const char* s = nullptr;
+
+      etl::bitset<60, int64_t> data;
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_set_from_wchar_t_nullptr)
+    {
+      const wchar_t* s = nullptr;
+
+      etl::bitset<60, int64_t> data;
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_set_from_char16_t_nullptr)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset<60, int64_t> data;
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_set_from_char32_t_nullptr)
+    {
+      const char32_t* s = nullptr;
+
+      etl::bitset<60, int64_t> data;
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_char)
     {
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<64, int64_t> data;
@@ -410,7 +502,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_wchar_t_string)
+    TEST(test_from_string_with_wchar_t)
     {
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<64, int64_t> data;
@@ -450,7 +542,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_char32_t_string)
+    TEST(test_from_string_with_char32_t)
     {
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<64, int64_t> data;
@@ -469,6 +561,54 @@ namespace
       }
     }
 
+    //*************************************************************************
+    TEST(test_from_string_with_char_nullptr)
+    {
+      const char* s = nullptr;
+
+      etl::bitset<60, int64_t> data;
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_wchar_t_nullptr)
+    {
+      const wchar_t* s = nullptr;
+
+      etl::bitset<60, int64_t> data;
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_char16_t_nullptr)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset<60, int64_t> data;
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_char32_t_nullptr)
+    {
+      const char32_t* s = nullptr;
+
+      etl::bitset<60, int64_t> data;
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
     //*************************************************************************
     TEST(test_value_u8_min)
     {
diff --git a/test/test_bitset_new_ext_default_element_type.cpp b/test/test_bitset_new_ext_default_element_type.cpp
index aeeea766..8eb3cbb6 100644
--- a/test/test_bitset_new_ext_default_element_type.cpp
+++ b/test/test_bitset_new_ext_default_element_type.cpp
@@ -767,6 +767,23 @@ namespace
       CHECK_EQUAL(1U, (etl::bitset_ext<64, int64_t>::Number_Of_Elements));
     }
 
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_buffer)
+    {
+      using BsExt = etl::bitset_ext<64>;
+
+      BsExt::buffer_type buffer;
+      BsExt bs2a(buffer);
+
+      CHECK_THROW(BsExt bs1(nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs2b(bs2a, nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs3(0ULL,  nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs4("0",   nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs5(L"0",  nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs6(u"0",  nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs7(U"0",  nullptr), etl::bitset_invalid_buffer);
+    }
+
     //*************************************************************************
     TEST(test_construct_from_value)
     {
@@ -888,6 +905,58 @@ namespace
       }
     }
 
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_char_string)
+    {
+      etl::bitset_ext<60>::buffer_type buffer;
+
+      const char* s = nullptr;
+
+      etl::bitset_ext<60> data(s, buffer);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_wchar_t_string)
+    {
+      etl::bitset_ext<60>::buffer_type buffer;
+
+      const wchar_t* s = nullptr;
+
+      etl::bitset_ext<60> data(s, buffer);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_char16_t_string)
+    {
+      etl::bitset_ext<60>::buffer_type buffer;
+
+      const char16_t* s = nullptr;
+
+      etl::bitset_ext<60> data(s, buffer);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_char32_t_string)
+    {
+      etl::bitset_ext<60>::buffer_type buffer;
+
+      const char32_t* s = nullptr;
+
+      etl::bitset_ext<60> data(s, buffer);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
     //*************************************************************************
     TEST(test_construct_from_excess_string)
     {
@@ -932,7 +1001,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_char_string_set)
+    TEST(test_set_with_char_string)
     {
       etl::bitset_ext<60>::buffer_type buffer;
 
@@ -954,7 +1023,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_wchar_t_string_set)
+    TEST(test_set_with_wchar_t_string)
     {
       etl::bitset_ext<60>::buffer_type buffer;
 
@@ -976,7 +1045,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_char16_t_string_set)
+    TEST(test_set_with_char16_t_string)
     {
       etl::bitset_ext<60>::buffer_type buffer;
 
@@ -998,7 +1067,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_char32_t_string_set)
+    TEST(test_set_with_char32_t_string)
     {
       etl::bitset_ext<60>::buffer_type buffer;
 
@@ -1020,7 +1089,59 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_char_string)
+    TEST(test_set_from_char_nullptr)
+    {
+      const char* s = nullptr;
+
+      etl::bitset_ext<60>::buffer_type buffer;
+      etl::bitset_ext<60> data(buffer);
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_set_from_wchar_t_nullptr)
+    {
+      const wchar_t* s = nullptr;
+
+      etl::bitset_ext<60>::buffer_type buffer;
+      etl::bitset_ext<60> data(buffer);
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_set_from_char16_t_nullptr)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset_ext<60>::buffer_type buffer;
+      etl::bitset_ext<60> data(buffer);
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_set_from_char32_t_nullptr)
+    {
+      const char32_t* s = nullptr;
+
+      etl::bitset_ext<60>::buffer_type buffer;
+      etl::bitset_ext<60> data(buffer);
+      data.set(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_char)
     {
       etl::bitset_ext<60>::buffer_type buffer;
 
@@ -1042,7 +1163,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_wchar_t_string)
+    TEST(test_from_string_with_wchar_t)
     {
       etl::bitset_ext<60>::buffer_type buffer;
 
@@ -1086,7 +1207,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_char32_t_string)
+    TEST(test_from_string_with_char32_t)
     {
       etl::bitset_ext<60>::buffer_type buffer;
 
@@ -1107,6 +1228,58 @@ namespace
       }
     }
 
+    //*************************************************************************
+    TEST(test_from_string_with_char_nullptr)
+    {
+      const char* s = nullptr;
+
+      etl::bitset_ext<60>::buffer_type buffer;
+      etl::bitset_ext<60> data(buffer);
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_wchar_t_nullptr)
+    {
+      const wchar_t* s = nullptr;
+
+      etl::bitset_ext<60>::buffer_type buffer;
+      etl::bitset_ext<60> data(buffer);
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_char16_t_nullptr)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset_ext<60>::buffer_type buffer;
+      etl::bitset_ext<60> data(buffer);
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_char32_t_nullptr)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset_ext<60>::buffer_type buffer;
+      etl::bitset_ext<60> data(buffer);
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
     //*************************************************************************
     TEST(test_value_u16_min)
     {
diff --git a/test/test_bitset_new_ext_explicit_single_element_type.cpp b/test/test_bitset_new_ext_explicit_single_element_type.cpp
index b7bc74ef..0eaf1d19 100644
--- a/test/test_bitset_new_ext_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_ext_explicit_single_element_type.cpp
@@ -44,6 +44,23 @@ namespace
 
   SUITE(test_bitset_new_ext_explicit_element_type)
   {
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_buffer)
+    {
+      using BsExt = etl::bitset_ext<64, int64_t>;
+
+      BsExt::buffer_type buffer;
+      BsExt bs2a(buffer);
+
+      CHECK_THROW(BsExt bs1(nullptr) , etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs2b(bs2a, nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs3(0ULL,  nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs4("0",   nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs5(L"0",  nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs6(u"0",  nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs7(U"0",  nullptr), etl::bitset_invalid_buffer);
+    }
+
     //*************************************************************************
     TEST(test_default_constructor_from_array)
     {
@@ -210,6 +227,54 @@ namespace
       }
     }
 
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_char_string)
+    {
+      const char* s = nullptr;
+
+      etl::bitset_ext<60, int64_t>::buffer_type buffer;
+      etl::bitset_ext<60, int64_t> data(s, buffer);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_wchar_t_string)
+    {
+      const wchar_t* s = nullptr;
+
+      etl::bitset_ext<60, int64_t>::buffer_type buffer;
+      etl::bitset_ext<60, int64_t> data(s, buffer);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_char16_t_string)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset_ext<60, int64_t>::buffer_type buffer;
+      etl::bitset_ext<60, int64_t> data(s, buffer);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_construct_from_nullptr_char32_t_string)
+    {
+      const char32_t* s = nullptr;
+
+      etl::bitset_ext<60, int64_t>::buffer_type buffer;
+      etl::bitset_ext<60, int64_t> data(s, buffer);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
     //*************************************************************************
     TEST(test_construct_from_excess_string)
     {
@@ -260,7 +325,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_char_string_set)
+    TEST(test_set_with_char_string)
     {
       etl::bitset_ext<64, int64_t>::buffer_type buffer;
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
@@ -281,7 +346,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_wchar_t_string_set)
+    TEST(test_set_with_wchar_t_string)
     {
       etl::bitset_ext<64, int64_t>::buffer_type buffer;
       std::bitset<64> compare(L"110001001000110100010101100111001100010010001101000101011001");
@@ -302,7 +367,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_char16_t_string_set)
+    TEST(test_set_with_char16_t_string)
     {
       etl::bitset_ext<64, int64_t>::buffer_type buffer;
       std::bitset<64> compare(u"110001001000110100010101100111001100010010001101000101011001");
@@ -323,7 +388,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_char32_t_string_set)
+    TEST(test_set_with_char32_t_string)
     {
       etl::bitset_ext<64, int64_t>::buffer_type buffer;
       std::bitset<64> compare(U"110001001000110100010101100111001100010010001101000101011001");
@@ -344,7 +409,59 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_char_string)
+    TEST(test_set_from_char_nullptr)
+    {
+      const char* s = nullptr;
+
+      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, int64_t> data(buffer);
+      data.set(s);
+
+      CHECK_EQUAL(64, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_set_from_wchar_t_nullptr)
+    {
+      const wchar_t* s = nullptr;
+
+      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, int64_t> data(buffer);
+      data.set(s);
+
+      CHECK_EQUAL(64, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_set_from_char16_t_nullptr)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, int64_t> data(buffer);
+      data.set(s);
+
+      CHECK_EQUAL(64, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_set_from_char32_t_nullptr)
+    {
+      const char32_t* s = nullptr;
+
+      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, int64_t> data(buffer);
+      data.set(s);
+
+      CHECK_EQUAL(64, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_char)
     {
       etl::bitset_ext<64, int64_t>::buffer_type buffer;
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
@@ -365,7 +482,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_wchar_t_string)
+    TEST(test_from_string_with_wchar_t)
     {
       etl::bitset_ext<64, int64_t>::buffer_type buffer;
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
@@ -386,7 +503,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_char16_t_6string)
+    TEST(test_from_string_with_char16_t)
     {
       etl::bitset_ext<64, int64_t>::buffer_type buffer;
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
@@ -407,7 +524,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_char32_t_string)
+    TEST(test_from_string_with_char32_t)
     {
       etl::bitset_ext<64, int64_t>::buffer_type buffer;
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
@@ -427,6 +544,58 @@ namespace
       }
     }
 
+    //*************************************************************************
+    TEST(test_from_string_with_char_nullptr)
+    {
+      const char* s = nullptr;
+
+      etl::bitset_ext<60, int64_t>::buffer_type buffer;
+      etl::bitset_ext<60, int64_t> data(buffer);
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_wchar_t_nullptr)
+    {
+      const wchar_t* s = nullptr;
+
+      etl::bitset_ext<60, int64_t>::buffer_type buffer;
+      etl::bitset_ext<60, int64_t> data(buffer);
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_char16_t_nullptr)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset_ext<60, int64_t>::buffer_type buffer;
+      etl::bitset_ext<60, int64_t> data(buffer);
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
+    //*************************************************************************
+    TEST(test_from_string_with_char32_t_nullptr)
+    {
+      const char16_t* s = nullptr;
+
+      etl::bitset_ext<60, int64_t>::buffer_type buffer;
+      etl::bitset_ext<60, int64_t> data(buffer);
+      data.from_string(s);
+
+      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(0, data.count());
+    }
+
     //*************************************************************************
     TEST(test_value_u8_min)
     {

From 7bb125a360cee571a9502e1c5ec54d1f20741dec Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sun, 17 Dec 2023 12:54:01 +0000
Subject: [PATCH 012/131] Added etl::generate algorithm

---
 include/etl/algorithm.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/include/etl/algorithm.h b/include/etl/algorithm.h
index cc989d15..dd01415a 100644
--- a/include/etl/algorithm.h
+++ b/include/etl/algorithm.h
@@ -169,6 +169,18 @@ namespace etl
     return first2;
   }
 
+  //***************************************************************************
+  // generate
+  template <typename TIterator, typename TFunction>
+  ETL_CONSTEXPR14
+  void generate(TIterator db, TIterator de, TFunction funct)
+  {
+    while (db != de)
+    {
+      *db++ = funct();
+    }
+  }
+
   //***************************************************************************
   // copy
 #if ETL_USING_STL && ETL_USING_CPP20 

From 480363a4e77ffc13258ddbb7686e357937c75cb2 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 18 Dec 2023 10:52:40 +0000
Subject: [PATCH 013/131] Added etl::generate algorithm

---
 test/test_algorithm.cpp | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/test/test_algorithm.cpp b/test/test_algorithm.cpp
index a49e0011..aef1fcfd 100644
--- a/test/test_algorithm.cpp
+++ b/test/test_algorithm.cpp
@@ -2198,5 +2198,31 @@ namespace
       bool is_same = std::equal(expected.begin(), expected.end(), data.begin());
       CHECK(is_same);
     }
+
+    //*************************************************************************
+    struct generator
+    {
+      generator(int value_)
+        : value(value_)
+      {
+      }
+
+      int operator()()
+      {
+        return value++;
+      }
+
+      int value;
+    };
+
+    TEST(generate)
+    {
+      std::array<int, 10> expected = { 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
+      std::array<int, 10> actual;
+
+      etl::generate(actual.begin(), actual.end(), generator(2));
+
+      CHECK_ARRAY_EQUAL(expected.data(), actual.data(), expected.size());
+    }
   };
 }

From d17f422dac2a46600702d1eeb232df945dbe2c31 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 18 Dec 2023 11:02:54 +0000
Subject: [PATCH 014/131] Added binary functors for ~ & | ^

---
 include/etl/binary.h | 105 ++++++++++++++++++++++++++++++++++++++++++
 test/test_binary.cpp | 106 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 211 insertions(+)

diff --git a/include/etl/binary.h b/include/etl/binary.h
index f6388562..df1569d7 100644
--- a/include/etl/binary.h
+++ b/include/etl/binary.h
@@ -2276,6 +2276,111 @@ namespace etl
     return msb_mask<T, NBits>::value;
   }
 
+  //***************************************************************************
+  /// Bit 'not' a value
+  ///\ingroup binary
+  //***************************************************************************
+  template <typename T>
+  struct binary_not : public etl::unary_function<T, T>
+  {
+    //***********************************
+    ETL_CONSTEXPR
+    ETL_NODISCARD
+    T operator ()(T value) ETL_NOEXCEPT
+    {
+      ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Not an integral type");
+
+      return ~value;
+    }
+  };
+
+  //***************************************************************************
+  /// Bit 'and' a value with another
+  ///\ingroup binary
+  //***************************************************************************
+  template <typename T>
+  struct binary_and : public etl::unary_function<T, T>
+  {
+    //***********************************
+    ETL_CONSTEXPR 
+    explicit binary_and(T parameter_) ETL_NOEXCEPT
+      : parameter(parameter_)
+    {
+    }
+
+    //***********************************
+    ETL_CONSTEXPR 
+    ETL_NODISCARD
+    T operator ()(T value) ETL_NOEXCEPT
+    {
+      ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Not an integral type");
+
+      return value & parameter;
+    }
+
+  private:
+
+    T parameter;
+  };
+
+  //***************************************************************************
+  /// Bit 'or' a value with another
+  ///\ingroup binary
+  //***************************************************************************
+  template <typename T>
+  struct binary_or : public etl::unary_function<T, T>
+  {
+    //***********************************
+    ETL_CONSTEXPR
+    explicit binary_or(T parameter_) ETL_NOEXCEPT
+      : parameter(parameter_)
+    {
+    }
+
+    //***********************************
+    ETL_CONSTEXPR
+    ETL_NODISCARD
+    T operator ()(T value) ETL_NOEXCEPT
+    {
+      ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Not an integral type");
+
+      return value | parameter;
+    }
+
+  private:
+
+    T parameter;
+  };
+
+  //***************************************************************************
+  /// Bit 'exclusive-or' a value with another
+  ///\ingroup binary
+  //***************************************************************************
+  template <typename T>
+  struct binary_xor : public etl::unary_function<T, T>
+  {
+    //***********************************
+    ETL_CONSTEXPR
+    explicit binary_xor(T parameter_) ETL_NOEXCEPT
+      : parameter(parameter_)
+    {
+    }
+
+    //***********************************
+    ETL_CONSTEXPR
+    ETL_NODISCARD
+    T operator ()(T value) ETL_NOEXCEPT
+    {
+      ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Not an integral type");
+
+      return value ^ parameter;
+    }
+
+  private:
+
+    T parameter;
+  };
+
   //***************************************************************************
   /// 8 bit binary byte constants.
   ///\ingroup binary
diff --git a/test/test_binary.cpp b/test/test_binary.cpp
index 56e5157d..3e93bbb7 100644
--- a/test/test_binary.cpp
+++ b/test/test_binary.cpp
@@ -31,6 +31,8 @@ SOFTWARE.
 #include <cstdint>
 #include <type_traits>
 #include <limits>
+#include <array>
+#include <algorithm>
 
 #include "etl/binary.h"
 #include "etl/bitset.h"
@@ -42,6 +44,15 @@ SOFTWARE.
 
 namespace
 {
+  template <typename TIterator, typename T>
+  void generate_input(TIterator first, TIterator last, T value)
+  {
+    while (first != last)
+    {
+      *first++ = value++;
+    }
+  }
+
   //***********************************
   // Count bits the easy way.
   template <typename T>
@@ -2894,6 +2905,101 @@ namespace
       CHECK_EQUAL(int64_t(0xFFFFFFFFFFFFFF00), (etl::make_msb_mask<int64_t, 56>()));
       CHECK_EQUAL(int64_t(0xFFFFFFFFFFFFFFFF), (etl::make_msb_mask<int64_t, 64>()));
     }
+
+    //*************************************************************************
+    TEST(test_binary_not)
+    {
+      std::array<uint8_t, 256> input;
+      generate_input(input.begin(), input.end(), 0);
+
+      std::array<uint8_t, 256> expected;
+      for (size_t i = 0; i < input.size(); ++i)
+      {
+        expected[i] = ~input[i];
+      }
+
+      std::array<uint8_t, 256> output;
+
+      std::transform(input.begin(),
+                     input.end(),
+                     output.begin(),
+                     etl::binary_not<uint8_t>());
+
+      CHECK_ARRAY_EQUAL(expected.data(), output.data(), expected.size());
+    }
+
+    //*************************************************************************
+    TEST(test_binary_and)
+    {
+      std::array<uint8_t, 256> input;
+      generate_input(input.begin(), input.end(), 0);
+
+      const uint8_t value = etl::b01101001;
+
+      std::array<uint8_t, 256> expected;
+      for (size_t i = 0; i < input.size(); ++i)
+      {
+        expected[i] = input[i] & value;
+      }
+
+      std::array<uint8_t, 256> output;
+
+      std::transform(input.begin(),
+                     input.end(), 
+                     output.begin(), 
+                     etl::binary_and<uint8_t>(value));
+
+      CHECK_ARRAY_EQUAL(expected.data(), output.data(), expected.size());
+    }
+
+    //*************************************************************************
+    TEST(test_binary_or)
+    {
+      std::array<uint8_t, 256> input;
+      generate_input(input.begin(), input.end(), 0);
+
+      const uint8_t value = etl::b01101001;
+
+      std::array<uint8_t, 256> expected;
+      for (size_t i = 0; i < input.size(); ++i)
+      {
+        expected[i] = input[i] | value;
+      }
+
+      std::array<uint8_t, 256> output;
+
+      std::transform(input.begin(),
+                     input.end(),
+                     output.begin(),
+                     etl::binary_or<uint8_t>(value));
+
+      CHECK_ARRAY_EQUAL(expected.data(), output.data(), expected.size());
+    }
+
+    //*************************************************************************
+    TEST(test_binary_xor)
+    {
+      std::array<uint8_t, 256> input;
+      generate_input(input.begin(), input.end(), 0);
+
+      const uint8_t value = etl::b01101001;
+
+      std::array<uint8_t, 256> expected;
+
+      for (size_t i = 0; i < input.size(); ++i)
+      {
+        expected[i] = input[i] ^ value;
+      }
+
+      std::array<uint8_t, 256> output;
+
+      std::transform(input.begin(),
+                     input.end(),
+                     output.begin(),
+                     etl::binary_xor<uint8_t>(value));
+
+      CHECK_ARRAY_EQUAL(expected.data(), output.data(), expected.size());
+    }
   };
 }
 

From c75617c2b62e7c235ec8cee760c5904925b22525 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 18 Dec 2023 11:07:42 +0000
Subject: [PATCH 015/131] #805 legacy etl::bitset set/reset does not work if
 the element type is greater than 8 bit

---
 include/etl/private/bitset_legacy.h | 18 ++++++++---------
 include/etl/private/bitset_new.h    |  8 ++++----
 test/vs2022/etl.vcxproj.filters     | 30 +++++++++++++++++++++++------
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/include/etl/private/bitset_legacy.h b/include/etl/private/bitset_legacy.h
index 30c152ae..2a37a6a3 100644
--- a/include/etl/private/bitset_legacy.h
+++ b/include/etl/private/bitset_legacy.h
@@ -151,10 +151,10 @@ namespace etl
     typedef typename etl::make_unsigned<ETL_BITSET_ELEMENT_TYPE>::type element_type;
     typedef element_type element_t; // Backward compatibility
 
-    static ETL_CONSTANT element_type ALL_SET = etl::integral_limits<element_type>::max;
+    static ETL_CONSTANT element_type ALL_SET   = etl::integral_limits<element_type>::max;
     static ETL_CONSTANT element_type ALL_CLEAR = 0;
 
-    static ETL_CONSTANT size_t    Bits_Per_Element = etl::integral_limits<element_type>::bits;
+    static ETL_CONSTANT size_t       Bits_Per_Element  = etl::integral_limits<element_type>::bits;
 
 #if ETL_USING_CPP11
     typedef etl::span<element_type>       span_type;
@@ -311,7 +311,7 @@ namespace etl
     //*************************************************************************
     ibitset& set()
     {
-      ::memset(pdata, 0xFF, Number_Of_Elements);
+      etl::fill_n(pdata, Number_Of_Elements - 1U, ALL_SET);
       pdata[Number_Of_Elements - 1U] = Top_Mask;
 
       return *this;
@@ -519,7 +519,7 @@ namespace etl
       return v;
     }
 
-    //*************************************************************************
+    //************************************************************************* 
     /// Put to a unsigned long.
     //*************************************************************************
     unsigned long to_ulong() const
@@ -540,7 +540,7 @@ namespace etl
     //*************************************************************************
     ibitset& reset()
     {
-      ::memset(pdata, 0, Number_Of_Elements * sizeof(element_type));
+      etl::fill_n(pdata, Number_Of_Elements, ALL_CLEAR);
 
       return *this;
     }
@@ -582,10 +582,10 @@ namespace etl
     //*************************************************************************
     ibitset& flip()
     {
-      for (size_t i = 0UL; i < Number_Of_Elements; ++i)
-      {
-        pdata[i] = ~pdata[i];
-      }
+      etl::transform_n(pdata, 
+                       Number_Of_Elements, 
+                       pdata, 
+                       etl::binary_not<element_type>());
 
       clear_unused_bits_in_msb();
 
diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 28497238..2887c97d 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -440,10 +440,10 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 void flip(pointer pbuffer, size_t number_of_elements) ETL_NOEXCEPT
     {
-      for (size_t i = 0UL; i < number_of_elements; ++i)
-      {
-        pbuffer[i] = ~pbuffer[i];
-      }
+      etl::transform_n(pbuffer,
+                       number_of_elements,
+                       pbuffer, 
+                       etl::binary_not<element_type>());
     }
 
     //*************************************************************************
diff --git a/test/vs2022/etl.vcxproj.filters b/test/vs2022/etl.vcxproj.filters
index 2adfa862..5c457a21 100644
--- a/test/vs2022/etl.vcxproj.filters
+++ b/test/vs2022/etl.vcxproj.filters
@@ -3340,12 +3340,6 @@
     <None Include="..\..\appveyor.yml">
       <Filter>Resource Files\CI\Appveyor</Filter>
     </None>
-    <None Include="..\..\.github\workflows\clang.yml">
-      <Filter>Resource Files\CI\Github</Filter>
-    </None>
-    <None Include="..\..\.github\workflows\gcc.yml">
-      <Filter>Resource Files\CI\Github</Filter>
-    </None>
     <None Include="..\..\.clang-format">
       <Filter>Resource Files</Filter>
     </None>
@@ -3412,6 +3406,30 @@
     <None Include="..\..\scripts\update_version.py">
       <Filter>Tests\Scripts</Filter>
     </None>
+    <None Include="..\..\.github\workflows\clang-c++11.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\clang-c++14.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\clang-c++17.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\clang-c++20.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++11.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++14.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++17.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++20.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\support\Release notes.txt">

From d3b3fdbd40ac3ce849357a045ba39c16aca0f829 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 18 Dec 2023 11:28:12 +0000
Subject: [PATCH 016/131] Fixed 'nodiscard' keyword errors

---
 include/etl/binary.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/etl/binary.h b/include/etl/binary.h
index df1569d7..37e6b00f 100644
--- a/include/etl/binary.h
+++ b/include/etl/binary.h
@@ -2284,8 +2284,8 @@ namespace etl
   struct binary_not : public etl::unary_function<T, T>
   {
     //***********************************
-    ETL_CONSTEXPR
     ETL_NODISCARD
+    ETL_CONSTEXPR
     T operator ()(T value) ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Not an integral type");
@@ -2309,8 +2309,8 @@ namespace etl
     }
 
     //***********************************
-    ETL_CONSTEXPR 
     ETL_NODISCARD
+    ETL_CONSTEXPR 
     T operator ()(T value) ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Not an integral type");
@@ -2338,8 +2338,8 @@ namespace etl
     }
 
     //***********************************
-    ETL_CONSTEXPR
     ETL_NODISCARD
+    ETL_CONSTEXPR
     T operator ()(T value) ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Not an integral type");
@@ -2367,8 +2367,8 @@ namespace etl
     }
 
     //***********************************
-    ETL_CONSTEXPR
     ETL_NODISCARD
+    ETL_CONSTEXPR
     T operator ()(T value) ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Not an integral type");

From 6d941298ea5a412aff43a85e76f152979db6aa1f Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Wed, 29 Nov 2023 18:21:47 +0000
Subject: [PATCH 017/131] Improved display of CHECK_EQUAL_HEX in unittest++

---
 test/UnitTest++/Checks.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/UnitTest++/Checks.h b/test/UnitTest++/Checks.h
index a2571e02..88f1a1c3 100644
--- a/test/UnitTest++/Checks.h
+++ b/test/UnitTest++/Checks.h
@@ -190,7 +190,9 @@ namespace UnitTest
      if (!(expected == actual))
      {
        UnitTest::MemoryOutStream stream;
-       stream << std::hex << std::uppercase << std::setfill('0') << "Expected 0x" << std::setw(2 * sizeof(Expected)) << expected << " but was 0x" << std::setw(2 * sizeof(Actual)) << actual;
+       stream << std::hex << std::uppercase << std::setfill('0') 
+              << "Expected 0x" << std::setw(2 * sizeof(Expected)) << (expected & ~(typename std::make_unsigned<Expected>::type(0))) 
+              << " but was 0x" << std::setw(2 * sizeof(Actual))   << (actual   & ~(typename std::make_unsigned<Actual>::type(0)));
 
        results.OnTestFailure(details, stream.GetText());
      }
@@ -214,7 +216,8 @@ namespace UnitTest
      if (expected == actual)
      {
        UnitTest::MemoryOutStream stream;
-       stream << std::hex << std::uppercase << std::setfill('0') << std::setw(2 * sizeof(Actual)) << "Expected not equal, but both values are " << actual;
+       stream << std::hex << std::uppercase << std::setfill('0') << std::setw(2 * sizeof(Actual)) 
+              << "Expected not equal, but both values are " << (actual & ~(typename std::make_unsigned<Actual>::type(0)));
 
        results.OnTestFailure(details, stream.GetText());
      }

From a5b425f03e310c98905dc500eaaf1d43ada15d47 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Wed, 29 Nov 2023 18:22:34 +0000
Subject: [PATCH 018/131] Work in progress for etl::bitset::extract

---
 include/etl/private/bitset_new.h              | 307 +++++++++++++++++-
 test/test_bitset_new_default_element_type.cpp |  70 ++++
 ...itset_new_explicit_single_element_type.cpp |  69 ++++
 ...st_bitset_new_ext_default_element_type.cpp |  74 +++++
 ...t_new_ext_explicit_single_element_type.cpp |  74 +++++
 test/vs2022/etl.vcxproj                       |  22 +-
 6 files changed, 588 insertions(+), 28 deletions(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 2887c97d..530f5c6a 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -206,7 +206,7 @@ namespace etl
       size_t    index = 0;
       element_type bit = 0;
 
-      if (number_of_elements == 0)
+      if (number_of_elements == 0) ETL_UNLIKELY
       {
         return;
       }
@@ -243,12 +243,12 @@ namespace etl
       else
       {
         size_t string_length = etl::strlen(text);
-        size_t element_index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
+        size_t index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
 
         // Only reset elements we need to.
-        while (element_index != number_of_elements)
+        while (index != number_of_elements)
         {
-          pbuffer[element_index++] = All_Clear_Element;
+          pbuffer[index++] = All_Clear_Element;
         }
 
         // Build from the string.
@@ -273,12 +273,12 @@ namespace etl
       else
       {
         size_t string_length = etl::strlen(text);
-        size_t element_index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
+        size_t index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
 
         // Only reset elements we need to.
-        while (element_index != number_of_elements)
+        while (index != number_of_elements)
         {
-          pbuffer[element_index++] = All_Clear_Element;
+          pbuffer[index++] = All_Clear_Element;
         }
 
         // Build from the string.
@@ -303,12 +303,12 @@ namespace etl
       else
       {
         size_t string_length = etl::strlen(text);
-        size_t element_index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
+        size_t index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
 
         // Only reset elements we need to.
-        while (element_index != number_of_elements)
+        while (index != number_of_elements)
         {
-          pbuffer[element_index++] = All_Clear_Element;
+          pbuffer[index++] = All_Clear_Element;
         }
 
         // Build from the string.
@@ -333,12 +333,12 @@ namespace etl
       else
       {
         size_t string_length = etl::strlen(text);
-        size_t element_index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
+        size_t index = etl::min(number_of_elements - 1U, (string_length / Bits_Per_Element));
 
         // Only reset elements we need to.
-        while (element_index != number_of_elements)
+        while (index != number_of_elements)
         {
-          pbuffer[element_index++] = All_Clear_Element;
+          pbuffer[index++] = All_Clear_Element;
         }
 
         // Build from the string.
@@ -409,6 +409,141 @@ namespace etl
       return v;
     }
 
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    T extract_from_single_element(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
+    {
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value(0);
+
+      const unsigned_t value_mask = etl::integral_limits<unsigned_t>::max;
+      const int        element_index = (position + length - 1) >> etl::log2<Bits_Per_Element>::value;
+      const unsigned_t Shift = position % Bits_Per_Element;
+
+      value = static_cast<unsigned_t>(pbuffer[element_index] >> Shift) & value_mask;
+
+      return static_cast<T>(value);
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    T extract_from_multi_element(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
+    {
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value(0);
+
+      // The mask for the value type.
+      const unsigned_t value_mask = etl::integral_limits<unsigned_t>::max;
+
+      // Find the index of the element containing the msb.
+      int element_index = (position + length - 1) >> etl::log2<Bits_Per_Element>::value;
+
+      // The value is spread over multiple elements.       
+      element_type bit_mask = element_type(1) << ((position + length - 1) % Bits_Per_Element);
+
+      while (length != 0)
+      {
+        // TODO Optimise this to read whole element values.
+
+        value <<= 1;
+
+        const bool is_set = (pbuffer[element_index] & bit_mask) != 0;
+
+        if (is_set)
+        {
+          value |= unsigned_t(1);
+        }
+
+        bit_mask >>= 1;
+
+        if (bit_mask == 0)
+        {
+          bit_mask = element_type(1) << (Bits_Per_Element - 1);
+          --element_index;
+        }
+
+        --length;
+      }
+
+      return static_cast<T>(value);
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T, size_t Position, size_t Length>
+    ETL_CONSTEXPR14
+    T extract_from_single_element(const_pointer pbuffer) const
+    {
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value(0);
+
+      const unsigned_t value_mask    = etl::integral_limits<unsigned_t>::max;
+      const int        element_index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
+      const unsigned_t Shift         = Position % Bits_Per_Element;
+
+      value = static_cast<unsigned_t>(pbuffer[element_index] >> Shift) & value_mask;
+
+      return static_cast<T>(value);
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T, size_t Position, size_t Length>
+    ETL_CONSTEXPR14
+    T extract_from_multi_element(const_pointer pbuffer) const
+    {
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value(0);
+
+      // The mask for the value type.
+      const unsigned_t value_mask = etl::integral_limits<unsigned_t>::max;
+
+      // Find the index of the element containing the msb.
+      int element_index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
+
+      // The value is spread over multiple elements.       
+      size_t       length   = Length;
+      element_type bit_mask = element_type(1) << ((Position + Length - 1) % Bits_Per_Element);
+
+      while (length != 0)
+      {
+        // TODO Optimise this to read whole element values.
+
+        value <<= 1;
+
+        const bool is_set = (pbuffer[element_index] & bit_mask) != 0;
+
+        if (is_set)
+        {
+          value |= unsigned_t(1);
+        }      
+
+        bit_mask >>= 1;
+
+        if (bit_mask == 0)
+        {
+          bit_mask = element_type(1) << (Bits_Per_Element - 1);
+          --element_index;
+        }
+
+        --length;
+      }
+
+      return static_cast<T>(value);
+    }
+
     //*************************************************************************
     /// Reset the bit at the position.
     //*************************************************************************
@@ -417,7 +552,7 @@ namespace etl
       size_t       index = 0U;
       element_type bit = element_type(0);
 
-      if (number_of_elements == 0)
+      if (number_of_elements == 0) ETL_UNLIKELY
       {
         return;
       }
@@ -454,7 +589,7 @@ namespace etl
       size_t       index = 0U;
       element_type bit = element_type(0);
       
-      if (number_of_elements == 0)
+      if (number_of_elements == 0) ETL_UNLIKELY
       {
         return;
       }
@@ -1265,7 +1400,7 @@ namespace etl
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-      typename etl::enable_if<etl::is_integral<T>::value, T>::type
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
       value() const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Only integral types are supported");
@@ -1283,6 +1418,40 @@ namespace etl
       return v;
     }
 
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract(size_t position, size_t length = etl::integral_limits<T>::bits) const
+    {
+      ETL_ASSERT_OR_RETURN_VALUE(length <= etl::integral_limits<T>::bits, ETL_ERROR(bitset_overflow), 0);
+      ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits,      ETL_ERROR(bitset_overflow), 0);
+
+      element_type mask = (~(~0u << length) << position);
+      T value((buffer & mask) >> position);
+
+      return value;
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract() const ETL_NOEXCEPT
+    {
+      ETL_STATIC_ASSERT(Length <= etl::integral_limits<T>::bits, "Length is larger that the required type");
+      ETL_STATIC_ASSERT((Position + Length) <= Active_Bits,      "Position/Length overflows bitset");
+      
+      element_type mask = (~(~0u << Length) << Position);
+      T value((buffer & mask) >> Position);
+
+      return value;
+    }
+
     //*************************************************************************
     /// Get as an unsigned long.
     //*************************************************************************
@@ -2041,6 +2210,42 @@ namespace etl
       return ibitset.template value<T>(buffer, Number_Of_Elements);
     }
 
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract(size_t position, size_t length = etl::integral_limits<T>::bits) const
+    {
+      ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
+
+      return ibitset.extract_from_multi_element<T>(buffer, position, length);
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
+    ETL_CONSTEXPR14
+      typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract() const ETL_NOEXCEPT
+    {
+      ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
+
+      const int active_bits_in_element = ((Position + Length) % Bits_Per_Element);
+
+      // Is the value contained within one element?
+      if (active_bits_in_element == Length)
+      {
+        return ibitset.extract_from_single_element<T, Position, Length>(buffer);
+      }
+      else
+      {
+        return ibitset.extract_from_multi_element<T, Position, Length>(buffer);
+      }
+    }
+
     //*************************************************************************
     /// Get as an unsigned long.
     //*************************************************************************
@@ -3002,6 +3207,38 @@ namespace etl
       return v;
     }
 
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract(size_t position, size_t length = etl::integral_limits<T>::bits) const
+    {
+      ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
+
+      element_type mask = (~(~0u << length) << position);
+      T v((*pbuffer & mask) >> position);
+
+      return v;
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
+    ETL_CONSTEXPR14
+      typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract() const ETL_NOEXCEPT
+    {
+      ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
+
+      element_type mask = (~(~0u << Length) << Position);
+      T v((*pbuffer & mask) >> Position);
+
+      return v;
+    }
+
     //*************************************************************************
     /// Get as an unsigned long.
     //*************************************************************************
@@ -3762,7 +3999,7 @@ namespace etl
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-      typename etl::enable_if<etl::is_integral<T>::value, T>::type
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
       value() const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Only integral types are supported");
@@ -3771,6 +4008,42 @@ namespace etl
       return ibitset.template value<T>(pbuffer, Number_Of_Elements);
     }
 
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract(size_t position, size_t length = etl::integral_limits<T>::bits) const
+    {
+      ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
+
+      return ibitset.extract_from_multi_element<T>(pbuffer, position, length);
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
+      extract() const ETL_NOEXCEPT
+    {
+      ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
+
+      const int active_bits_in_element = ((Position + Length) % Bits_Per_Element);
+
+      // Is the value contained within one element?
+      if (active_bits_in_element == Length)
+      {
+        return ibitset.extract_from_single_element<T, Position, Length>(pbuffer);
+      }
+      else
+      {
+        return ibitset.extract_from_multi_element<T, Position, Length>(pbuffer);
+      }
+    }
+
     //*************************************************************************
     /// Get as an unsigned long.
     //*************************************************************************
diff --git a/test/test_bitset_new_default_element_type.cpp b/test/test_bitset_new_default_element_type.cpp
index 95da4aad..af437e94 100644
--- a/test/test_bitset_new_default_element_type.cpp
+++ b/test/test_bitset_new_default_element_type.cpp
@@ -2237,5 +2237,75 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(text.c_str()));
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
+
+    //*************************************************************************
+    TEST(test_extract_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint8_t(0x78), b.extract<uint8_t>( 0, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), b.extract<uint8_t>( 1, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), b.extract<uint8_t>( 2, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), b.extract<uint8_t>( 3, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x67), b.extract<uint8_t>( 4, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), b.extract<uint8_t>( 5, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x59), b.extract<uint8_t>( 6, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), b.extract<uint8_t>( 7, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x56), b.extract<uint8_t>( 8, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), b.extract<uint8_t>( 9, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x15), b.extract<uint8_t>(10, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), b.extract<uint8_t>(11, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x45), b.extract<uint8_t>(12, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), b.extract<uint8_t>(13, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), b.extract<uint8_t>(14, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x68), b.extract<uint8_t>(15, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x34), b.extract<uint8_t>(16, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), b.extract<uint8_t>(17, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), b.extract<uint8_t>(18, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x46), b.extract<uint8_t>(19, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x23), b.extract<uint8_t>(20, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x91), b.extract<uint8_t>(21, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x48), b.extract<uint8_t>(22, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
+      
+      CHECK_THROW(b.extract<uint8_t>(25, 8), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint8_t(0x78), (b.extract<uint8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), (b.extract<uint8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), (b.extract<uint8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x67), (b.extract<uint8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), (b.extract<uint8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x59), (b.extract<uint8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), (b.extract<uint8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x56), (b.extract<uint8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), (b.extract<uint8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x45), (b.extract<uint8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), (b.extract<uint8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), (b.extract<uint8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x68), (b.extract<uint8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), (b.extract<uint8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x46), (b.extract<uint8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x91), (b.extract<uint8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x48), (b.extract<uint8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
+
+      // The lines below should static assert.
+      //uint8_t v = b.extract<uint8_t, 25, 8>();
+      //uint8_t v = b.extract<uint8_t, 25, 9>();
+    }
   };
 }
diff --git a/test/test_bitset_new_explicit_single_element_type.cpp b/test/test_bitset_new_explicit_single_element_type.cpp
index 78de4ef3..3b4c91dd 100644
--- a/test/test_bitset_new_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_explicit_single_element_type.cpp
@@ -1725,5 +1725,74 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(text.c_str()));
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
+
+    //*************************************************************************
+    TEST(test_extract_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL(0x78, b.extract<uint8_t>(0, 8));
+      CHECK_EQUAL(0x3C, b.extract<uint8_t>(1, 8));
+      CHECK_EQUAL(0x9E, b.extract<uint8_t>(2, 8));
+      CHECK_EQUAL(0xCF, b.extract<uint8_t>(3, 8));
+      CHECK_EQUAL(0x67, b.extract<uint8_t>(4, 8));
+      CHECK_EQUAL(0xB3, b.extract<uint8_t>(5, 8));
+      CHECK_EQUAL(0x59, b.extract<uint8_t>(6, 8));
+      CHECK_EQUAL(0xAC, b.extract<uint8_t>(7, 8));
+      CHECK_EQUAL(0x56, b.extract<uint8_t>(8, 8));
+      CHECK_EQUAL(0x2B, b.extract<uint8_t>(9, 8));
+      CHECK_EQUAL(0x15, b.extract<uint8_t>(10, 8));
+      CHECK_EQUAL(0x8A, b.extract<uint8_t>(11, 8));
+      CHECK_EQUAL(0x45, b.extract<uint8_t>(12, 8));
+      CHECK_EQUAL(0xA2, b.extract<uint8_t>(13, 8));
+      CHECK_EQUAL(0xD1, b.extract<uint8_t>(14, 8));
+      CHECK_EQUAL(0x68, b.extract<uint8_t>(15, 8));
+      CHECK_EQUAL(0x34, b.extract<uint8_t>(16, 8));
+      CHECK_EQUAL(0x1A, b.extract<uint8_t>(17, 8));
+      CHECK_EQUAL(0x8D, b.extract<uint8_t>(18, 8));
+      CHECK_EQUAL(0x46, b.extract<uint8_t>(19, 8));
+      CHECK_EQUAL(0x23, b.extract<uint8_t>(20, 8));
+      CHECK_EQUAL(0x91, b.extract<uint8_t>(21, 8));
+      CHECK_EQUAL(0x48, b.extract<uint8_t>(22, 8));
+      CHECK_EQUAL(0x24, b.extract<uint8_t>(23, 8));
+      CHECK_EQUAL(0x12, b.extract<uint8_t>(24, 8));
+      CHECK_THROW(b.extract<uint8_t>(25, 8), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL(0x78, (b.extract<uint8_t, 0, 8>()));
+      CHECK_EQUAL(0x3C, (b.extract<uint8_t, 1, 8>()));
+      CHECK_EQUAL(0x9E, (b.extract<uint8_t, 2, 8>()));
+      CHECK_EQUAL(0xCF, (b.extract<uint8_t, 3, 8>()));
+      CHECK_EQUAL(0x67, (b.extract<uint8_t, 4, 8>()));
+      CHECK_EQUAL(0xB3, (b.extract<uint8_t, 5, 8>()));
+      CHECK_EQUAL(0x59, (b.extract<uint8_t, 6, 8>()));
+      CHECK_EQUAL(0xAC, (b.extract<uint8_t, 7, 8>()));
+      CHECK_EQUAL(0x56, (b.extract<uint8_t, 8, 8>()));
+      CHECK_EQUAL(0x2B, (b.extract<uint8_t, 9, 8>()));
+      CHECK_EQUAL(0x15, (b.extract<uint8_t, 10, 8>()));
+      CHECK_EQUAL(0x8A, (b.extract<uint8_t, 11, 8>()));
+      CHECK_EQUAL(0x45, (b.extract<uint8_t, 12, 8>()));
+      CHECK_EQUAL(0xA2, (b.extract<uint8_t, 13, 8>()));
+      CHECK_EQUAL(0xD1, (b.extract<uint8_t, 14, 8>()));
+      CHECK_EQUAL(0x68, (b.extract<uint8_t, 15, 8>()));
+      CHECK_EQUAL(0x34, (b.extract<uint8_t, 16, 8>()));
+      CHECK_EQUAL(0x1A, (b.extract<uint8_t, 17, 8>()));
+      CHECK_EQUAL(0x8D, (b.extract<uint8_t, 18, 8>()));
+      CHECK_EQUAL(0x46, (b.extract<uint8_t, 19, 8>()));
+      CHECK_EQUAL(0x23, (b.extract<uint8_t, 20, 8>()));
+      CHECK_EQUAL(0x91, (b.extract<uint8_t, 21, 8>()));
+      CHECK_EQUAL(0x48, (b.extract<uint8_t, 22, 8>()));
+      CHECK_EQUAL(0x24, (b.extract<uint8_t, 23, 8>()));
+      CHECK_EQUAL(0x12, (b.extract<uint8_t, 24, 8>()));
+
+      // The lines below should static assert.
+      //uint8_t v = b.extract<uint8_t, 25, 8>();
+      //uint8_t v = b.extract<uint8_t, 25, 9>();
+    }
   };
 }
diff --git a/test/test_bitset_new_ext_default_element_type.cpp b/test/test_bitset_new_ext_default_element_type.cpp
index 8eb3cbb6..8bd56537 100644
--- a/test/test_bitset_new_ext_default_element_type.cpp
+++ b/test/test_bitset_new_ext_default_element_type.cpp
@@ -2130,5 +2130,79 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(text.c_str()));
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
+
+    //*************************************************************************
+    TEST(test_extract_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x78), b.extract<uint8_t>( 0, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), b.extract<uint8_t>( 1, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), b.extract<uint8_t>( 2, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), b.extract<uint8_t>( 3, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x67), b.extract<uint8_t>( 4, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), b.extract<uint8_t>( 5, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x59), b.extract<uint8_t>( 6, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), b.extract<uint8_t>( 7, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x56), b.extract<uint8_t>( 8, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), b.extract<uint8_t>( 9, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x15), b.extract<uint8_t>(10, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), b.extract<uint8_t>(11, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x45), b.extract<uint8_t>(12, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), b.extract<uint8_t>(13, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), b.extract<uint8_t>(14, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x68), b.extract<uint8_t>(15, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x34), b.extract<uint8_t>(16, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), b.extract<uint8_t>(17, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), b.extract<uint8_t>(18, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x46), b.extract<uint8_t>(19, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x23), b.extract<uint8_t>(20, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x91), b.extract<uint8_t>(21, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x48), b.extract<uint8_t>(22, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
+    }
+
+    //*************************************************************************
+    TEST(test_extract_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x78), (b.extract<uint8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), (b.extract<uint8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), (b.extract<uint8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x67), (b.extract<uint8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), (b.extract<uint8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x59), (b.extract<uint8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), (b.extract<uint8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x56), (b.extract<uint8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), (b.extract<uint8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x45), (b.extract<uint8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), (b.extract<uint8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), (b.extract<uint8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x68), (b.extract<uint8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), (b.extract<uint8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x46), (b.extract<uint8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x91), (b.extract<uint8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x48), (b.extract<uint8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
+
+      // The line below should static assert.
+      //uint8_t v = b.extract<uint8_t, 25, 8>();
+      //uint8_t v = b.extract<uint8_t, 25, 9>();
+    }
   };
 }
diff --git a/test/test_bitset_new_ext_explicit_single_element_type.cpp b/test/test_bitset_new_ext_explicit_single_element_type.cpp
index 0eaf1d19..07889e64 100644
--- a/test/test_bitset_new_ext_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_ext_explicit_single_element_type.cpp
@@ -1478,5 +1478,79 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(text.c_str()));
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
+
+    //*************************************************************************
+    TEST(test_extract_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, int32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x78), b.extract<uint8_t>( 0, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), b.extract<uint8_t>( 1, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), b.extract<uint8_t>( 2, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), b.extract<uint8_t>( 3, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x67), b.extract<uint8_t>( 4, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), b.extract<uint8_t>( 5, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x59), b.extract<uint8_t>( 6, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), b.extract<uint8_t>( 7, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x56), b.extract<uint8_t>( 8, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), b.extract<uint8_t>( 9, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x15), b.extract<uint8_t>(10, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), b.extract<uint8_t>(11, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x45), b.extract<uint8_t>(12, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), b.extract<uint8_t>(13, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), b.extract<uint8_t>(14, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x68), b.extract<uint8_t>(15, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x34), b.extract<uint8_t>(16, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), b.extract<uint8_t>(17, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), b.extract<uint8_t>(18, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x46), b.extract<uint8_t>(19, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x23), b.extract<uint8_t>(20, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x91), b.extract<uint8_t>(21, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x48), b.extract<uint8_t>(22, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
+    }
+
+    //*************************************************************************
+    TEST(test_extract_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, int32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x78), (b.extract<uint8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), (b.extract<uint8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), (b.extract<uint8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x67), (b.extract<uint8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), (b.extract<uint8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x59), (b.extract<uint8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), (b.extract<uint8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x56), (b.extract<uint8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), (b.extract<uint8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x45), (b.extract<uint8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), (b.extract<uint8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), (b.extract<uint8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x68), (b.extract<uint8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), (b.extract<uint8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x46), (b.extract<uint8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x91), (b.extract<uint8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x48), (b.extract<uint8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
+
+      // The line below should static assert.
+      //uint8_t v = b.extract<uint8_t, 25, 8>();
+      //uint8_t v = b.extract<uint8_t, 25, 9>();
+    }
   };
 }
diff --git a/test/vs2022/etl.vcxproj b/test/vs2022/etl.vcxproj
index 4c18142c..473d635c 100644
--- a/test/vs2022/etl.vcxproj
+++ b/test/vs2022/etl.vcxproj
@@ -839,17 +839,17 @@
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
@@ -859,37 +859,37 @@
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
@@ -935,7 +935,7 @@
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>

From 2c8aafedcdbfa0c85e3fbd98a86f506df6fdcb1d Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Fri, 1 Dec 2023 17:21:48 +0000
Subject: [PATCH 019/131] Work in progress for etl::bitset::extract

---
 include/etl/private/bitset_new.h              | 186 +++++-----
 test/test_bitset_new_default_element_type.cpp | 326 +++++++++++++++++-
 ...itset_new_explicit_single_element_type.cpp |   4 +-
 ...st_bitset_new_ext_default_element_type.cpp |   4 +-
 ...t_new_ext_explicit_single_element_type.cpp |   4 +-
 5 files changed, 412 insertions(+), 112 deletions(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 530f5c6a..ce1688cd 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -159,6 +159,12 @@ namespace etl
     static ETL_CONSTANT element_type All_Set_Element    = etl::integral_limits<element_type>::max;
     static ETL_CONSTANT element_type All_Clear_Element  = element_type(0);
 
+    template <size_t Position, size_t Length, size_t Bits_Per_Element>
+    struct value_is_in_one_element
+    {
+      static ETL_CONSTANT bool value = ((Position + Length - 1) >> etl::log2<Bits_Per_Element>::value) == (Position >> etl::log2<Bits_Per_Element>::value);
+    };
+
     //*************************************************************************
     /// Count the number of bits set.
     //*************************************************************************
@@ -414,63 +420,56 @@ namespace etl
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-    T extract_from_single_element(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
+    T extract_from_buffer(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
       unsigned_t value(0);
 
-      const unsigned_t value_mask = etl::integral_limits<unsigned_t>::max;
-      const int        element_index = (position + length - 1) >> etl::log2<Bits_Per_Element>::value;
-      const unsigned_t Shift = position % Bits_Per_Element;
+      const int Msb_Element_Index = (position + length - 1) >> etl::log2<Bits_Per_Element>::value;
+      const int Lsb_Element_Index = position >> etl::log2<Bits_Per_Element>::value;
 
-      value = static_cast<unsigned_t>(pbuffer[element_index] >> Shift) & value_mask;
-
-      return static_cast<T>(value);
-    }
-
-    //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
-    //*************************************************************************
-    template <typename T>
-    ETL_CONSTEXPR14
-    T extract_from_multi_element(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
-    {
-      typedef typename etl::make_unsigned<T>::type unsigned_t;
-
-      unsigned_t value(0);
-
-      // The mask for the value type.
-      const unsigned_t value_mask = etl::integral_limits<unsigned_t>::max;
-
-      // Find the index of the element containing the msb.
-      int element_index = (position + length - 1) >> etl::log2<Bits_Per_Element>::value;
-
-      // The value is spread over multiple elements.       
-      element_type bit_mask = element_type(1) << ((position + length - 1) % Bits_Per_Element);
-
-      while (length != 0)
+      // Is the value contained within one element?
+      if (Msb_Element_Index == Lsb_Element_Index)
       {
-        // TODO Optimise this to read whole element values.
+        const unsigned_t Mask = ~(~0 << length);
+        const unsigned_t Shift = position % Bits_Per_Element;
 
-        value <<= 1;
+        value = static_cast<unsigned_t>(pbuffer[Msb_Element_Index] >> Shift) & Mask;
+      }
+      else
+      {
+        // Get the number of active bits in the msb element 
+        size_t active_bits_in_msb = (position + length) - (Msb_Element_Index * Bits_Per_Element);
 
-        const bool is_set = (pbuffer[element_index] & bit_mask) != 0;
+        // Extract the first element if partially filled.
+        // Start with index of the element containing the msb.
+        int element_index = Msb_Element_Index;
 
-        if (is_set)
+        if (active_bits_in_msb < Bits_Per_Element)
         {
-          value |= unsigned_t(1);
-        }
-
-        bit_mask >>= 1;
-
-        if (bit_mask == 0)
-        {
-          bit_mask = element_type(1) << (Bits_Per_Element - 1);
+          element_type mask = ~(~element_type(0) << active_bits_in_msb);
+          value |= pbuffer[element_index] & mask;
+          length -= active_bits_in_msb;
           --element_index;
         }
 
-        --length;
+        // Loop through the fully filled elements
+        while (length >= Bits_Per_Element)
+        {
+          value <<= Bits_Per_Element;
+          value |= pbuffer[element_index];
+          length -= Bits_Per_Element;
+          --element_index;
+        }
+
+        // Check if the last element is partially filled and extract.
+        if (length != 0)
+        {
+          value <<= length;
+          element_type mask = ~(~element_type(0) << length);
+          value |= (pbuffer[element_index] >> (Bits_Per_Element - length)) & mask;
+        }
       }
 
       return static_cast<T>(value);
@@ -481,17 +480,16 @@ namespace etl
     //*************************************************************************
     template <typename T, size_t Position, size_t Length>
     ETL_CONSTEXPR14
-    T extract_from_single_element(const_pointer pbuffer) const
+    typename etl::enable_if<value_is_in_one_element<Position, Length, Bits_Per_Element>::value, T>::type
+      extract_from_buffer(const_pointer pbuffer) const
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
-      unsigned_t value(0);
-
-      const unsigned_t value_mask    = etl::integral_limits<unsigned_t>::max;
-      const int        element_index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
+      const int        Element_Index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
+      const unsigned_t Mask          = ~(~0 << Length);
       const unsigned_t Shift         = Position % Bits_Per_Element;
-
-      value = static_cast<unsigned_t>(pbuffer[element_index] >> Shift) & value_mask;
+      
+      unsigned_t value = static_cast<unsigned_t>(pbuffer[Element_Index] >> Shift) & Mask;
 
       return static_cast<T>(value);
     }
@@ -501,44 +499,48 @@ namespace etl
     //*************************************************************************
     template <typename T, size_t Position, size_t Length>
     ETL_CONSTEXPR14
-    T extract_from_multi_element(const_pointer pbuffer) const
+    typename etl::enable_if<!value_is_in_one_element<Position, Length, Bits_Per_Element>::value, T>::type
+      extract_from_buffer(const_pointer pbuffer) const
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
       unsigned_t value(0);
 
-      // The mask for the value type.
-      const unsigned_t value_mask = etl::integral_limits<unsigned_t>::max;
+      const int Msb_Element_Index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
 
-      // Find the index of the element containing the msb.
-      int element_index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
+      // Start with index of the element containing the msb.
+      int element_index = Msb_Element_Index;
 
       // The value is spread over multiple elements.       
-      size_t       length   = Length;
-      element_type bit_mask = element_type(1) << ((Position + Length - 1) % Bits_Per_Element);
+      size_t length = Length;
 
-      while (length != 0)
+      // Get the number of active bits in the first element 
+      size_t active_bits_in_element = ((Position + Length - 1) % Bits_Per_Element) + 1;
+
+      // Extract the first element if partially filled.
+      if (active_bits_in_element < Bits_Per_Element)
       {
-        // TODO Optimise this to read whole element values.
+        element_type mask = ~(~element_type(0) << active_bits_in_element);
+        value |= pbuffer[element_index] & mask;
+        length -= active_bits_in_element;
+        --element_index;
+      }
 
-        value <<= 1;
+      // Loop through the fully filled elements
+      while (length >= Bits_Per_Element)
+      {
+        value <<= Bits_Per_Element;
+        value |= pbuffer[element_index];
+        length -= Bits_Per_Element;
+        --element_index;
+      }
 
-        const bool is_set = (pbuffer[element_index] & bit_mask) != 0;
-
-        if (is_set)
-        {
-          value |= unsigned_t(1);
-        }      
-
-        bit_mask >>= 1;
-
-        if (bit_mask == 0)
-        {
-          bit_mask = element_type(1) << (Bits_Per_Element - 1);
-          --element_index;
-        }
-
-        --length;
+      // Check if the last element is partially filled and extract.
+      if (length != 0)
+      {
+        value <<= length;
+        element_type mask = ~(~element_type(0) << length);
+        value |= (pbuffer[element_index] >> (Bits_Per_Element - length)) & mask;
       }
 
       return static_cast<T>(value);
@@ -2201,7 +2203,7 @@ namespace etl
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-      typename etl::enable_if<etl::is_integral<T>::value, T>::type
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
       value() const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Only integral types are supported");
@@ -2220,7 +2222,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
 
-      return ibitset.extract_from_multi_element<T>(buffer, position, length);
+      return ibitset.extract_from_buffer<T>(buffer, position, length);
     }
 
     //*************************************************************************
@@ -2228,22 +2230,12 @@ namespace etl
     //*************************************************************************
     template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
     ETL_CONSTEXPR14
-      typename etl::enable_if<etl::is_integral<T>::value, T>::type
+    typename etl::enable_if<etl::is_integral<T>::value, T>::type
       extract() const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
 
-      const int active_bits_in_element = ((Position + Length) % Bits_Per_Element);
-
-      // Is the value contained within one element?
-      if (active_bits_in_element == Length)
-      {
-        return ibitset.extract_from_single_element<T, Position, Length>(buffer);
-      }
-      else
-      {
-        return ibitset.extract_from_multi_element<T, Position, Length>(buffer);
-      }
+      return ibitset.extract_from_buffer<T, Position, Length>(buffer);
     }
 
     //*************************************************************************
@@ -4018,7 +4010,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
 
-      return ibitset.extract_from_multi_element<T>(pbuffer, position, length);
+      return ibitset.extract_from_buffer<T>(pbuffer, position, length);
     }
 
     //*************************************************************************
@@ -4031,17 +4023,7 @@ namespace etl
     {
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
 
-      const int active_bits_in_element = ((Position + Length) % Bits_Per_Element);
-
-      // Is the value contained within one element?
-      if (active_bits_in_element == Length)
-      {
-        return ibitset.extract_from_single_element<T, Position, Length>(pbuffer);
-      }
-      else
-      {
-        return ibitset.extract_from_multi_element<T, Position, Length>(pbuffer);
-      }
+      return ibitset.extract_from_buffer<T, Position, Length>(pbuffer);
     }
 
     //*************************************************************************
diff --git a/test/test_bitset_new_default_element_type.cpp b/test/test_bitset_new_default_element_type.cpp
index af437e94..b49f5c9a 100644
--- a/test/test_bitset_new_default_element_type.cpp
+++ b/test/test_bitset_new_default_element_type.cpp
@@ -2239,7 +2239,82 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_extract_with_run_time_parameters)
+    TEST(test_extract_6_bit_uint8_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t>(10, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t>(11, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t>(12, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t>(13, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(14, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t>(15, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t>(16, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t>(17, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t>(18, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t>(19, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t>(20, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(21, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t>(22, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t>(23, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t>(24, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t>(25, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<uint8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_uint8_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //uint8_t v1 = b.extract<uint8_t, 26, 7>();
+      //uint8_t v1 = b.extract<uint8_t, 27, 6>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint8_t_with_run_time_parameters)
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
@@ -2269,11 +2344,12 @@ namespace
       CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
       CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
       
+      CHECK_THROW(b.extract<uint8_t>(24, 9), etl::bitset_overflow);
       CHECK_THROW(b.extract<uint8_t>(25, 8), etl::bitset_overflow);
     }
 
     //*************************************************************************
-    TEST(test_extract_with_template_parameters)
+    TEST(test_extract_uint8_t_with_template_parameters)
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
@@ -2304,8 +2380,250 @@ namespace
       CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
 
       // The lines below should static assert.
-      //uint8_t v = b.extract<uint8_t, 25, 8>();
-      //uint8_t v = b.extract<uint8_t, 25, 9>();
+      //uint8_t v1 = b.extract<uint8_t, 24, 9>();
+      //uint8_t v2 = b.extract<uint8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), b.extract<int8_t>( 0, 8));
+      CHECK_EQUAL_HEX(int8_t(0x3C), b.extract<int8_t>( 1, 8));
+      CHECK_EQUAL_HEX(int8_t(0x9E), b.extract<int8_t>( 2, 8));
+      CHECK_EQUAL_HEX(int8_t(0xCF), b.extract<int8_t>( 3, 8));
+      CHECK_EQUAL_HEX(int8_t(0x67), b.extract<int8_t>( 4, 8));
+      CHECK_EQUAL_HEX(int8_t(0xB3), b.extract<int8_t>( 5, 8));
+      CHECK_EQUAL_HEX(int8_t(0x59), b.extract<int8_t>( 6, 8));
+      CHECK_EQUAL_HEX(int8_t(0xAC), b.extract<int8_t>( 7, 8));
+      CHECK_EQUAL_HEX(int8_t(0x56), b.extract<int8_t>( 8, 8));
+      CHECK_EQUAL_HEX(int8_t(0x2B), b.extract<int8_t>( 9, 8));
+      CHECK_EQUAL_HEX(int8_t(0x15), b.extract<int8_t>(10, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8A), b.extract<int8_t>(11, 8));
+      CHECK_EQUAL_HEX(int8_t(0x45), b.extract<int8_t>(12, 8));
+      CHECK_EQUAL_HEX(int8_t(0xA2), b.extract<int8_t>(13, 8));
+      CHECK_EQUAL_HEX(int8_t(0xD1), b.extract<int8_t>(14, 8));
+      CHECK_EQUAL_HEX(int8_t(0x68), b.extract<int8_t>(15, 8));
+      CHECK_EQUAL_HEX(int8_t(0x34), b.extract<int8_t>(16, 8));
+      CHECK_EQUAL_HEX(int8_t(0x1A), b.extract<int8_t>(17, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8D), b.extract<int8_t>(18, 8));
+      CHECK_EQUAL_HEX(int8_t(0x46), b.extract<int8_t>(19, 8));
+      CHECK_EQUAL_HEX(int8_t(0x23), b.extract<int8_t>(20, 8));
+      CHECK_EQUAL_HEX(int8_t(0x91), b.extract<int8_t>(21, 8));
+      CHECK_EQUAL_HEX(int8_t(0x48), b.extract<int8_t>(22, 8));
+      CHECK_EQUAL_HEX(int8_t(0x24), b.extract<int8_t>(23, 8));
+      CHECK_EQUAL_HEX(int8_t(0x12), b.extract<int8_t>(24, 8));
+
+      CHECK_THROW(b.extract<int8_t>(24, 9), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(25, 8), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), (b.extract<int8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x3C), (b.extract<int8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x9E), (b.extract<int8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xCF), (b.extract<int8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x67), (b.extract<int8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xB3), (b.extract<int8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x59), (b.extract<int8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xAC), (b.extract<int8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x56), (b.extract<int8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x2B), (b.extract<int8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8A), (b.extract<int8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x45), (b.extract<int8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xA2), (b.extract<int8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xD1), (b.extract<int8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x68), (b.extract<int8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x34), (b.extract<int8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8D), (b.extract<int8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x46), (b.extract<int8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x23), (b.extract<int8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x91), (b.extract<int8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x48), (b.extract<int8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x24), (b.extract<int8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 8>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 24, 9>();
+      //int8_t v2 = b.extract<int8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), b.extract<uint16_t>( 0, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), b.extract<uint16_t>( 1, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), b.extract<uint16_t>( 3, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), b.extract<uint16_t>( 4, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), b.extract<uint16_t>( 5, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), b.extract<uint16_t>( 6, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), b.extract<uint16_t>( 7, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), b.extract<uint16_t>( 8, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), b.extract<uint16_t>(10, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), b.extract<uint16_t>(11, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), b.extract<uint16_t>(12, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), b.extract<uint16_t>(13, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), b.extract<uint16_t>(14, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), b.extract<uint16_t>(15, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), b.extract<uint16_t>(17, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), b.extract<uint16_t>(18, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), b.extract<uint16_t>(19, 13));
+
+      CHECK_THROW(b.extract<uint16_t>(19, 14), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(20, 13), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), (b.extract<uint16_t,  0,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), (b.extract<uint16_t,  1,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), (b.extract<uint16_t,  3,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), (b.extract<uint16_t,  4,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), (b.extract<uint16_t,  5,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), (b.extract<uint16_t,  6,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), (b.extract<uint16_t,  7,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), (b.extract<uint16_t,  8,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), (b.extract<uint16_t, 10,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), (b.extract<uint16_t, 11,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), (b.extract<uint16_t, 12,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), (b.extract<uint16_t, 13,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), (b.extract<uint16_t, 14,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), (b.extract<uint16_t, 15,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), (b.extract<uint16_t, 17,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), (b.extract<uint16_t, 18,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), (b.extract<uint16_t, 19,13>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 19, 14);
+      //uint16_t v2 = b.extract<uint16_t, 20, 13);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), b.extract<uint16_t>( 0, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), b.extract<uint16_t>( 1, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), b.extract<uint16_t>( 3, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), b.extract<uint16_t>( 4, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), b.extract<uint16_t>( 5, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), b.extract<uint16_t>( 6, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), b.extract<uint16_t>( 7, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), b.extract<uint16_t>( 8, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), b.extract<uint16_t>(10, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), b.extract<uint16_t>(11, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), b.extract<uint16_t>(12, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), b.extract<uint16_t>(13, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), b.extract<uint16_t>(14, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), b.extract<uint16_t>(15, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 16));
+
+      CHECK_THROW(b.extract<uint16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), (b.extract<uint16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), (b.extract<uint16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), (b.extract<uint16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), (b.extract<uint16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), (b.extract<uint16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), (b.extract<uint16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), (b.extract<uint16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), (b.extract<uint16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), (b.extract<uint16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), (b.extract<uint16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), (b.extract<uint16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), (b.extract<uint16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), (b.extract<uint16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), (b.extract<uint16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 16, 17>();
+      //uint16_t v2 = b.extract<uint16_t, 17, 16>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>(0, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>(1, 16));
+      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>(2, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>(3, 16));
+      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>(4, 16));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>(5, 16));
+      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>(6, 16));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>(7, 16));
+      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>(8, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>(9, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), b.extract<int16_t>(10, 16));
+      CHECK_EQUAL_HEX(int16_t(0x468A), b.extract<int16_t>(11, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2345), b.extract<int16_t>(12, 16));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), b.extract<int16_t>(13, 16));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), b.extract<int16_t>(14, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2468), b.extract<int16_t>(15, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1234), b.extract<int16_t>(16, 16));
+
+      CHECK_THROW(b.extract<int16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t, 0, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t, 1, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t, 2, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t, 3, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t, 4, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t, 5, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t, 6, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t, 7, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t, 8, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t, 9, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), (b.extract<int16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x468A), (b.extract<int16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2345), (b.extract<int16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), (b.extract<int16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), (b.extract<int16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2468), (b.extract<int16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1234), (b.extract<int16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //int16_t v1 = b.extract<int16_t, 16, 17>());
+      //int16_t v2 = b.extract<int16_t, 17, 16>());
     }
   };
 }
diff --git a/test/test_bitset_new_explicit_single_element_type.cpp b/test/test_bitset_new_explicit_single_element_type.cpp
index 3b4c91dd..4ea4992e 100644
--- a/test/test_bitset_new_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_explicit_single_element_type.cpp
@@ -1727,7 +1727,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_extract_with_run_time_parameters)
+    TEST(test_extract_uint8_t_with_run_time_parameters)
     {
       ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
 
@@ -1760,7 +1760,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_extract_with_template_parameters)
+    TEST(test_extract_uint8_t_with_template_parameters)
     {
       ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
 
diff --git a/test/test_bitset_new_ext_default_element_type.cpp b/test/test_bitset_new_ext_default_element_type.cpp
index 8bd56537..07025ff3 100644
--- a/test/test_bitset_new_ext_default_element_type.cpp
+++ b/test/test_bitset_new_ext_default_element_type.cpp
@@ -2132,7 +2132,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_extract_with_run_time_parameters)
+    TEST(test_extract_uint8_t_with_run_time_parameters)
     {
       using bs32 = etl::bitset_ext<32>;
 
@@ -2167,7 +2167,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_extract_with_template_parameters)
+    TEST(test_extract_uint8_t_with_template_parameters)
     {
       using bs32 = etl::bitset_ext<32>;
 
diff --git a/test/test_bitset_new_ext_explicit_single_element_type.cpp b/test/test_bitset_new_ext_explicit_single_element_type.cpp
index 07889e64..af31e5b7 100644
--- a/test/test_bitset_new_ext_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_ext_explicit_single_element_type.cpp
@@ -1480,7 +1480,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_extract_with_run_time_parameters)
+    TEST(test_extract_uint8_t_with_run_time_parameters)
     {
       using bs32 = etl::bitset_ext<32, int32_t>;
 
@@ -1515,7 +1515,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_extract_with_template_parameters)
+    TEST(test_extract_uint8_t_with_template_parameters)
     {
       using bs32 = etl::bitset_ext<32, int32_t>;
 

From 236af6190a3060ed7aeb4c498a9a1124a2018ea8 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 2 Dec 2023 17:46:38 +0000
Subject: [PATCH 020/131] Work in progress for etl::bitset::extract

---
 include/etl/private/bitset_new.h              | 148 ++++++++++--------
 test/test_bitset_new_default_element_type.cpp |  77 +++++++++
 2 files changed, 158 insertions(+), 67 deletions(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index ce1688cd..c3480ec7 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -415,12 +415,62 @@ namespace etl
       return v;
     }
 
+    //*************************************************************************
+    /// Extract an value from multiple elements.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    typename etl::make_unsigned<T>::type extract_from_multiple_elements(const element_type* pbuffer,
+                                                                        int                 element_index,
+                                                                        size_t              active_bits_in_msb,
+                                                                        size_t              length) const ETL_NOEXCEPT
+    {
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value(0);
+
+      // Extract the first element, if partially filled.
+      if (active_bits_in_msb < Bits_Per_Element)
+      {
+        element_type mask = ~(~element_type(0) << active_bits_in_msb);
+        value = pbuffer[element_index] & mask;
+        length -= active_bits_in_msb;
+        if (length >= Bits_Per_Element)
+        {
+          value = value << Bits_Per_Element;
+        }
+        --element_index;
+      }
+
+      // Loop through the fully filled elements
+      while (length >= Bits_Per_Element)
+      {
+        value |= pbuffer[element_index];
+        length -= Bits_Per_Element;
+        if (length >= Bits_Per_Element)
+        {
+          value = value << Bits_Per_Element;
+        }
+        --element_index;
+      }
+
+      // Extract the last element, if partially filled.
+      if (length != 0)
+      {
+        value = value << length;
+        element_type mask = ~(~element_type(0) << length);
+        value |= (pbuffer[element_index] >> (Bits_Per_Element - length)) & mask;
+      }
+
+      return value;
+    }
+
     //*************************************************************************
     /// Extract an integral value from an arbitary position and length.
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-    T extract_from_buffer(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
+    typename etl::make_unsigned<T>::type extract_from_buffer(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
@@ -442,37 +492,13 @@ namespace etl
         // Get the number of active bits in the msb element 
         size_t active_bits_in_msb = (position + length) - (Msb_Element_Index * Bits_Per_Element);
 
-        // Extract the first element if partially filled.
         // Start with index of the element containing the msb.
         int element_index = Msb_Element_Index;
 
-        if (active_bits_in_msb < Bits_Per_Element)
-        {
-          element_type mask = ~(~element_type(0) << active_bits_in_msb);
-          value |= pbuffer[element_index] & mask;
-          length -= active_bits_in_msb;
-          --element_index;
-        }
-
-        // Loop through the fully filled elements
-        while (length >= Bits_Per_Element)
-        {
-          value <<= Bits_Per_Element;
-          value |= pbuffer[element_index];
-          length -= Bits_Per_Element;
-          --element_index;
-        }
-
-        // Check if the last element is partially filled and extract.
-        if (length != 0)
-        {
-          value <<= length;
-          element_type mask = ~(~element_type(0) << length);
-          value |= (pbuffer[element_index] >> (Bits_Per_Element - length)) & mask;
-        }
+        value = extract_from_multiple_elements<T>(pbuffer, element_index, active_bits_in_msb, length);
       }
 
-      return static_cast<T>(value);
+      return value;
     }
 
     //*************************************************************************
@@ -480,7 +506,7 @@ namespace etl
     //*************************************************************************
     template <typename T, size_t Position, size_t Length>
     ETL_CONSTEXPR14
-    typename etl::enable_if<value_is_in_one_element<Position, Length, Bits_Per_Element>::value, T>::type
+    typename etl::enable_if<value_is_in_one_element<Position, Length, Bits_Per_Element>::value, typename etl::make_unsigned<T>::type>::type
       extract_from_buffer(const_pointer pbuffer) const
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
@@ -489,9 +515,7 @@ namespace etl
       const unsigned_t Mask          = ~(~0 << Length);
       const unsigned_t Shift         = Position % Bits_Per_Element;
       
-      unsigned_t value = static_cast<unsigned_t>(pbuffer[Element_Index] >> Shift) & Mask;
-
-      return static_cast<T>(value);
+      return  static_cast<unsigned_t>(pbuffer[Element_Index] >> Shift) & Mask;
     }
 
     //*************************************************************************
@@ -499,13 +523,11 @@ namespace etl
     //*************************************************************************
     template <typename T, size_t Position, size_t Length>
     ETL_CONSTEXPR14
-    typename etl::enable_if<!value_is_in_one_element<Position, Length, Bits_Per_Element>::value, T>::type
+    typename etl::enable_if<!value_is_in_one_element<Position, Length, Bits_Per_Element>::value, typename etl::make_unsigned<T>::type>::type
       extract_from_buffer(const_pointer pbuffer) const
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
-
-      unsigned_t value(0);
-
+       
       const int Msb_Element_Index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
 
       // Start with index of the element containing the msb.
@@ -515,35 +537,9 @@ namespace etl
       size_t length = Length;
 
       // Get the number of active bits in the first element 
-      size_t active_bits_in_element = ((Position + Length - 1) % Bits_Per_Element) + 1;
+      size_t active_bits_in_msb = ((Position + Length - 1) % Bits_Per_Element) + 1;
 
-      // Extract the first element if partially filled.
-      if (active_bits_in_element < Bits_Per_Element)
-      {
-        element_type mask = ~(~element_type(0) << active_bits_in_element);
-        value |= pbuffer[element_index] & mask;
-        length -= active_bits_in_element;
-        --element_index;
-      }
-
-      // Loop through the fully filled elements
-      while (length >= Bits_Per_Element)
-      {
-        value <<= Bits_Per_Element;
-        value |= pbuffer[element_index];
-        length -= Bits_Per_Element;
-        --element_index;
-      }
-
-      // Check if the last element is partially filled and extract.
-      if (length != 0)
-      {
-        value <<= length;
-        element_type mask = ~(~element_type(0) << length);
-        value |= (pbuffer[element_index] >> (Bits_Per_Element - length)) & mask;
-      }
-
-      return static_cast<T>(value);
+      return extract_from_multiple_elements<T>(pbuffer, element_index, active_bits_in_msb, length);
     }
 
     //*************************************************************************
@@ -2222,7 +2218,16 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
 
-      return ibitset.extract_from_buffer<T>(buffer, position, length);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value = ibitset.template extract_from_buffer<T>(buffer, position, length);;
+
+      if ((length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T>(value, length);
+      }
+
+      return value;
     }
 
     //*************************************************************************
@@ -2235,7 +2240,16 @@ namespace etl
     {
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
 
-      return ibitset.extract_from_buffer<T, Position, Length>(buffer);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value = ibitset.template extract_from_buffer<T, Position, Length>(buffer);
+
+      if ETL_IF_CONSTEXPR((Length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T, Length>(value);
+      }
+
+      return value;
     }
 
     //*************************************************************************
@@ -4010,7 +4024,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
 
-      return ibitset.extract_from_buffer<T>(pbuffer, position, length);
+      return ibitset.template extract_from_buffer<T>(pbuffer, position, length);
     }
 
     //*************************************************************************
@@ -4023,7 +4037,7 @@ namespace etl
     {
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
 
-      return ibitset.extract_from_buffer<T, Position, Length>(pbuffer);
+      return ibitset.template extract_from_buffer<T, Position, Length>(pbuffer);
     }
 
     //*************************************************************************
diff --git a/test/test_bitset_new_default_element_type.cpp b/test/test_bitset_new_default_element_type.cpp
index b49f5c9a..19aede7b 100644
--- a/test/test_bitset_new_default_element_type.cpp
+++ b/test/test_bitset_new_default_element_type.cpp
@@ -2313,6 +2313,83 @@ namespace
       //uint8_t v1 = b.extract<uint8_t, 27, 6>();
     }
 
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      auto v = b.extract<int8_t>(1, 6);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>(0, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>(1, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>(2, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>(3, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>(4, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>(5, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>(6, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>(7, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>(8, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>(9, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t>(10, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t>(11, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t>(12, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t>(13, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(14, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t>(15, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t>(16, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t>(17, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t>(18, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t>(19, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t>(20, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(21, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t>(22, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t>(23, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t>(24, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t>(25, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<int8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t, 0, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t, 1, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t, 2, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t, 3, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t, 4, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t, 5, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t, 6, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t, 7, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t, 8, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t, 9, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 26, 7>();
+      //int8_t v1 = b.extract<int8_t, 27, 6>();
+    }
+
     //*************************************************************************
     TEST(test_extract_uint8_t_with_run_time_parameters)
     {

From aa4b27b6e6dbc82a39873da14441dece610904d2 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 4 Dec 2023 08:37:59 +0000
Subject: [PATCH 021/131] Work in progress for etl::bitset::extract

---
 include/etl/private/bitset_new.h              | 100 +++-
 test/test_bitset_new_default_element_type.cpp |  82 ++-
 ...itset_new_explicit_single_element_type.cpp | 498 ++++++++++++++++--
 ...st_bitset_new_ext_default_element_type.cpp | 437 ++++++++++++++-
 ...t_new_ext_explicit_single_element_type.cpp | 441 +++++++++++++++-
 5 files changed, 1432 insertions(+), 126 deletions(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index c3480ec7..2257b838 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -432,7 +432,7 @@ namespace etl
       // Extract the first element, if partially filled.
       if (active_bits_in_msb < Bits_Per_Element)
       {
-        element_type mask = ~(~element_type(0) << active_bits_in_msb);
+        element_type mask = etl::make_lsb_mask< element_type>(active_bits_in_msb);
         value = pbuffer[element_index] & mask;
         length -= active_bits_in_msb;
         if (length >= Bits_Per_Element)
@@ -458,7 +458,7 @@ namespace etl
       if (length != 0)
       {
         value = value << length;
-        element_type mask = ~(~element_type(0) << length);
+        element_type mask = etl::make_lsb_mask< element_type>(length);
         value |= (pbuffer[element_index] >> (Bits_Per_Element - length)) & mask;
       }
 
@@ -482,7 +482,7 @@ namespace etl
       // Is the value contained within one element?
       if (Msb_Element_Index == Lsb_Element_Index)
       {
-        const unsigned_t Mask = ~(~0 << length);
+        const unsigned_t Mask  = etl::make_lsb_mask< unsigned_t>(length);
         const unsigned_t Shift = position % Bits_Per_Element;
 
         value = static_cast<unsigned_t>(pbuffer[Msb_Element_Index] >> Shift) & Mask;
@@ -512,7 +512,7 @@ namespace etl
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
       const int        Element_Index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
-      const unsigned_t Mask          = ~(~0 << Length);
+      const unsigned_t Mask          = etl::lsb_mask<unsigned_t, Length>::value;
       const unsigned_t Shift         = Position % Bits_Per_Element;
       
       return  static_cast<unsigned_t>(pbuffer[Element_Index] >> Shift) & Mask;
@@ -525,9 +525,7 @@ namespace etl
     ETL_CONSTEXPR14
     typename etl::enable_if<!value_is_in_one_element<Position, Length, Bits_Per_Element>::value, typename etl::make_unsigned<T>::type>::type
       extract_from_buffer(const_pointer pbuffer) const
-    {
-      typedef typename etl::make_unsigned<T>::type unsigned_t;
-       
+    {      
       const int Msb_Element_Index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
 
       // Start with index of the element containing the msb.
@@ -992,7 +990,7 @@ namespace etl
   /// Specialisation that uses a single element if the element type is the 
   /// same size as the number of active bits.
   //***************************************************************************
-  template <size_t   Active_Bits, typename TElement>
+  template <size_t Active_Bits, typename TElement>
   class bitset<Active_Bits, TElement, true> : public bitset_constants<>
   {
   public:
@@ -1427,10 +1425,19 @@ namespace etl
       ETL_ASSERT_OR_RETURN_VALUE(length <= etl::integral_limits<T>::bits, ETL_ERROR(bitset_overflow), 0);
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits,      ETL_ERROR(bitset_overflow), 0);
 
-      element_type mask = (~(~0u << length) << position);
-      T value((buffer & mask) >> position);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
 
-      return value;
+      const unsigned_t Mask  = etl::make_lsb_mask< unsigned_t>(length);
+      const unsigned_t Shift = position % Bits_Per_Element;
+
+      unsigned_t value = static_cast<unsigned_t>(buffer >> Shift) & Mask;
+
+      if ((length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T>(value, length);
+      }
+
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
@@ -1444,10 +1451,19 @@ namespace etl
       ETL_STATIC_ASSERT(Length <= etl::integral_limits<T>::bits, "Length is larger that the required type");
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits,      "Position/Length overflows bitset");
       
-      element_type mask = (~(~0u << Length) << Position);
-      T value((buffer & mask) >> Position);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
 
-      return value;
+      const unsigned_t Mask  = etl::make_lsb_mask<unsigned_t, Length>();
+      const unsigned_t Shift = Position % Bits_Per_Element;
+
+      unsigned_t value = static_cast<unsigned_t>(buffer >> Shift) & Mask;
+
+      if ETL_IF_CONSTEXPR((Length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T, Length>(value);
+      }
+
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
@@ -2227,7 +2243,7 @@ namespace etl
         value = etl::sign_extend<T>(value, length);
       }
 
-      return value;
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
@@ -2249,7 +2265,7 @@ namespace etl
         value = etl::sign_extend<T, Length>(value);
       }
 
-      return value;
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
@@ -3223,10 +3239,19 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
 
-      element_type mask = (~(~0u << length) << position);
-      T v((*pbuffer & mask) >> position);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
 
-      return v;
+      const unsigned_t Mask = etl::make_lsb_mask<unsigned_t>(length);
+      const unsigned_t Shift = position % Bits_Per_Element;
+
+      unsigned_t value = static_cast<unsigned_t>(*pbuffer >> Shift) & Mask;
+
+      if ((length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T>(value, length);
+      }
+
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
@@ -3239,10 +3264,19 @@ namespace etl
     {
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
 
-      element_type mask = (~(~0u << Length) << Position);
-      T v((*pbuffer & mask) >> Position);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
 
-      return v;
+      const unsigned_t Mask = etl::make_lsb_mask<unsigned_t, Length>();
+      const unsigned_t Shift = Position % Bits_Per_Element;
+
+      unsigned_t value = static_cast<unsigned_t>(*pbuffer >> Shift) & Mask;
+
+      if ETL_IF_CONSTEXPR((Length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T, Length>(value);
+      }
+
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
@@ -4024,7 +4058,16 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
 
-      return ibitset.template extract_from_buffer<T>(pbuffer, position, length);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value = ibitset.template extract_from_buffer<T>(pbuffer, position, length);
+
+      if ((length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T>(value, length);
+      }
+
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
@@ -4037,7 +4080,16 @@ namespace etl
     {
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
 
-      return ibitset.template extract_from_buffer<T, Position, Length>(pbuffer);
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value = ibitset.template extract_from_buffer<T, Position, Length>(pbuffer);
+
+      if ETL_IF_CONSTEXPR((Length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T, Length>(value);
+      }
+
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
diff --git a/test/test_bitset_new_default_element_type.cpp b/test/test_bitset_new_default_element_type.cpp
index 19aede7b..b22f5a44 100644
--- a/test/test_bitset_new_default_element_type.cpp
+++ b/test/test_bitset_new_default_element_type.cpp
@@ -2318,18 +2318,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      auto v = b.extract<int8_t>(1, 6);
-
-      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>(0, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>(1, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>(2, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>(3, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>(4, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>(5, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>(6, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>(7, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>(8, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>(9, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>( 9, 6)));
       CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t>(10, 6)));
       CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t>(11, 6)));
       CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t>(12, 6)));
@@ -2357,16 +2355,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t, 0, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t, 1, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t, 2, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t, 3, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t, 4, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t, 5, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t, 6, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t, 7, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t, 8, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t, 9, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t,  9, 6>()));
       CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 6>()));
       CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t, 11, 6>()));
       CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t, 12, 6>()));
@@ -2653,16 +2651,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>(0, 16));
-      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>(1, 16));
-      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>(2, 16));
-      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>(3, 16));
-      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>(4, 16));
-      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>(5, 16));
-      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>(6, 16));
-      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>(7, 16));
-      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>(8, 16));
-      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>(9, 16));
+      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>( 0, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>( 1, 16));
+      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>( 2, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>( 3, 16));
+      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>( 4, 16));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>( 5, 16));
+      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>( 6, 16));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>( 7, 16));
+      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>( 8, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>( 9, 16));
       CHECK_EQUAL_HEX(int16_t(0x8D15), b.extract<int16_t>(10, 16));
       CHECK_EQUAL_HEX(int16_t(0x468A), b.extract<int16_t>(11, 16));
       CHECK_EQUAL_HEX(int16_t(0x2345), b.extract<int16_t>(12, 16));
@@ -2680,16 +2678,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t, 0, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t, 1, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t, 2, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t, 3, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t, 4, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t, 5, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t, 6, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t, 7, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t, 8, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t, 9, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t,  9, 16>()));
       CHECK_EQUAL_HEX(int16_t(0x8D15), (b.extract<int16_t, 10, 16>()));
       CHECK_EQUAL_HEX(int16_t(0x468A), (b.extract<int16_t, 11, 16>()));
       CHECK_EQUAL_HEX(int16_t(0x2345), (b.extract<int16_t, 12, 16>()));
diff --git a/test/test_bitset_new_explicit_single_element_type.cpp b/test/test_bitset_new_explicit_single_element_type.cpp
index 4ea4992e..05ed79a9 100644
--- a/test/test_bitset_new_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_explicit_single_element_type.cpp
@@ -1726,36 +1726,188 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
 
+    //*************************************************************************
+    TEST(test_extract_6_bit_uint8_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t>(10, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t>(11, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t>(12, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t>(13, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(14, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t>(15, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t>(16, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t>(17, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t>(18, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t>(19, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t>(20, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(21, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t>(22, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t>(23, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t>(24, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t>(25, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<uint8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_uint8_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //uint8_t v1 = b.extract<uint8_t, 26, 7>();
+      //uint8_t v1 = b.extract<uint8_t, 27, 6>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t>(10, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t>(11, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t>(12, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t>(13, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(14, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t>(15, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t>(16, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t>(17, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t>(18, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t>(19, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t>(20, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(21, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t>(22, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t>(23, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t>(24, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t>(25, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<int8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 26, 7>();
+      //int8_t v1 = b.extract<int8_t, 27, 6>();
+    }
+
     //*************************************************************************
     TEST(test_extract_uint8_t_with_run_time_parameters)
     {
       ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
 
-      CHECK_EQUAL(0x78, b.extract<uint8_t>(0, 8));
-      CHECK_EQUAL(0x3C, b.extract<uint8_t>(1, 8));
-      CHECK_EQUAL(0x9E, b.extract<uint8_t>(2, 8));
-      CHECK_EQUAL(0xCF, b.extract<uint8_t>(3, 8));
-      CHECK_EQUAL(0x67, b.extract<uint8_t>(4, 8));
-      CHECK_EQUAL(0xB3, b.extract<uint8_t>(5, 8));
-      CHECK_EQUAL(0x59, b.extract<uint8_t>(6, 8));
-      CHECK_EQUAL(0xAC, b.extract<uint8_t>(7, 8));
-      CHECK_EQUAL(0x56, b.extract<uint8_t>(8, 8));
-      CHECK_EQUAL(0x2B, b.extract<uint8_t>(9, 8));
-      CHECK_EQUAL(0x15, b.extract<uint8_t>(10, 8));
-      CHECK_EQUAL(0x8A, b.extract<uint8_t>(11, 8));
-      CHECK_EQUAL(0x45, b.extract<uint8_t>(12, 8));
-      CHECK_EQUAL(0xA2, b.extract<uint8_t>(13, 8));
-      CHECK_EQUAL(0xD1, b.extract<uint8_t>(14, 8));
-      CHECK_EQUAL(0x68, b.extract<uint8_t>(15, 8));
-      CHECK_EQUAL(0x34, b.extract<uint8_t>(16, 8));
-      CHECK_EQUAL(0x1A, b.extract<uint8_t>(17, 8));
-      CHECK_EQUAL(0x8D, b.extract<uint8_t>(18, 8));
-      CHECK_EQUAL(0x46, b.extract<uint8_t>(19, 8));
-      CHECK_EQUAL(0x23, b.extract<uint8_t>(20, 8));
-      CHECK_EQUAL(0x91, b.extract<uint8_t>(21, 8));
-      CHECK_EQUAL(0x48, b.extract<uint8_t>(22, 8));
-      CHECK_EQUAL(0x24, b.extract<uint8_t>(23, 8));
-      CHECK_EQUAL(0x12, b.extract<uint8_t>(24, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x78), b.extract<uint8_t>( 0, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), b.extract<uint8_t>( 1, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), b.extract<uint8_t>( 2, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), b.extract<uint8_t>( 3, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x67), b.extract<uint8_t>( 4, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), b.extract<uint8_t>( 5, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x59), b.extract<uint8_t>( 6, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), b.extract<uint8_t>( 7, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x56), b.extract<uint8_t>( 8, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), b.extract<uint8_t>( 9, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x15), b.extract<uint8_t>(10, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), b.extract<uint8_t>(11, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x45), b.extract<uint8_t>(12, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), b.extract<uint8_t>(13, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), b.extract<uint8_t>(14, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x68), b.extract<uint8_t>(15, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x34), b.extract<uint8_t>(16, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), b.extract<uint8_t>(17, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), b.extract<uint8_t>(18, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x46), b.extract<uint8_t>(19, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x23), b.extract<uint8_t>(20, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x91), b.extract<uint8_t>(21, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x48), b.extract<uint8_t>(22, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
+
+      CHECK_THROW(b.extract<uint8_t>(24, 9), etl::bitset_overflow);
       CHECK_THROW(b.extract<uint8_t>(25, 8), etl::bitset_overflow);
     }
 
@@ -1764,35 +1916,277 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
 
-      CHECK_EQUAL(0x78, (b.extract<uint8_t, 0, 8>()));
-      CHECK_EQUAL(0x3C, (b.extract<uint8_t, 1, 8>()));
-      CHECK_EQUAL(0x9E, (b.extract<uint8_t, 2, 8>()));
-      CHECK_EQUAL(0xCF, (b.extract<uint8_t, 3, 8>()));
-      CHECK_EQUAL(0x67, (b.extract<uint8_t, 4, 8>()));
-      CHECK_EQUAL(0xB3, (b.extract<uint8_t, 5, 8>()));
-      CHECK_EQUAL(0x59, (b.extract<uint8_t, 6, 8>()));
-      CHECK_EQUAL(0xAC, (b.extract<uint8_t, 7, 8>()));
-      CHECK_EQUAL(0x56, (b.extract<uint8_t, 8, 8>()));
-      CHECK_EQUAL(0x2B, (b.extract<uint8_t, 9, 8>()));
-      CHECK_EQUAL(0x15, (b.extract<uint8_t, 10, 8>()));
-      CHECK_EQUAL(0x8A, (b.extract<uint8_t, 11, 8>()));
-      CHECK_EQUAL(0x45, (b.extract<uint8_t, 12, 8>()));
-      CHECK_EQUAL(0xA2, (b.extract<uint8_t, 13, 8>()));
-      CHECK_EQUAL(0xD1, (b.extract<uint8_t, 14, 8>()));
-      CHECK_EQUAL(0x68, (b.extract<uint8_t, 15, 8>()));
-      CHECK_EQUAL(0x34, (b.extract<uint8_t, 16, 8>()));
-      CHECK_EQUAL(0x1A, (b.extract<uint8_t, 17, 8>()));
-      CHECK_EQUAL(0x8D, (b.extract<uint8_t, 18, 8>()));
-      CHECK_EQUAL(0x46, (b.extract<uint8_t, 19, 8>()));
-      CHECK_EQUAL(0x23, (b.extract<uint8_t, 20, 8>()));
-      CHECK_EQUAL(0x91, (b.extract<uint8_t, 21, 8>()));
-      CHECK_EQUAL(0x48, (b.extract<uint8_t, 22, 8>()));
-      CHECK_EQUAL(0x24, (b.extract<uint8_t, 23, 8>()));
-      CHECK_EQUAL(0x12, (b.extract<uint8_t, 24, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x78), (b.extract<uint8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), (b.extract<uint8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), (b.extract<uint8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x67), (b.extract<uint8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), (b.extract<uint8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x59), (b.extract<uint8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), (b.extract<uint8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x56), (b.extract<uint8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), (b.extract<uint8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x45), (b.extract<uint8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), (b.extract<uint8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), (b.extract<uint8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x68), (b.extract<uint8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), (b.extract<uint8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x46), (b.extract<uint8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x91), (b.extract<uint8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x48), (b.extract<uint8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
 
       // The lines below should static assert.
-      //uint8_t v = b.extract<uint8_t, 25, 8>();
-      //uint8_t v = b.extract<uint8_t, 25, 9>();
+      //uint8_t v1 = b.extract<uint8_t, 24, 9>();
+      //uint8_t v2 = b.extract<uint8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), b.extract<int8_t>( 0, 8));
+      CHECK_EQUAL_HEX(int8_t(0x3C), b.extract<int8_t>( 1, 8));
+      CHECK_EQUAL_HEX(int8_t(0x9E), b.extract<int8_t>( 2, 8));
+      CHECK_EQUAL_HEX(int8_t(0xCF), b.extract<int8_t>( 3, 8));
+      CHECK_EQUAL_HEX(int8_t(0x67), b.extract<int8_t>( 4, 8));
+      CHECK_EQUAL_HEX(int8_t(0xB3), b.extract<int8_t>( 5, 8));
+      CHECK_EQUAL_HEX(int8_t(0x59), b.extract<int8_t>( 6, 8));
+      CHECK_EQUAL_HEX(int8_t(0xAC), b.extract<int8_t>( 7, 8));
+      CHECK_EQUAL_HEX(int8_t(0x56), b.extract<int8_t>( 8, 8));
+      CHECK_EQUAL_HEX(int8_t(0x2B), b.extract<int8_t>( 9, 8));
+      CHECK_EQUAL_HEX(int8_t(0x15), b.extract<int8_t>(10, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8A), b.extract<int8_t>(11, 8));
+      CHECK_EQUAL_HEX(int8_t(0x45), b.extract<int8_t>(12, 8));
+      CHECK_EQUAL_HEX(int8_t(0xA2), b.extract<int8_t>(13, 8));
+      CHECK_EQUAL_HEX(int8_t(0xD1), b.extract<int8_t>(14, 8));
+      CHECK_EQUAL_HEX(int8_t(0x68), b.extract<int8_t>(15, 8));
+      CHECK_EQUAL_HEX(int8_t(0x34), b.extract<int8_t>(16, 8));
+      CHECK_EQUAL_HEX(int8_t(0x1A), b.extract<int8_t>(17, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8D), b.extract<int8_t>(18, 8));
+      CHECK_EQUAL_HEX(int8_t(0x46), b.extract<int8_t>(19, 8));
+      CHECK_EQUAL_HEX(int8_t(0x23), b.extract<int8_t>(20, 8));
+      CHECK_EQUAL_HEX(int8_t(0x91), b.extract<int8_t>(21, 8));
+      CHECK_EQUAL_HEX(int8_t(0x48), b.extract<int8_t>(22, 8));
+      CHECK_EQUAL_HEX(int8_t(0x24), b.extract<int8_t>(23, 8));
+      CHECK_EQUAL_HEX(int8_t(0x12), b.extract<int8_t>(24, 8));
+
+      CHECK_THROW(b.extract<int8_t>(24, 9), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(25, 8), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), (b.extract<int8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x3C), (b.extract<int8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x9E), (b.extract<int8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xCF), (b.extract<int8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x67), (b.extract<int8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xB3), (b.extract<int8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x59), (b.extract<int8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xAC), (b.extract<int8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x56), (b.extract<int8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x2B), (b.extract<int8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8A), (b.extract<int8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x45), (b.extract<int8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xA2), (b.extract<int8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xD1), (b.extract<int8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x68), (b.extract<int8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x34), (b.extract<int8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8D), (b.extract<int8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x46), (b.extract<int8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x23), (b.extract<int8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x91), (b.extract<int8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x48), (b.extract<int8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x24), (b.extract<int8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 8>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 24, 9>();
+      //int8_t v2 = b.extract<int8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), b.extract<uint16_t>( 0, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), b.extract<uint16_t>( 1, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), b.extract<uint16_t>( 3, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), b.extract<uint16_t>( 4, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), b.extract<uint16_t>( 5, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), b.extract<uint16_t>( 6, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), b.extract<uint16_t>( 7, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), b.extract<uint16_t>( 8, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), b.extract<uint16_t>(10, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), b.extract<uint16_t>(11, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), b.extract<uint16_t>(12, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), b.extract<uint16_t>(13, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), b.extract<uint16_t>(14, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), b.extract<uint16_t>(15, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), b.extract<uint16_t>(17, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), b.extract<uint16_t>(18, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), b.extract<uint16_t>(19, 13));
+
+      CHECK_THROW(b.extract<uint16_t>(19, 14), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(20, 13), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), (b.extract<uint16_t,  0, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), (b.extract<uint16_t,  1, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), (b.extract<uint16_t,  3, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), (b.extract<uint16_t,  4, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), (b.extract<uint16_t,  5, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), (b.extract<uint16_t,  6, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), (b.extract<uint16_t,  7, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), (b.extract<uint16_t,  8, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), (b.extract<uint16_t, 10, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), (b.extract<uint16_t, 11, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), (b.extract<uint16_t, 12, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), (b.extract<uint16_t, 13, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), (b.extract<uint16_t, 14, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), (b.extract<uint16_t, 15, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), (b.extract<uint16_t, 17, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), (b.extract<uint16_t, 18, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), (b.extract<uint16_t, 19, 13>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 19, 14);
+      //uint16_t v2 = b.extract<uint16_t, 20, 13);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), b.extract<uint16_t>( 0, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), b.extract<uint16_t>( 1, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), b.extract<uint16_t>( 3, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), b.extract<uint16_t>( 4, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), b.extract<uint16_t>( 5, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), b.extract<uint16_t>( 6, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), b.extract<uint16_t>( 7, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), b.extract<uint16_t>( 8, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), b.extract<uint16_t>(10, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), b.extract<uint16_t>(11, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), b.extract<uint16_t>(12, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), b.extract<uint16_t>(13, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), b.extract<uint16_t>(14, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), b.extract<uint16_t>(15, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 16));
+
+      CHECK_THROW(b.extract<uint16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), (b.extract<uint16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), (b.extract<uint16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), (b.extract<uint16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), (b.extract<uint16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), (b.extract<uint16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), (b.extract<uint16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), (b.extract<uint16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), (b.extract<uint16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), (b.extract<uint16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), (b.extract<uint16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), (b.extract<uint16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), (b.extract<uint16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), (b.extract<uint16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), (b.extract<uint16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 16, 17>();
+      //uint16_t v2 = b.extract<uint16_t, 17, 16>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_run_time_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>( 0, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>( 1, 16));
+      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>( 2, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>( 3, 16));
+      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>( 4, 16));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>( 5, 16));
+      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>( 6, 16));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>( 7, 16));
+      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>( 8, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>( 9, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), b.extract<int16_t>(10, 16));
+      CHECK_EQUAL_HEX(int16_t(0x468A), b.extract<int16_t>(11, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2345), b.extract<int16_t>(12, 16));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), b.extract<int16_t>(13, 16));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), b.extract<int16_t>(14, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2468), b.extract<int16_t>(15, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1234), b.extract<int16_t>(16, 16));
+
+      CHECK_THROW(b.extract<int16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_template_parameters)
+    {
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), (b.extract<int16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x468A), (b.extract<int16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2345), (b.extract<int16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), (b.extract<int16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), (b.extract<int16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2468), (b.extract<int16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1234), (b.extract<int16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //int16_t v1 = b.extract<int16_t, 16, 17>());
+      //int16_t v2 = b.extract<int16_t, 17, 16>());
     }
   };
 }
diff --git a/test/test_bitset_new_ext_default_element_type.cpp b/test/test_bitset_new_ext_default_element_type.cpp
index 07025ff3..7cd47788 100644
--- a/test/test_bitset_new_ext_default_element_type.cpp
+++ b/test/test_bitset_new_ext_default_element_type.cpp
@@ -2131,6 +2131,168 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
 
+    //*************************************************************************
+    TEST(test_extract_6_bit_uint8_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t>(10, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t>(11, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t>(12, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t>(13, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(14, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t>(15, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t>(16, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t>(17, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t>(18, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t>(19, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t>(20, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(21, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t>(22, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t>(23, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t>(24, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t>(25, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<uint8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_uint8_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //uint8_t v1 = b.extract<uint8_t, 26, 7>();
+      //uint8_t v1 = b.extract<uint8_t, 27, 6>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t>(10, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t>(11, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t>(12, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t>(13, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(14, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t>(15, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t>(16, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t>(17, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t>(18, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t>(19, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t>(20, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(21, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t>(22, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t>(23, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t>(24, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t>(25, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<int8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 26, 7>();
+      //int8_t v1 = b.extract<int8_t, 27, 6>();
+    }
+
     //*************************************************************************
     TEST(test_extract_uint8_t_with_run_time_parameters)
     {
@@ -2164,6 +2326,9 @@ namespace
       CHECK_EQUAL_HEX(uint8_t(0x48), b.extract<uint8_t>(22, 8));
       CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
       CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
+
+      CHECK_THROW(b.extract<uint8_t>(24, 9), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(25, 8), etl::bitset_overflow);
     }
 
     //*************************************************************************
@@ -2200,9 +2365,275 @@ namespace
       CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 8>()));
       CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
 
-      // The line below should static assert.
-      //uint8_t v = b.extract<uint8_t, 25, 8>();
-      //uint8_t v = b.extract<uint8_t, 25, 9>();
+      // The lines below should static assert.
+      //uint8_t v1 = b.extract<uint8_t, 24, 9>();
+      //uint8_t v2 = b.extract<uint8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), b.extract<int8_t>( 0, 8));
+      CHECK_EQUAL_HEX(int8_t(0x3C), b.extract<int8_t>( 1, 8));
+      CHECK_EQUAL_HEX(int8_t(0x9E), b.extract<int8_t>( 2, 8));
+      CHECK_EQUAL_HEX(int8_t(0xCF), b.extract<int8_t>( 3, 8));
+      CHECK_EQUAL_HEX(int8_t(0x67), b.extract<int8_t>( 4, 8));
+      CHECK_EQUAL_HEX(int8_t(0xB3), b.extract<int8_t>( 5, 8));
+      CHECK_EQUAL_HEX(int8_t(0x59), b.extract<int8_t>( 6, 8));
+      CHECK_EQUAL_HEX(int8_t(0xAC), b.extract<int8_t>( 7, 8));
+      CHECK_EQUAL_HEX(int8_t(0x56), b.extract<int8_t>( 8, 8));
+      CHECK_EQUAL_HEX(int8_t(0x2B), b.extract<int8_t>( 9, 8));
+      CHECK_EQUAL_HEX(int8_t(0x15), b.extract<int8_t>(10, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8A), b.extract<int8_t>(11, 8));
+      CHECK_EQUAL_HEX(int8_t(0x45), b.extract<int8_t>(12, 8));
+      CHECK_EQUAL_HEX(int8_t(0xA2), b.extract<int8_t>(13, 8));
+      CHECK_EQUAL_HEX(int8_t(0xD1), b.extract<int8_t>(14, 8));
+      CHECK_EQUAL_HEX(int8_t(0x68), b.extract<int8_t>(15, 8));
+      CHECK_EQUAL_HEX(int8_t(0x34), b.extract<int8_t>(16, 8));
+      CHECK_EQUAL_HEX(int8_t(0x1A), b.extract<int8_t>(17, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8D), b.extract<int8_t>(18, 8));
+      CHECK_EQUAL_HEX(int8_t(0x46), b.extract<int8_t>(19, 8));
+      CHECK_EQUAL_HEX(int8_t(0x23), b.extract<int8_t>(20, 8));
+      CHECK_EQUAL_HEX(int8_t(0x91), b.extract<int8_t>(21, 8));
+      CHECK_EQUAL_HEX(int8_t(0x48), b.extract<int8_t>(22, 8));
+      CHECK_EQUAL_HEX(int8_t(0x24), b.extract<int8_t>(23, 8));
+      CHECK_EQUAL_HEX(int8_t(0x12), b.extract<int8_t>(24, 8));
+
+      CHECK_THROW(b.extract<int8_t>(24, 9), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(25, 8), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), (b.extract<int8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x3C), (b.extract<int8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x9E), (b.extract<int8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xCF), (b.extract<int8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x67), (b.extract<int8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xB3), (b.extract<int8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x59), (b.extract<int8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xAC), (b.extract<int8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x56), (b.extract<int8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x2B), (b.extract<int8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8A), (b.extract<int8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x45), (b.extract<int8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xA2), (b.extract<int8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xD1), (b.extract<int8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x68), (b.extract<int8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x34), (b.extract<int8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8D), (b.extract<int8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x46), (b.extract<int8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x23), (b.extract<int8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x91), (b.extract<int8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x48), (b.extract<int8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x24), (b.extract<int8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 8>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 24, 9>();
+      //int8_t v2 = b.extract<int8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), b.extract<uint16_t>( 0, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), b.extract<uint16_t>( 1, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), b.extract<uint16_t>( 3, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), b.extract<uint16_t>( 4, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), b.extract<uint16_t>( 5, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), b.extract<uint16_t>( 6, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), b.extract<uint16_t>( 7, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), b.extract<uint16_t>( 8, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), b.extract<uint16_t>(10, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), b.extract<uint16_t>(11, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), b.extract<uint16_t>(12, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), b.extract<uint16_t>(13, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), b.extract<uint16_t>(14, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), b.extract<uint16_t>(15, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), b.extract<uint16_t>(17, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), b.extract<uint16_t>(18, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), b.extract<uint16_t>(19, 13));
+
+      CHECK_THROW(b.extract<uint16_t>(19, 14), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(20, 13), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), (b.extract<uint16_t,  0, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), (b.extract<uint16_t,  1, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), (b.extract<uint16_t,  3, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), (b.extract<uint16_t,  4, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), (b.extract<uint16_t,  5, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), (b.extract<uint16_t,  6, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), (b.extract<uint16_t,  7, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), (b.extract<uint16_t,  8, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), (b.extract<uint16_t, 10, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), (b.extract<uint16_t, 11, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), (b.extract<uint16_t, 12, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), (b.extract<uint16_t, 13, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), (b.extract<uint16_t, 14, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), (b.extract<uint16_t, 15, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), (b.extract<uint16_t, 17, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), (b.extract<uint16_t, 18, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), (b.extract<uint16_t, 19, 13>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 19, 14);
+      //uint16_t v2 = b.extract<uint16_t, 20, 13);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), b.extract<uint16_t>( 0, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), b.extract<uint16_t>( 1, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), b.extract<uint16_t>( 3, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), b.extract<uint16_t>( 4, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), b.extract<uint16_t>( 5, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), b.extract<uint16_t>( 6, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), b.extract<uint16_t>( 7, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), b.extract<uint16_t>( 8, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), b.extract<uint16_t>(10, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), b.extract<uint16_t>(11, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), b.extract<uint16_t>(12, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), b.extract<uint16_t>(13, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), b.extract<uint16_t>(14, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), b.extract<uint16_t>(15, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 16));
+
+      CHECK_THROW(b.extract<uint16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), (b.extract<uint16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), (b.extract<uint16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), (b.extract<uint16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), (b.extract<uint16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), (b.extract<uint16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), (b.extract<uint16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), (b.extract<uint16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), (b.extract<uint16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), (b.extract<uint16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), (b.extract<uint16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), (b.extract<uint16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), (b.extract<uint16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), (b.extract<uint16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), (b.extract<uint16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 16, 17>();
+      //uint16_t v2 = b.extract<uint16_t, 17, 16>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>( 0, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>( 1, 16));
+      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>( 2, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>( 3, 16));
+      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>( 4, 16));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>( 5, 16));
+      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>( 6, 16));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>( 7, 16));
+      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>( 8, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>( 9, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), b.extract<int16_t>(10, 16));
+      CHECK_EQUAL_HEX(int16_t(0x468A), b.extract<int16_t>(11, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2345), b.extract<int16_t>(12, 16));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), b.extract<int16_t>(13, 16));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), b.extract<int16_t>(14, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2468), b.extract<int16_t>(15, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1234), b.extract<int16_t>(16, 16));
+
+      CHECK_THROW(b.extract<int16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), (b.extract<int16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x468A), (b.extract<int16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2345), (b.extract<int16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), (b.extract<int16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), (b.extract<int16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2468), (b.extract<int16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1234), (b.extract<int16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //int16_t v1 = b.extract<int16_t, 16, 17>());
+      //int16_t v2 = b.extract<int16_t, 17, 16>());
     }
   };
 }
diff --git a/test/test_bitset_new_ext_explicit_single_element_type.cpp b/test/test_bitset_new_ext_explicit_single_element_type.cpp
index af31e5b7..4b3d3948 100644
--- a/test/test_bitset_new_ext_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_ext_explicit_single_element_type.cpp
@@ -1479,10 +1479,172 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
 
+    //*************************************************************************
+    TEST(test_extract_6_bit_uint8_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t>(10, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t>(11, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t>(12, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t>(13, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(14, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t>(15, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t>(16, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t>(17, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t>(18, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t>(19, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t>(20, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t>(21, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t>(22, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t>(23, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t>(24, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t>(25, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<uint8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_uint8_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x22), (b.extract<uint8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x28), (b.extract<uint8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0D), (b.extract<uint8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x06), (b.extract<uint8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x11), (b.extract<uint8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x08), (b.extract<uint8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x09), (b.extract<uint8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x04), (b.extract<uint8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //uint8_t v1 = b.extract<uint8_t, 26, 7>();
+      //uint8_t v1 = b.extract<uint8_t, 27, 6>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>( 0, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>( 1, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>( 2, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>( 3, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>( 4, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>( 5, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>( 6, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>( 7, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>( 8, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t>(10, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t>(11, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t>(12, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t>(13, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(14, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t>(15, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t>(16, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t>(17, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t>(18, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t>(19, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t>(20, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t>(21, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t>(22, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t>(23, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t>(24, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t>(25, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t>(26, 6)));
+
+      CHECK_THROW(b.extract<int8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(27, 6), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_6_bit_int8_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t,  0, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t,  1, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t,  2, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t,  3, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t,  4, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t,  5, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t,  6, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t,  7, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t,  8, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t, 11, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t, 12, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE2), (b.extract<int8_t, 13, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 14, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE8), (b.extract<int8_t, 15, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF4), (b.extract<int8_t, 16, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0D), (b.extract<int8_t, 18, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x06), (b.extract<int8_t, 19, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE3), (b.extract<int8_t, 20, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x11), (b.extract<int8_t, 21, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x08), (b.extract<int8_t, 22, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE4), (b.extract<int8_t, 23, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t, 25, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t, 26, 6>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 26, 7>();
+      //int8_t v1 = b.extract<int8_t, 27, 6>();
+    }
+
     //*************************************************************************
     TEST(test_extract_uint8_t_with_run_time_parameters)
     {
-      using bs32 = etl::bitset_ext<32, int32_t>;
+      using bs32 = etl::bitset_ext<32, uint32_t>;
 
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
@@ -1512,12 +1674,15 @@ namespace
       CHECK_EQUAL_HEX(uint8_t(0x48), b.extract<uint8_t>(22, 8));
       CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
       CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
+
+      CHECK_THROW(b.extract<uint8_t>(24, 9), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(25, 8), etl::bitset_overflow);
     }
 
     //*************************************************************************
     TEST(test_extract_uint8_t_with_template_parameters)
     {
-      using bs32 = etl::bitset_ext<32, int32_t>;
+      using bs32 = etl::bitset_ext<32, uint32_t>;
 
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
@@ -1548,9 +1713,275 @@ namespace
       CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 8>()));
       CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
 
-      // The line below should static assert.
-      //uint8_t v = b.extract<uint8_t, 25, 8>();
-      //uint8_t v = b.extract<uint8_t, 25, 9>();
+      // The lines below should static assert.
+      //uint8_t v1 = b.extract<uint8_t, 24, 9>();
+      //uint8_t v2 = b.extract<uint8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), b.extract<int8_t>( 0, 8));
+      CHECK_EQUAL_HEX(int8_t(0x3C), b.extract<int8_t>( 1, 8));
+      CHECK_EQUAL_HEX(int8_t(0x9E), b.extract<int8_t>( 2, 8));
+      CHECK_EQUAL_HEX(int8_t(0xCF), b.extract<int8_t>( 3, 8));
+      CHECK_EQUAL_HEX(int8_t(0x67), b.extract<int8_t>( 4, 8));
+      CHECK_EQUAL_HEX(int8_t(0xB3), b.extract<int8_t>( 5, 8));
+      CHECK_EQUAL_HEX(int8_t(0x59), b.extract<int8_t>( 6, 8));
+      CHECK_EQUAL_HEX(int8_t(0xAC), b.extract<int8_t>( 7, 8));
+      CHECK_EQUAL_HEX(int8_t(0x56), b.extract<int8_t>( 8, 8));
+      CHECK_EQUAL_HEX(int8_t(0x2B), b.extract<int8_t>( 9, 8));
+      CHECK_EQUAL_HEX(int8_t(0x15), b.extract<int8_t>(10, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8A), b.extract<int8_t>(11, 8));
+      CHECK_EQUAL_HEX(int8_t(0x45), b.extract<int8_t>(12, 8));
+      CHECK_EQUAL_HEX(int8_t(0xA2), b.extract<int8_t>(13, 8));
+      CHECK_EQUAL_HEX(int8_t(0xD1), b.extract<int8_t>(14, 8));
+      CHECK_EQUAL_HEX(int8_t(0x68), b.extract<int8_t>(15, 8));
+      CHECK_EQUAL_HEX(int8_t(0x34), b.extract<int8_t>(16, 8));
+      CHECK_EQUAL_HEX(int8_t(0x1A), b.extract<int8_t>(17, 8));
+      CHECK_EQUAL_HEX(int8_t(0x8D), b.extract<int8_t>(18, 8));
+      CHECK_EQUAL_HEX(int8_t(0x46), b.extract<int8_t>(19, 8));
+      CHECK_EQUAL_HEX(int8_t(0x23), b.extract<int8_t>(20, 8));
+      CHECK_EQUAL_HEX(int8_t(0x91), b.extract<int8_t>(21, 8));
+      CHECK_EQUAL_HEX(int8_t(0x48), b.extract<int8_t>(22, 8));
+      CHECK_EQUAL_HEX(int8_t(0x24), b.extract<int8_t>(23, 8));
+      CHECK_EQUAL_HEX(int8_t(0x12), b.extract<int8_t>(24, 8));
+
+      CHECK_THROW(b.extract<int8_t>(24, 9), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int8_t>(25, 8), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int8_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int8_t(0x78), (b.extract<int8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x3C), (b.extract<int8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x9E), (b.extract<int8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xCF), (b.extract<int8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x67), (b.extract<int8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xB3), (b.extract<int8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x59), (b.extract<int8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xAC), (b.extract<int8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x56), (b.extract<int8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x2B), (b.extract<int8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8A), (b.extract<int8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x45), (b.extract<int8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xA2), (b.extract<int8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xD1), (b.extract<int8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x68), (b.extract<int8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x34), (b.extract<int8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x8D), (b.extract<int8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x46), (b.extract<int8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x23), (b.extract<int8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x91), (b.extract<int8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x48), (b.extract<int8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x24), (b.extract<int8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 8>()));
+
+      // The lines below should static assert.
+      //int8_t v1 = b.extract<int8_t, 24, 9>();
+      //int8_t v2 = b.extract<int8_t, 25, 8>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), b.extract<uint16_t>( 0, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), b.extract<uint16_t>( 1, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), b.extract<uint16_t>( 3, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), b.extract<uint16_t>( 4, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), b.extract<uint16_t>( 5, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), b.extract<uint16_t>( 6, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), b.extract<uint16_t>( 7, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), b.extract<uint16_t>( 8, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), b.extract<uint16_t>(10, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), b.extract<uint16_t>(11, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), b.extract<uint16_t>(12, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), b.extract<uint16_t>(13, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), b.extract<uint16_t>(14, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), b.extract<uint16_t>(15, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), b.extract<uint16_t>(17, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), b.extract<uint16_t>(18, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), b.extract<uint16_t>(19, 13));
+
+      CHECK_THROW(b.extract<uint16_t>(19, 14), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(20, 13), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_13_bits_uint16_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x1678), (b.extract<uint16_t,  0, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), (b.extract<uint16_t,  1, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), (b.extract<uint16_t,  3, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), (b.extract<uint16_t,  4, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), (b.extract<uint16_t,  5, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), (b.extract<uint16_t,  6, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), (b.extract<uint16_t,  7, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), (b.extract<uint16_t,  8, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), (b.extract<uint16_t, 10, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), (b.extract<uint16_t, 11, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), (b.extract<uint16_t, 12, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), (b.extract<uint16_t, 13, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), (b.extract<uint16_t, 14, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), (b.extract<uint16_t, 15, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), (b.extract<uint16_t, 17, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), (b.extract<uint16_t, 18, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), (b.extract<uint16_t, 19, 13>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 19, 14);
+      //uint16_t v2 = b.extract<uint16_t, 20, 13);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), b.extract<uint16_t>( 0, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), b.extract<uint16_t>( 1, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), b.extract<uint16_t>( 3, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), b.extract<uint16_t>( 4, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), b.extract<uint16_t>( 5, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), b.extract<uint16_t>( 6, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), b.extract<uint16_t>( 7, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), b.extract<uint16_t>( 8, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), b.extract<uint16_t>(10, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), b.extract<uint16_t>(11, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), b.extract<uint16_t>(12, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), b.extract<uint16_t>(13, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), b.extract<uint16_t>(14, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), b.extract<uint16_t>(15, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 16));
+
+      CHECK_THROW(b.extract<uint16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_uint16_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(uint16_t(0x5678), (b.extract<uint16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), (b.extract<uint16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), (b.extract<uint16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), (b.extract<uint16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), (b.extract<uint16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), (b.extract<uint16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), (b.extract<uint16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), (b.extract<uint16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), (b.extract<uint16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), (b.extract<uint16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), (b.extract<uint16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), (b.extract<uint16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), (b.extract<uint16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), (b.extract<uint16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //uint16_t v1 = b.extract<uint16_t, 16, 17>();
+      //uint16_t v2 = b.extract<uint16_t, 17, 16>();
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_run_time_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>( 0, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>( 1, 16));
+      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>( 2, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>( 3, 16));
+      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>( 4, 16));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>( 5, 16));
+      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>( 6, 16));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>( 7, 16));
+      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>( 8, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>( 9, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), b.extract<int16_t>(10, 16));
+      CHECK_EQUAL_HEX(int16_t(0x468A), b.extract<int16_t>(11, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2345), b.extract<int16_t>(12, 16));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), b.extract<int16_t>(13, 16));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), b.extract<int16_t>(14, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2468), b.extract<int16_t>(15, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1234), b.extract<int16_t>(16, 16));
+
+      CHECK_THROW(b.extract<int16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<int16_t>(17, 16), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_extract_int16_t_with_template_parameters)
+    {
+      using bs32 = etl::bitset_ext<32, uint32_t>;
+
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
+
+      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8D15), (b.extract<int16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x468A), (b.extract<int16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2345), (b.extract<int16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x91A2), (b.extract<int16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x48D1), (b.extract<int16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2468), (b.extract<int16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1234), (b.extract<int16_t, 16, 16>()));
+
+      // The lines below should static assert.
+      //int16_t v1 = b.extract<int16_t, 16, 17>());
+      //int16_t v2 = b.extract<int16_t, 17, 16>());
     }
   };
 }

From c5c88ae010e059cf9596645f7b970008c0f9c492 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Wed, 13 Dec 2023 09:59:59 +0000
Subject: [PATCH 022/131] Work in progress

---
 include/etl/private/bitset_new.h | 48 ++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 2257b838..71fd8ea1 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -966,7 +966,7 @@ namespace etl
   //***************************************************************************
   template <size_t Active_Bits = 0U,
             typename TElement = char,
-            bool IsSingleElement = etl::integral_limits<TElement>::bits == Active_Bits>
+            bool FitsInSingleElement = etl::integral_limits<TElement>::bits >= Active_Bits>
   class bitset;
 
   //***************************************************************************
@@ -976,6 +976,20 @@ namespace etl
   template <>
   class bitset<0U, char, true> : public bitset_constants<>
   {
+  public:
+
+    typedef char element_type;
+
+    typedef element_type*       pointer;
+    typedef const element_type* const_pointer;
+
+    static ETL_CONSTANT size_t       Bits_Per_Element   = 0U;
+    static ETL_CONSTANT size_t       Number_Of_Elements = 0U;
+    static ETL_CONSTANT size_t       Allocated_Bits     = 0U;
+    static ETL_CONSTANT element_type All_Set_Element    = 0U;
+    static ETL_CONSTANT element_type All_Clear_Element  = 0U;
+    static ETL_CONSTANT size_t       Top_Mask_Shift     = 0U;
+    static ETL_CONSTANT element_type Top_Mask           = 0U;
   };
 
   //***************************************************************************
@@ -984,11 +998,25 @@ namespace etl
   template <>
   class bitset<0U, char, false> : public bitset_constants<>
   {
+  public:
+
+    typedef char element_type;
+
+    typedef element_type*       pointer;
+    typedef const element_type* const_pointer;
+
+    static ETL_CONSTANT size_t       Bits_Per_Element   = 0U;
+    static ETL_CONSTANT size_t       Number_Of_Elements = 0U;
+    static ETL_CONSTANT size_t       Allocated_Bits     = 0U;
+    static ETL_CONSTANT element_type All_Set_Element    = 0U;
+    static ETL_CONSTANT element_type All_Clear_Element  = 0U;
+    static ETL_CONSTANT size_t       Top_Mask_Shift     = 0U;
+    static ETL_CONSTANT element_type Top_Mask           = 0U;
   };
 
   //***************************************************************************
-  /// Specialisation that uses a single element if the element type is the 
-  /// same size as the number of active bits.
+  /// Specialisation that uses a single element if the number of active bits
+  /// fits into the element type size.
   //***************************************************************************
   template <size_t Active_Bits, typename TElement>
   class bitset<Active_Bits, TElement, true> : public bitset_constants<>
@@ -1177,16 +1205,6 @@ namespace etl
       return *this;
     }
 
-    //*************************************************************************
-    /// Set from a value.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& set(element_type value) ETL_NOEXCEPT
-    {
-      buffer = value;
-
-      return *this;
-    }
-
     //*************************************************************************
     /// Set the bit at the position.
     //*************************************************************************
@@ -3333,7 +3351,7 @@ namespace etl
     //*************************************************************************
     /// The number of bits in the bitset.
     //*************************************************************************
-    ETL_CONSTEXPR14  size_t size() const ETL_NOEXCEPT
+    ETL_CONSTEXPR14 size_t size() const ETL_NOEXCEPT
     {
       return Active_Bits;
     }
@@ -4143,7 +4161,7 @@ namespace etl
     //*************************************************************************
     /// The number of bits in the bitset.
     //*************************************************************************
-    ETL_CONSTEXPR14  size_t size() const ETL_NOEXCEPT
+    ETL_CONSTEXPR14 size_t size() const ETL_NOEXCEPT
     {
       return Active_Bits;
     }

From 58f469ebd43a1ac851917fcf8d10d95b4459ea68 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Fri, 29 Dec 2023 09:33:20 +0000
Subject: [PATCH 023/131] Work in progress

Finished updating explicit single element tests
---
 include/etl/private/bitset_new.h              | 3864 ++++++-----------
 ...itset_new_explicit_single_element_type.cpp |  926 ++--
 2 files changed, 1897 insertions(+), 2893 deletions(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 71fd8ea1..7a766f64 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -76,14 +76,81 @@ SOFTWARE.
 
 namespace etl
 {
-  template <typename T = void>
-  struct bitset_constants
-  {
-    static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
-  };
+  //namespace private_bitset
+  //{
+  //  //***************************************************************************
+  //  /// Common definitions for etl::bitset_impl
+  //  ///\ingroup bitset
+  //  //***************************************************************************
+  //  template <typename TElement>
+  //  struct bitset_impl_common
+  //  {
+  //    typedef TElement            element_type;
+  //    typedef element_type* pointer;
+  //    typedef const element_type* const_pointer;
 
-  template <typename T>
-  ETL_CONSTANT size_t bitset_constants<T>::npos;
+  //    static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
+
+  //    static ETL_CONSTANT size_t       Bits_Per_Element  = etl::integral_limits<element_type>::bits;
+  //    static ETL_CONSTANT element_type All_Set_Element   = etl::integral_limits<element_type>::max;
+  //    static ETL_CONSTANT element_type All_Clear_Element = element_type(0);
+  //  };
+
+  //  template <typename TElement>
+  //  ETL_CONSTANT size_t bitset_impl_common<TElement>::npos;
+
+  //  template <typename TElement>
+  //  ETL_CONSTANT size_t bitset_impl_common<TElement>::Bits_Per_Element;
+
+  //  template <typename TElement>
+  //  ETL_CONSTANT TElement bitset_impl_common<TElement>::All_Set_Element;
+
+  //  template <typename TElement>
+  //  ETL_CONSTANT TElement bitset_impl_common<TElement>::All_Clear_Element;
+
+  //  //***************************************************************************
+  //  /// Common definitions for etl::bitset
+  //  ///\ingroup bitset
+  //  //***************************************************************************
+  //  template <size_t Active_Bits, typename TElement>
+  //  struct bitset_common : public bitset_impl_common<TElement>
+  //  {
+  //    typedef TElement element_type;
+
+  //    static ETL_CONSTANT size_t       Number_Of_Elements = (Active_Bits % Bits_Per_Element == 0) ? Active_Bits / Bits_Per_Element : Active_Bits / Bits_Per_Element + 1;
+  //    static ETL_CONSTANT size_t       Allocated_Bits     = Number_Of_Elements * Bits_Per_Element;
+  //    static ETL_CONSTANT size_t       Top_Mask_Shift     = ((Bits_Per_Element - (Allocated_Bits - Active_Bits)) % Bits_Per_Element);
+  //    static ETL_CONSTANT element_type Top_Mask           = element_type(Top_Mask_Shift == 0 ? All_Set_Element : ~(All_Set_Element << Top_Mask_Shift));
+
+  //    static ETL_CONSTANT size_t ALLOCATED_BITS = Allocated_Bits; ///< For backward compatibility.
+
+  //    typedef etl::span<element_type, Number_Of_Elements>       span_type;
+  //    typedef etl::span<const element_type, Number_Of_Elements> const_span_type;
+  //  };
+
+  //  template <size_t Active_Bits, typename TElement>
+  //  ETL_CONSTANT size_t bitset_common<Active_Bits, TElement>::Number_Of_Elements;
+
+  //  template <size_t Active_Bits, typename TElement>
+  //  ETL_CONSTANT size_t bitset_common<Active_Bits, TElement>::Allocated_Bits;
+
+  //  template <size_t Active_Bits, typename TElement>
+  //  ETL_CONSTANT size_t bitset_common<Active_Bits, TElement>::Top_Mask_Shift;
+
+  //  template <size_t Active_Bits, typename TElement>
+  //  ETL_CONSTANT typename bitset_common<Active_Bits, TElement>::element_type private_bitset::bitset_common<Active_Bits, TElement>::Top_Mask;
+  //}
+
+  //***************************************************************************
+  /// Flags to indicate whether the bitset is contained in a single element
+  /// or spread over an array of elements.
+  ///\ingroup bitset
+  //***************************************************************************
+  struct bitset_layout
+  {
+    static ETL_CONSTANT bool Single = true;
+    static ETL_CONSTANT bool Multi  = false;
+  };
 
   //***************************************************************************
   /// Exception base for bitset
@@ -142,23 +209,685 @@ namespace etl
   };
 
   //*************************************************************************
-  /// The implementation class for multi-element etl::bitset
+  /// Bitset implementation declaration.
+  ///\ingroup bitset
+  //*************************************************************************
+  template <typename TElement, bool Bitset_Layout>
+  class bitset_impl;
+
+  //*************************************************************************
+  /// The implementation class for single element etl::bitset
   ///\ingroup bitset
   //*************************************************************************
   template <typename TElement>
-  class bitset_impl : public bitset_constants<>
+  class bitset_impl<TElement, etl::bitset_layout::Single>
   {
   public:
 
-    typedef typename etl::make_unsigned<TElement>::type element_type;
+    //static ETL_CONSTANT bool Element_Layout = etl::bitset_layout::Single;
 
+    typedef TElement            element_type;
     typedef element_type*       pointer;
     typedef const element_type* const_pointer;
 
-    static ETL_CONSTANT size_t       Bits_Per_Element   = etl::integral_limits<element_type>::bits;
-    static ETL_CONSTANT element_type All_Set_Element    = etl::integral_limits<element_type>::max;
-    static ETL_CONSTANT element_type All_Clear_Element  = element_type(0);
+    static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
 
+    static ETL_CONSTANT size_t       Bits_Per_Element = etl::integral_limits<element_type>::bits;
+    static ETL_CONSTANT element_type All_Set_Element = etl::integral_limits<element_type>::max;
+    static ETL_CONSTANT element_type All_Clear_Element = element_type(0);
+
+    //*************************************************************************
+    /// Set all of the bits.
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    void set(pointer pbuffer, 
+             size_t  /*number_of_elements*/) ETL_NOEXCEPT
+    {
+      *pbuffer = All_Set_Element;
+    }
+
+    //*************************************************************************
+    /// Set the bit at the position.
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    void set(pointer pbuffer, 
+             size_t  /*number_of_elements*/, 
+             size_t  position, 
+             bool    value = true)
+    {
+      const element_type mask = element_type(element_type(1) << position);
+
+      if (value == true)
+      {
+        *pbuffer |= mask;
+      }
+      else
+      {
+        *pbuffer &= ~mask;
+      }
+    }
+
+    //*************************************************************************
+    /// Reset all of the bits.
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    void reset(pointer pbuffer, 
+               size_t  /*number_of_elements*/) ETL_NOEXCEPT
+    {
+      *pbuffer = All_Clear_Element;
+    }
+
+    //*************************************************************************
+    /// Reset the bit at the position.
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    void reset(pointer pbuffer, 
+               size_t  /*number_of_elements*/, 
+               size_t  position)
+    {
+      const element_type mask = element_type(element_type(1) << position);
+      *pbuffer &= ~mask;
+    }
+
+    //*************************************************************************
+    /// Set from a string.
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static 
+    void from_string(pointer     pbuffer, 
+                     size_t      /*number_of_elements*/, 
+                     size_t      active_bits, 
+                     const char* text) ETL_NOEXCEPT
+    {
+      if (text == ETL_NULLPTR)
+      {
+        reset(pbuffer, 1U);
+      }
+      else
+      {
+        size_t string_length = etl::strlen(text);
+
+        // Build from the string.
+        string_length = etl::min(active_bits, string_length);
+
+        element_type mask = element_type(element_type(1) << (string_length - 1U));
+
+        for (size_t i = 0U; i < string_length; ++i)
+        {
+          if (text[i] == ETL_STR('1'))
+          {
+            *pbuffer |= mask;
+          }
+          else
+          {
+            *pbuffer &= ~mask;
+          }
+
+          mask >>= 1U;
+        }
+      }
+    }
+
+    //*************************************************************************
+    /// Set from a wide string.
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static 
+    void from_string(pointer        pbuffer, 
+                     size_t         /*number_of_elements*/, 
+                     size_t         active_bits, 
+                     const wchar_t* text) ETL_NOEXCEPT
+    {
+      if (text == ETL_NULLPTR)
+      {
+        reset(pbuffer, 1U);
+      }
+      else
+      {
+        size_t string_length = etl::strlen(text);
+
+        // Build from the string.
+        string_length = etl::min(active_bits, string_length);
+
+        element_type mask = element_type(element_type(1) << (string_length - 1U));
+
+        for (size_t i = 0U; i < string_length; ++i)
+        {
+          if (text[i] == ETL_STRL('1'))
+          {
+            *pbuffer |= mask;
+          }
+          else
+          {
+            *pbuffer &= ~mask;
+          }
+
+          mask >>= 1U;
+        }
+      }
+    }
+
+    //*************************************************************************
+    /// Set from a u16 string.
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static 
+    void from_string(pointer         pbuffer, 
+                     size_t          /*number_of_elements*/, 
+                     size_t          active_bits, 
+                     const char16_t* text) ETL_NOEXCEPT
+    {
+      if (text == ETL_NULLPTR)
+      {
+        reset(pbuffer, 1U);
+      }
+      else
+      {
+        size_t string_length = etl::strlen(text);
+
+        // Build from the string.
+        string_length = etl::min(active_bits, string_length);
+
+        element_type mask = element_type(element_type(1) << (string_length - 1U));
+
+        for (size_t i = 0U; i < string_length; ++i)
+        {
+          if (text[i] == ETL_STRu('1'))
+          {
+            *pbuffer |= mask;
+          }
+          else
+          {
+            *pbuffer &= ~mask;
+          }
+
+          mask >>= 1U;
+        }
+      }
+    }
+
+    //*************************************************************************
+    /// Set from a u32 string.
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    void from_string(pointer         pbuffer, 
+                     size_t          /*number_of_elements*/, 
+                     size_t          active_bits, 
+                     const char32_t* text) ETL_NOEXCEPT
+    {
+      if (text == ETL_NULLPTR)
+      {
+        reset(pbuffer, 1U);
+      }
+      else
+      {
+        size_t string_length = etl::strlen(text);
+
+        // Build from the string.
+        string_length = etl::min(active_bits, string_length);
+
+        element_type mask = element_type(element_type(1) << (string_length - 1U));
+
+        for (size_t i = 0U; i < string_length; ++i)
+        {
+          if (text[i] == ETL_STRU('1'))
+          {
+            *pbuffer |= mask;
+          }
+          else
+          {
+            *pbuffer &= ~mask;
+          }
+
+          mask >>= 1U;
+        }
+      }
+    }
+
+    //*************************************************************************
+    /// Get as an integral value.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    static
+    T value(const_pointer pbuffer, 
+            size_t        /*number_of_elements*/) ETL_NOEXCEPT
+    {
+      return T(*pbuffer);
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    static
+    T extract(const_pointer pbuffer, 
+              size_t        position, 
+              size_t        length = etl::integral_limits<T>::bits)
+    {
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      const unsigned_t Mask  = etl::make_lsb_mask<unsigned_t>(length);
+      const unsigned_t Shift = position % Bits_Per_Element;
+
+      unsigned_t value = static_cast<unsigned_t>(*pbuffer >> Shift) & Mask;
+
+      if ((length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T>(value, length);
+      }
+
+      return static_cast<T>(value);
+    }
+
+    //*************************************************************************
+    /// Tests a bit at a position.
+    /// Positions greater than the number of configured bits will return <b>false</b>.
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    bool test(const_pointer pbuffer, 
+              size_t        /*number_of_elements*/, 
+              size_t        position)
+    {
+      const element_type mask = element_type(element_type(1) << position);
+      return (*pbuffer & mask) != 0U;
+    }
+
+    //*************************************************************************
+    /// Count the number of bits set.
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    size_t count(const_pointer pbuffer, 
+                 size_t        /*number_of_elements*/) ETL_NOEXCEPT
+    {
+      return etl::count_bits(*pbuffer);
+    }
+
+    //*************************************************************************
+    // Are all the bits sets?
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    bool all(const_pointer pbuffer, 
+             size_t        /*number_of_elements*/, 
+             element_type  top_mask) ETL_NOEXCEPT
+    {
+      return (*pbuffer & top_mask) == top_mask;
+    }
+
+    //*************************************************************************
+    // Are all the mask bits sets?
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    bool all(const_pointer pbuffer, 
+             size_t        /*number_of_elements*/, 
+             element_type  top_mask, 
+             element_type  mask) ETL_NOEXCEPT
+    {
+      return (*pbuffer & top_mask & mask) == mask;
+    }
+
+    //*************************************************************************
+    /// Are none of the bits set?
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    bool none(const_pointer pbuffer, 
+              size_t        /*number_of_elements*/) ETL_NOEXCEPT
+    {
+      return *pbuffer == All_Clear_Element;
+    }
+
+    //*************************************************************************
+    /// Are none of the mask bits set?
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    bool none(const_pointer pbuffer, 
+              size_t        /*number_of_elements*/, 
+              element_type  mask) ETL_NOEXCEPT
+    {
+      return (*pbuffer & mask) == All_Clear_Element;
+    }
+
+    //*************************************************************************
+    /// Are any of the bits set?
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    bool any(const_pointer pbuffer, 
+             size_t        /*number_of_elements*/) ETL_NOEXCEPT
+    {
+      return *pbuffer != All_Clear_Element;
+    }
+
+    //*************************************************************************
+    /// Are any of the mask bits set?
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    bool any(const_pointer pbuffer, 
+             size_t        /*number_of_elements*/, 
+             element_type  mask) ETL_NOEXCEPT
+    {
+      return (*pbuffer & mask) != All_Clear_Element;
+    }
+
+    //*************************************************************************
+    /// Flip all of the bits.
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    void flip(pointer pbuffer, 
+              size_t  /*number_of_elements*/) ETL_NOEXCEPT
+    {
+      *pbuffer = ~*pbuffer;
+    }
+
+    //*************************************************************************
+    /// Flip some of the bits.
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    void flip_bits(pointer      pbuffer, 
+                   size_t       /*number_of_elements*/, 
+                   element_type mask = etl::integral_limits<element_type>::max) ETL_NOEXCEPT
+    {
+      *pbuffer ^= mask;
+    }
+
+    //*************************************************************************
+    /// Flip the bit at the position.
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    void flip(pointer pbuffer, 
+              size_t  /*number_of_elements*/, 
+              size_t  position)
+    {
+      const element_type mask = element_type(element_type(1) << position);
+      *pbuffer ^= mask;
+    }
+
+    //*************************************************************************
+    /// Read [] operator.
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    bool read_bit(const_pointer pbuffer, 
+                  size_t        active_bits, 
+                  size_t        /*number_of_elements*/, 
+                  size_t        position) ETL_NOEXCEPT
+    {
+      if (position < active_bits)
+      {
+        const element_type mask = element_type(element_type(1) << position);
+        return (*pbuffer & mask) != 0U;
+      }
+
+      return false;
+    }
+
+    //*************************************************************************
+    /// Write [] operator.
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    void write_bit(pointer pbuffer, 
+                   size_t  /*number_of_elements*/, 
+                   size_t  position) ETL_NOEXCEPT
+    {
+      return bit_reference(*this, position);
+    }
+
+    //*************************************************************************
+    /// Returns a string representing the bitset.
+    //*************************************************************************
+#if ETL_USING_CPP11
+    template <typename TString = etl::string<Active_Bits>>
+#else
+    template <typename TString>
+#endif
+    ETL_CONSTEXPR14 
+    static 
+    TString to_string(const_pointer pbuffer,
+                      size_t /*number_of_elements*/,
+                      size_t active_bits,
+                      typename TString::value_type zero = typename TString::value_type('0'),
+                      typename TString::value_type one  = typename TString::value_type('1'))
+    {
+      TString result;
+
+      result.resize(active_bits, '\0');
+
+      // Check that the string type can contain the digits.
+      ETL_ASSERT_OR_RETURN_VALUE(result.size() == active_bits, ETL_ERROR(etl::bitset_string_too_small), result);
+
+      for (size_t i = active_bits; i > 0; --i)
+      {
+        result[active_bits - i] = test(pbuffer, 0, i - 1) ? one : zero;
+      }
+
+      return result;
+    }
+
+    //*************************************************************************
+    /// Finds the next bit in the specified state.
+    ///\param state    The state to search for.
+    ///\param position The position to start from.
+    ///\returns The position of the bit or npos if none were found.
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    size_t find_next(const_pointer pbuffer, 
+                     size_t        /*number_of_elements*/, 
+                     size_t        active_bits, 
+                     bool          state, 
+                     size_t        position) ETL_NOEXCEPT
+    {
+      if (position < active_bits)
+      {
+        // Where to start.
+        size_t bit = position;
+
+        element_type mask = 1U << position;
+
+        // Needs checking?
+        if ((state && (*pbuffer != All_Clear_Element)) || (!state && (*pbuffer != All_Set_Element)))
+        {
+          // For each bit in the element...
+          while (bit < active_bits)
+          {
+            // Equal to the required state?
+            if (((*pbuffer & mask) != 0) == state)
+            {
+              return bit;
+            }
+
+            // Move on to the next bit.
+            mask <<= 1;
+            ++bit;
+          }
+        }
+      }
+
+      return npos;
+    }
+
+    //*************************************************************************
+    /// operator assignment
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    void operator_assignment(pointer       lhs_pbuffer, 
+                             const_pointer rhs_pbuffer, 
+                             size_t        /*number_of_elements*/) ETL_NOEXCEPT
+    {
+      *lhs_pbuffer = *rhs_pbuffer;
+    }
+
+    //*************************************************************************
+    /// operator and
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    void operator_and(pointer       lhs_pbuffer, 
+                      const_pointer rhs_pbuffer, 
+                      size_t        /*number_of_elements*/) ETL_NOEXCEPT
+    {
+      *lhs_pbuffer &= *rhs_pbuffer;
+    }
+
+    //*************************************************************************
+    /// operator or
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    void operator_or(pointer       lhs_pbuffer, 
+                     const_pointer rhs_pbuffer, 
+                     size_t        /*number_of_elements*/) ETL_NOEXCEPT
+    {
+      *lhs_pbuffer |= *rhs_pbuffer;
+    }
+
+    //*************************************************************************
+    /// operator xor
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    void operator_xor(pointer       lhs_pbuffer, 
+                      const_pointer rhs_pbuffer, 
+                      size_t        /*number_of_elements*/) ETL_NOEXCEPT
+    {
+      *lhs_pbuffer ^= *rhs_pbuffer;
+    }
+
+    //*************************************************************************
+    /// operator ~
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    void operator_not(pointer pbuffer, 
+                      size_t  /*number_of_elements*/) ETL_NOEXCEPT
+    {
+      *pbuffer = ~*pbuffer;
+    }
+
+    //*************************************************************************
+    /// operator_shift_left
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    void operator_shift_left(pointer pbuffer, 
+                             size_t  /*number_of_elements*/, 
+                             size_t  active_bits, 
+                             size_t  shift) ETL_NOEXCEPT
+    {
+      if (shift >= active_bits)
+      {
+        reset(pbuffer, 1U);
+      }
+      else
+      {
+        *pbuffer <<= shift;
+      }
+    }
+
+    //*************************************************************************
+    /// operator_shift_right
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    void operator_shift_right(pointer pbuffer, 
+                              size_t  /*number_of_elements*/, 
+                              size_t  active_bits, 
+                              size_t  shift) ETL_NOEXCEPT
+    {
+      if (shift >= active_bits)
+      {
+        reset(pbuffer, 1U);
+      }
+      else
+      {
+        *pbuffer >>= shift;
+      }
+    }
+
+    //*************************************************************************
+    /// operator_equality
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static
+    bool operator_equality(const_pointer lhs_pbuffer, 
+                           const_pointer rhs_pbuffer, 
+                           size_t        /*number_of_elements*/) ETL_NOEXCEPT
+    {
+      return (*lhs_pbuffer == *rhs_pbuffer);
+    }
+
+    //*************************************************************************
+    /// Initialise from an unsigned long long.
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static 
+    void initialise(pointer            pbuffer, 
+                    size_t             /*number_of_elements*/,
+                    unsigned long long value) ETL_NOEXCEPT
+    {
+      *pbuffer = static_cast<element_type>(value);
+    }
+
+    //*************************************************************************
+    /// swap
+    //*************************************************************************
+    ETL_CONSTEXPR14 
+    static
+    void swap(pointer lhs_pbuffer, 
+              pointer rhs_pbuffer, 
+              size_t  /*number_of_elements*/) ETL_NOEXCEPT
+    {
+      using ETL_OR_STD::iter_swap;
+
+      iter_swap(lhs_pbuffer, rhs_pbuffer);
+    }
+  };
+
+  //template <typename TElement>
+  //ETL_CONSTANT bool etl::bitset_impl<TElement, etl::bitset_layout::Single>::Element_Layout;
+
+  //*************************************************************************
+  /// The implementation class for multi element etl::bitset
+  ///\ingroup bitset
+  //*************************************************************************
+  template <typename TElement>
+  class bitset_impl<TElement, etl::bitset_layout::Multi>
+  {
+  public:
+
+    typedef TElement            element_type;
+    typedef element_type*       pointer;
+    typedef const element_type* const_pointer;
+
+    static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
+
+    static ETL_CONSTANT size_t       Bits_Per_Element = etl::integral_limits<element_type>::bits;
+    static ETL_CONSTANT element_type All_Set_Element = etl::integral_limits<element_type>::max;
+    static ETL_CONSTANT element_type All_Clear_Element = element_type(0);
+
+    //static ETL_CONSTANT bool Element_Layout = etl::bitset_layout::Multi;
+
+    //*************************************************************************
+    /// Check to see if the requested extract is contained within one element.
+    //*************************************************************************
     template <size_t Position, size_t Length, size_t Bits_Per_Element>
     struct value_is_in_one_element
     {
@@ -168,7 +897,10 @@ namespace etl
     //*************************************************************************
     /// Count the number of bits set.
     //*************************************************************************
-    ETL_CONSTEXPR14 size_t count(const_pointer pbuffer, size_t number_of_elements) const ETL_NOEXCEPT
+    ETL_CONSTEXPR14 
+    static 
+    size_t count(const_pointer pbuffer, 
+                 size_t        number_of_elements) ETL_NOEXCEPT
     {
       size_t n = 0UL;
 
@@ -184,7 +916,11 @@ namespace etl
     /// Tests a bit at a position.
     /// Positions greater than the number of configured bits will return <b>false</b>.
     //*************************************************************************
-    ETL_CONSTEXPR14 bool test(const_pointer pbuffer, size_t number_of_elements, size_t position) const ETL_NOEXCEPT
+    ETL_CONSTEXPR14 
+    static
+    bool test(const_pointer pbuffer, 
+              size_t        number_of_elements, 
+              size_t        position) ETL_NOEXCEPT
     {
       size_t       index = 0U;
       element_type mask  = element_type(0);
@@ -207,7 +943,12 @@ namespace etl
     //*************************************************************************
     /// Set the bit at the position.
     //*************************************************************************
-    ETL_CONSTEXPR14 void set(pointer pbuffer, size_t number_of_elements, size_t position, bool value = true) ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    void set(pointer pbuffer, 
+             size_t  number_of_elements, 
+             size_t  position, 
+             bool    value = true) ETL_NOEXCEPT
     {
       size_t    index = 0;
       element_type bit = 0;
@@ -240,7 +981,12 @@ namespace etl
     //*************************************************************************
     /// Set from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 void from_string(pointer pbuffer, size_t number_of_elements, size_t total_bits, const char* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 
+    static 
+    void from_string(pointer     pbuffer, 
+                     size_t      number_of_elements, 
+                     size_t      total_bits, 
+                     const char* text) ETL_NOEXCEPT
     {
       if (text == ETL_NULLPTR)
       {
@@ -270,7 +1016,12 @@ namespace etl
     //*************************************************************************
     /// Set from a wide string.
     //*************************************************************************
-    ETL_CONSTEXPR14 void from_string(pointer pbuffer, size_t number_of_elements, size_t total_bits, const wchar_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    void from_string(pointer        pbuffer, 
+                     size_t         number_of_elements, 
+                     size_t         total_bits, 
+                     const wchar_t* text) ETL_NOEXCEPT
     {
       if (text == ETL_NULLPTR)
       {
@@ -300,7 +1051,12 @@ namespace etl
     //*************************************************************************
     /// Set from a u16 string.
     //*************************************************************************
-    ETL_CONSTEXPR14 void from_string(pointer pbuffer, size_t number_of_elements, size_t total_bits, const char16_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    void from_string(pointer         pbuffer, 
+                     size_t          number_of_elements, 
+                     size_t          total_bits, 
+                     const char16_t* text) ETL_NOEXCEPT
     {
       if (text == ETL_NULLPTR)
       {
@@ -330,7 +1086,12 @@ namespace etl
     //*************************************************************************
     /// Set from a u32 string.
     //*************************************************************************
-    ETL_CONSTEXPR14 void from_string(pointer pbuffer, size_t number_of_elements, size_t total_bits, const char32_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    void from_string(pointer         pbuffer, 
+                     size_t          number_of_elements, 
+                     size_t          total_bits, 
+                     const char32_t* text) ETL_NOEXCEPT
     {
       if (text == ETL_NULLPTR)
       {
@@ -360,7 +1121,12 @@ namespace etl
     //*************************************************************************
     /// Set from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 void set(pointer pbuffer, size_t number_of_elements, size_t total_bits, const char* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 
+    static 
+    void set(pointer     pbuffer, 
+             size_t      number_of_elements, 
+             size_t      total_bits, 
+             const char* text) ETL_NOEXCEPT
     {
       from_string(pbuffer, number_of_elements, total_bits, text);
     }
@@ -368,7 +1134,12 @@ namespace etl
     //*************************************************************************
     /// Set from a wstring.
     //*************************************************************************
-    ETL_CONSTEXPR14 void set(pointer pbuffer, size_t number_of_elements, size_t total_bits, const wchar_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    void set(pointer        pbuffer, 
+             size_t         number_of_elements, 
+             size_t         total_bits, 
+             const wchar_t* text) ETL_NOEXCEPT
     {
       from_string(pbuffer, number_of_elements, total_bits, text);
     }
@@ -376,7 +1147,12 @@ namespace etl
     //*************************************************************************
     /// Set from a u16string.
     //*************************************************************************
-    ETL_CONSTEXPR14 void set(pointer pbuffer, size_t number_of_elements, size_t total_bits, const char16_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    void set(pointer         pbuffer, 
+             size_t          number_of_elements, 
+             size_t          total_bits, 
+             const char16_t* text) ETL_NOEXCEPT
     {
       from_string(pbuffer, number_of_elements, total_bits, text);
     }
@@ -384,18 +1160,53 @@ namespace etl
     //*************************************************************************
     /// Set from a u32string.
     //*************************************************************************
-    ETL_CONSTEXPR14 void set(pointer pbuffer, size_t number_of_elements, size_t total_bits, const char32_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    void set(pointer         pbuffer, 
+             size_t          number_of_elements, 
+             size_t          total_bits, 
+             const char32_t* text) ETL_NOEXCEPT
     {
       from_string(pbuffer, number_of_elements, total_bits, text);
     }
 
+    //*************************************************************************
+    /// Reset all of the bits.
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    void reset(pointer pbuffer, 
+               size_t  number_of_elements) ETL_NOEXCEPT
+    {
+      while (number_of_elements-- != 0U)
+      {
+        *pbuffer++ = All_Clear_Element;
+      }
+    }
+
+    //*************************************************************************
+    /// Reset the bit at the position.
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    void reset(pointer pbuffer, 
+               size_t  number_of_elements, 
+               size_t  position) ETL_NOEXCEPT
+    {
+      const size_t       index = position >> etl::log2<Bits_Per_Element>::value;;
+      const element_type bit = element_type(1) << (position & (Bits_Per_Element - 1));
+
+      pbuffer[index] &= ~bit;
+    }
+
     //*************************************************************************
     /// Get as a value.
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-    typename etl::enable_if<etl::is_integral<T>::value, T>::type
-      value(const_pointer pbuffer, size_t number_of_elements) const ETL_NOEXCEPT
+    static
+    T value(const_pointer pbuffer, 
+            size_t        number_of_elements) ETL_NOEXCEPT
     {
       T v = T(0);
 
@@ -420,10 +1231,11 @@ namespace etl
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
+    static 
     typename etl::make_unsigned<T>::type extract_from_multiple_elements(const element_type* pbuffer,
                                                                         int                 element_index,
                                                                         size_t              active_bits_in_msb,
-                                                                        size_t              length) const ETL_NOEXCEPT
+                                                                        size_t              length) ETL_NOEXCEPT
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
@@ -470,7 +1282,10 @@ namespace etl
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-    typename etl::make_unsigned<T>::type extract_from_buffer(const_pointer pbuffer, size_t position, size_t length) const ETL_NOEXCEPT
+    static
+    typename etl::make_unsigned<T>::type extract_from_buffer(const_pointer pbuffer, 
+                                                             size_t        position, 
+                                                             size_t        length) ETL_NOEXCEPT
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
@@ -502,12 +1317,13 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
+    /// Extract an integral value when the value fits in one element.
     //*************************************************************************
     template <typename T, size_t Position, size_t Length>
     ETL_CONSTEXPR14
+    static
     typename etl::enable_if<value_is_in_one_element<Position, Length, Bits_Per_Element>::value, typename etl::make_unsigned<T>::type>::type
-      extract_from_buffer(const_pointer pbuffer) const
+      extract_from_buffer(const_pointer pbuffer)
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
@@ -519,12 +1335,13 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
+    /// Extract an integral value when the value spans more than one element.
     //*************************************************************************
     template <typename T, size_t Position, size_t Length>
     ETL_CONSTEXPR14
+    static
     typename etl::enable_if<!value_is_in_one_element<Position, Length, Bits_Per_Element>::value, typename etl::make_unsigned<T>::type>::type
-      extract_from_buffer(const_pointer pbuffer) const
+      extract_from_buffer(const_pointer pbuffer)
     {      
       const int Msb_Element_Index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
 
@@ -540,65 +1357,28 @@ namespace etl
       return extract_from_multiple_elements<T>(pbuffer, element_index, active_bits_in_msb, length);
     }
 
-    //*************************************************************************
-    /// Reset the bit at the position.
-    //*************************************************************************
-    ETL_CONSTEXPR14 void reset(pointer pbuffer, size_t number_of_elements, size_t position) ETL_NOEXCEPT
-    {
-      size_t       index = 0U;
-      element_type bit = element_type(0);
-
-      if (number_of_elements == 0) ETL_UNLIKELY
-      {
-        return;
-      }
-      else if (number_of_elements == 1)
-      {
-        index = 0;
-        bit = element_type(1) << position;
-      }
-      else
-      {
-        index = position >> etl::log2<Bits_Per_Element>::value;
-        bit = element_type(1) << (position & (Bits_Per_Element - 1));
-      }
-
-      pbuffer[index] &= ~bit;
-    }
-
     //*************************************************************************
     /// Flip all of the bits.
     //*************************************************************************
-    ETL_CONSTEXPR14 void flip(pointer pbuffer, size_t number_of_elements) ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    void flip(pointer pbuffer, 
+              size_t  number_of_elements) ETL_NOEXCEPT
     {
-      etl::transform_n(pbuffer,
-                       number_of_elements,
-                       pbuffer, 
-                       etl::binary_not<element_type>());
+      operator_not(pbuffer, number_of_elements);
     }
 
     //*************************************************************************
     /// Flip the bit at the position.
     //*************************************************************************
-    ETL_CONSTEXPR14 void flip(pointer pbuffer, size_t number_of_elements, size_t position) ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    void flip(pointer pbuffer, 
+              size_t  number_of_elements, 
+              size_t  position) ETL_NOEXCEPT
     {
-      size_t       index = 0U;
-      element_type bit = element_type(0);
-      
-      if (number_of_elements == 0) ETL_UNLIKELY
-      {
-        return;
-      }
-      else if (number_of_elements == 1)
-      {
-        index = 0;
-        bit = element_type(1) << position;
-      }
-      else
-      {
-        index = position >> log2<Bits_Per_Element>::value;
-        bit = element_type(1) << (position & (Bits_Per_Element - 1));
-      }
+      const size_t       index = position >> etl::log2<Bits_Per_Element>::value;;
+      const element_type bit   = element_type(1) << (position & (Bits_Per_Element - 1));
 
       pbuffer[index] ^= bit;
     }
@@ -606,13 +1386,12 @@ namespace etl
     //*************************************************************************
     // Are all the bits sets?
     //*************************************************************************
-    ETL_CONSTEXPR14 bool all(const_pointer pbuffer, size_t number_of_elements, element_type top_mask) const ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    bool all(const_pointer pbuffer, 
+             size_t        number_of_elements, 
+             element_type  top_mask) ETL_NOEXCEPT
     {
-      if (number_of_elements == 0UL)
-      {
-        return true;
-      }
-
       // All but the last.
       for (size_t i = 0UL; i < (number_of_elements - 1U); ++i)
       {
@@ -634,7 +1413,10 @@ namespace etl
     //*************************************************************************
     /// Are none of the bits set?
     //*************************************************************************
-    ETL_CONSTEXPR14 bool none(const_pointer pbuffer, size_t number_of_elements) const ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    bool none(const_pointer pbuffer, 
+              size_t        number_of_elements) ETL_NOEXCEPT
     {
       for (size_t i = 0UL; i < number_of_elements; ++i)
       {
@@ -647,23 +1429,19 @@ namespace etl
       return true;
     }
 
-    //*************************************************************************
-    /// Finds the first bit in the specified state.
-    ///\param state The state to search for.
-    ///\returns The position of the bit or Number_Of_Elements if none were found.
-    //*************************************************************************
-    ETL_CONSTEXPR14 size_t find_first(const_pointer pbuffer, size_t number_of_elements, size_t total_bits, bool state) const ETL_NOEXCEPT
-    {
-      return find_next(pbuffer, number_of_elements, total_bits, state, 0);
-    }
-
     //*************************************************************************
     /// Finds the next bit in the specified state.
     ///\param state    The state to search for.
     ///\param position The position to start from.
     ///\returns The position of the bit or npos if none were found.
     //*************************************************************************
-    ETL_CONSTEXPR14 size_t find_next(const_pointer pbuffer, size_t number_of_elements, size_t total_bits, bool state, size_t position) const ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    size_t find_next(const_pointer pbuffer, 
+                     size_t        number_of_elements, 
+                     size_t        total_bits, 
+                     bool          state, 
+                     size_t        position) ETL_NOEXCEPT
     {
       // Where to start.
       size_t index = position >> log2<Bits_Per_Element>::value;
@@ -714,11 +1492,13 @@ namespace etl
     /// Returns a string representing the bitset.
     //*************************************************************************
     template <typename TString>
-    ETL_CONSTEXPR14 TString to_string(const_pointer                pbuffer,
-                                      size_t                       number_of_elements, 
-                                      size_t                       active_bits, 
-                                      typename TString::value_type zero, 
-                                      typename TString::value_type one) const
+    ETL_CONSTEXPR14
+    static
+    TString to_string(const_pointer                pbuffer,
+                      size_t                       number_of_elements, 
+                      size_t                       active_bits, 
+                      typename TString::value_type zero, 
+                      typename TString::value_type one)
     {
       TString result;
 
@@ -736,249 +1516,265 @@ namespace etl
     }
 
     //*************************************************************************
-    /// shift_left_equals
+    /// operator assignment
     //*************************************************************************
-    ETL_CONSTEXPR14 void shift_left_equals(pointer pbuffer, size_t number_of_elements, size_t shift) ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    void operator_assignment(pointer       lhs_pbuffer, 
+                             const_pointer rhs_pbuffer, 
+                             size_t        number_of_elements) ETL_NOEXCEPT
     {
-      if (number_of_elements == 1U)
+      while (number_of_elements != 0)
       {
-        // Just one element.
-        pbuffer[0] <<= shift;
+        *lhs_pbuffer++ = *rhs_pbuffer++;
       }
-      else if ((shift % Bits_Per_Element) == 0U)
+    }
+
+    //*************************************************************************
+    /// operator and
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    void operator_and(pointer       lhs_pbuffer, 
+                      const_pointer rhs_pbuffer, 
+                      size_t        number_of_elements) ETL_NOEXCEPT
+    {
+      while (number_of_elements-- != 0)
       {
-        // Shift by whole element.
-        const size_t element_shift = shift / Bits_Per_Element;
-        etl::copy_backward(pbuffer, pbuffer + number_of_elements - element_shift, pbuffer + number_of_elements);
-        etl::fill_n(pbuffer, element_shift, All_Clear_Element);
+        *lhs_pbuffer++ &= *rhs_pbuffer++;
       }
-      else
+    }
+
+    //*************************************************************************
+    /// operator or
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    void operator_or(pointer       lhs_pbuffer, 
+                     const_pointer rhs_pbuffer, 
+                     size_t        number_of_elements) ETL_NOEXCEPT
+    {
+      while (number_of_elements-- != 0)
       {
-        // The place where the elements are split when shifting.
-        const size_t split_position = Bits_Per_Element - (shift % Bits_Per_Element);
+        *lhs_pbuffer++ != *rhs_pbuffer++;
+      }
+    }
 
-        // Where we are shifting from.
-        int src_index = int(number_of_elements - (shift / Bits_Per_Element) - 1U);
+    //*************************************************************************
+    /// operator xor
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    void operator_xor(pointer       lhs_pbuffer, 
+                      const_pointer rhs_pbuffer, 
+                      size_t        number_of_elements) ETL_NOEXCEPT
+    {
+      while (number_of_elements-- != 0)
+      {
+        *lhs_pbuffer++ ^= *rhs_pbuffer++;
+      }
+    }
 
-        // Where we are shifting to.
-        int dst_index = int(number_of_elements - 1U);
+    //*************************************************************************
+    /// operator not
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    void operator_not(pointer pbuffer, 
+                      size_t  number_of_elements) ETL_NOEXCEPT
+    {
+      while (number_of_elements-- != 0)
+      {
+        *pbuffer++ = ~*pbuffer++;
+      }
+    }
 
-        // Shift control constants.
-        const size_t lsb_shift = Bits_Per_Element - split_position;
-        const size_t msb_shift = split_position;
+    //*************************************************************************
+    /// operator_shift_left
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    void operator_shift_left(pointer pbuffer, 
+                             size_t  number_of_elements, 
+                             size_t  active_bits, 
+                             size_t  shift) ETL_NOEXCEPT
+    {
+      // The place where the elements are split when shifting.
+      const size_t split_position = Bits_Per_Element - (shift % Bits_Per_Element);
 
-        const element_type lsb_mask         = element_type(etl::integral_limits<element_type>::max >> (Bits_Per_Element - split_position));
-        const element_type msb_mask         = etl::integral_limits<element_type>::max - lsb_mask;
-        const element_type lsb_shifted_mask = element_type(lsb_mask << lsb_shift);
-          
-        // First lsb.
+      // Where we are shifting from.
+      int src_index = int(number_of_elements - (shift / Bits_Per_Element) - 1U);
+
+      // Where we are shifting to.
+      int dst_index = int(number_of_elements - 1U);
+
+      // Shift control constants.
+      const size_t lsb_shift = Bits_Per_Element - split_position;
+      const size_t msb_shift = split_position;
+
+      const element_type lsb_mask = element_type(etl::integral_limits<element_type>::max >> (Bits_Per_Element - split_position));
+      const element_type msb_mask = etl::integral_limits<element_type>::max - lsb_mask;
+      const element_type lsb_shifted_mask = element_type(lsb_mask << lsb_shift);
+
+      // First lsb.
+      element_type lsb = element_type((pbuffer[src_index] & lsb_mask) << lsb_shift);
+      pbuffer[dst_index] = lsb;
+      --src_index;
+
+      // Now do the shifting.
+      while (src_index >= 0)
+      {
+        // Shift msb.
+        element_type msb = element_type((pbuffer[src_index] & msb_mask) >> msb_shift);
+        pbuffer[dst_index] = pbuffer[dst_index] | msb;
+        --dst_index;
+
+        // Shift lsb.
         element_type lsb = element_type((pbuffer[src_index] & lsb_mask) << lsb_shift);
         pbuffer[dst_index] = lsb;
         --src_index;
+      }
 
-        // Now do the shifting.
-        while (src_index >= 0)
-        {
-          // Shift msb.
-          element_type msb = element_type((pbuffer[src_index] & msb_mask) >> msb_shift);
-          pbuffer[dst_index] = pbuffer[dst_index] | msb;
-          --dst_index;
+      // Clear the remaining bits.
+      // First lsb.
+      pbuffer[dst_index] &= lsb_shifted_mask;
 
-          // Shift lsb.
-          element_type lsb = element_type((pbuffer[src_index] & lsb_mask) << lsb_shift);
-          pbuffer[dst_index] = lsb;
-          --src_index;
-        }
-
-        // Clear the remaining bits.
-        // First lsb.
-        pbuffer[dst_index] &= lsb_shifted_mask;
-//        --dst_index;
-
-        // The other remaining bytes on the right.
-        for (int i = 0; i < dst_index; ++i)
-        {
-          pbuffer[i] = 0;
-        }
+      // The other remaining bytes on the right.
+      for (int i = 0; i < dst_index; ++i)
+      {
+        pbuffer[i] = 0;
       }
     }
 
     //*************************************************************************
-    /// shift_right_equals
+    /// operator_shift_right
     //*************************************************************************
-    ETL_CONSTEXPR14 void shift_right_equals(pointer pbuffer, size_t number_of_elements, size_t shift) ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    void operator_shift_right(pointer pbuffer, 
+                              size_t  number_of_elements, 
+                              size_t  active_bits, 
+                              size_t  shift) ETL_NOEXCEPT
     {
-      if (number_of_elements == 1U)
+      // The place where the elements are split when shifting.
+      const size_t split_position = shift % Bits_Per_Element;
+
+      // Where we are shifting from.
+      int src_index = int(shift / Bits_Per_Element);
+
+      // Where we are shifting to.
+      int dst_index = 0;
+
+      // Shift control constants.
+      const size_t lsb_shift = Bits_Per_Element - split_position;
+      const size_t msb_shift = split_position;
+
+      const element_type lsb_mask = element_type(etl::integral_limits<element_type>::max >> (Bits_Per_Element - split_position));
+      const element_type msb_mask = etl::integral_limits<element_type>::max - lsb_mask;
+      const element_type msb_shifted_mask = element_type(msb_mask >> msb_shift);
+
+      // Now do the shifting.
+      while (src_index < int(number_of_elements - 1))
       {
-        // Just one element.
-        pbuffer[0] >>= shift;
-      }
-      else if ((shift % Bits_Per_Element) == 0U)
-      {
-        // Shift by whole elements.
-        const size_t element_shift = (shift / Bits_Per_Element);
-        pointer pzeros_begin = etl::copy(pbuffer + element_shift, pbuffer + number_of_elements, pbuffer);      
-        etl::fill_n(pzeros_begin, element_shift, All_Clear_Element);
-      }
-      else
-      {
-        // The place where the elements are split when shifting.
-        const size_t split_position = shift % Bits_Per_Element;
-
-        // Where we are shifting from.
-        int src_index = int(shift / Bits_Per_Element);
-
-        // Where we are shifting to.
-        int dst_index = 0;
-
-        // Shift control constants.
-        const size_t lsb_shift = Bits_Per_Element - split_position;
-        const size_t msb_shift = split_position;
-
-        const element_type lsb_mask         = element_type(etl::integral_limits<element_type>::max >> (Bits_Per_Element - split_position));
-        const element_type msb_mask         = etl::integral_limits<element_type>::max - lsb_mask;
-        const element_type msb_shifted_mask = element_type(msb_mask >> msb_shift);
-
-        // Now do the shifting.
-        while (src_index < int(number_of_elements - 1))
-        {
-          // Shift msb.
-          element_type msb = element_type((pbuffer[src_index] & msb_mask) >> msb_shift);
-          ++src_index;
-            
-          // Shift lsb.
-          element_type lsb = element_type((pbuffer[src_index] & lsb_mask) << lsb_shift);
-            
-          // Combine them.
-          pbuffer[dst_index] = lsb | msb;
-          ++dst_index;
-        }
-
-        // Final msb.
+        // Shift msb.
         element_type msb = element_type((pbuffer[src_index] & msb_mask) >> msb_shift);
-        pbuffer[dst_index] = msb;
+        ++src_index;
 
-        // Clear the remaining bits.
-        // First msb.
-        pbuffer[dst_index] &= msb_shifted_mask;
+        // Shift lsb.
+        element_type lsb = element_type((pbuffer[src_index] & lsb_mask) << lsb_shift);
+
+        // Combine them.
+        pbuffer[dst_index] = lsb | msb;
         ++dst_index;
+      }
 
-        // The other remaining bytes.
-        while (dst_index < int(number_of_elements))
-        {
-          pbuffer[dst_index] = 0;
-          ++dst_index;
-        }
+      // Final msb.
+      element_type msb = element_type((pbuffer[src_index] & msb_mask) >> msb_shift);
+      pbuffer[dst_index] = msb;
+
+      // Clear the remaining bits.
+      // First msb.
+      pbuffer[dst_index] &= msb_shifted_mask;
+      ++dst_index;
+
+      // The other remaining bytes.
+      while (dst_index < int(number_of_elements))
+      {
+        pbuffer[dst_index] = 0;
+        ++dst_index;
       }
     }
 
     //*************************************************************************
-    /// and_equals
+    /// operator_equality
     //*************************************************************************
-    ETL_CONSTEXPR14 void and_equals(pointer pbuffer, const_pointer pbuffer2, size_t number_of_elements) ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    bool operator_equality(const_pointer lhs_pbuffer, 
+                           const_pointer rhs_pbuffer, 
+                           size_t        number_of_elements) ETL_NOEXCEPT
     {
-      for (size_t i = 0U; i < number_of_elements; ++i)
-      {
-        pbuffer[i] &= pbuffer2[i];
-      }
-    }
-
-    //*************************************************************************
-    /// or_equals
-    //*************************************************************************
-    ETL_CONSTEXPR14 void or_equals(pointer pbuffer, const_pointer pbuffer2, size_t number_of_elements) ETL_NOEXCEPT
-    {
-      for (size_t i = 0U; i < number_of_elements; ++i)
-      {
-        pbuffer[i] |= pbuffer2[i];
-      }
-    }
-
-    //*************************************************************************
-    /// xor_equals
-    //*************************************************************************
-    ETL_CONSTEXPR14 void xor_equals(pointer pbuffer, const_pointer pbuffer2, size_t number_of_elements) ETL_NOEXCEPT
-    {
-      for (size_t i = 0U; i < number_of_elements; ++i)
-      {
-        pbuffer[i] ^= pbuffer2[i];
-      }
+      return etl::equal(lhs_pbuffer, lhs_pbuffer + number_of_elements, rhs_pbuffer);
     }
 
     //*************************************************************************
     /// Initialise from an unsigned long long.
     //*************************************************************************
-    ETL_CONSTEXPR14 void initialise(pointer pbuffer, size_t number_of_elements, unsigned long long value) ETL_NOEXCEPT
+    ETL_CONSTEXPR14
+    static
+    void initialise(pointer            pbuffer, 
+                    size_t             number_of_elements, 
+                    unsigned long long value) ETL_NOEXCEPT
     {
-      const size_t Shift = (etl::integral_limits<unsigned long long>::bits <= (int)Bits_Per_Element) ? 0 : Bits_Per_Element;
+      size_t i = 0UL;
+      const size_t Shift = etl::integral_limits<element_type>::bits;
 
-      // Can we do it in one hit?
-      if (Shift == 0)
+      // Set the non-zero elements.
+      while ((value != 0) && (i != number_of_elements))
       {
-        pbuffer[0] = element_type(value);
+        pbuffer[i++] = value & All_Set_Element;
+        value = value >> Shift;
       }
-      else
+
+      // Clear the remaining elements.
+      while (i != number_of_elements)
       {
-        size_t i = 0UL;
-
-        // Set the non-zero elements.
-        while ((value != 0) && (i != number_of_elements))
-        {
-          pbuffer[i++] = value & All_Set_Element;
-          value = value >> Shift;
-        }
-
-        // Clear the remaining elements.
-        while (i != number_of_elements)
-        {
-          pbuffer[i++] = All_Clear_Element;
-        }
+        pbuffer[i++] = All_Clear_Element;
       }
     }
 
     //*************************************************************************
     /// Swap bitset buffers.
     //*************************************************************************
-    ETL_CONSTEXPR14 void swap(pointer pbuffer1, pointer pbuffer2, size_t number_of_elements)
+    ETL_CONSTEXPR14
+    static
+    void swap(pointer pbuffer1, 
+              pointer pbuffer2, 
+              size_t  number_of_elements)
     {
-      const pointer pbuffer1_end = pbuffer1 + number_of_elements;
-
-      while (pbuffer1 != pbuffer1_end)
-      {
-        element_type temp = *pbuffer1;
-        *pbuffer1 = *pbuffer2;
-        *pbuffer2 = temp;
-        ++pbuffer1;
-        ++pbuffer2;
-      }
+      etl::swap_ranges(pbuffer1, pbuffer1 + number_of_elements, pbuffer2);
     }
   };
- 
-  template <typename TElement>
-  ETL_CONSTANT size_t bitset_impl<TElement>::Bits_Per_Element;
 
-  template <typename TElement>
-  ETL_CONSTANT typename bitset_impl<TElement>::element_type bitset_impl<TElement>::All_Set_Element;
-
-  template <typename TElement>
-  ETL_CONSTANT typename bitset_impl<TElement>::element_type bitset_impl<TElement>::All_Clear_Element;
+  //template <typename TElement>
+  //ETL_CONSTANT bool etl::bitset_impl<TElement, etl::bitset_layout::Multi>::Element_Layout;
 
   //***************************************************************************
-  template <size_t Active_Bits = 0U,
-            typename TElement = char,
-            bool FitsInSingleElement = etl::integral_limits<TElement>::bits >= Active_Bits>
+  /// Bitset forward declaration
+  //***************************************************************************
+  template <size_t   Active_Bits = 0U,
+            typename TElement    = unsigned char>
   class bitset;
 
   //***************************************************************************
   /// Specialisation for zero bits.
-  /// Just defines 'npos'.
   //***************************************************************************
   template <>
-  class bitset<0U, char, true> : public bitset_constants<>
+  class bitset<0U, unsigned char>
   {
   public:
 
-    typedef char element_type;
+    typedef unsigned char element_type;
 
     typedef element_type*       pointer;
     typedef const element_type* const_pointer;
@@ -990,970 +1786,34 @@ namespace etl
     static ETL_CONSTANT element_type All_Clear_Element  = 0U;
     static ETL_CONSTANT size_t       Top_Mask_Shift     = 0U;
     static ETL_CONSTANT element_type Top_Mask           = 0U;
+
+    static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
   };
 
-  //***************************************************************************
-  /// Specialisation for zero bits.
-  //***************************************************************************
-  template <>
-  class bitset<0U, char, false> : public bitset_constants<>
-  {
-  public:
-
-    typedef char element_type;
-
-    typedef element_type*       pointer;
-    typedef const element_type* const_pointer;
-
-    static ETL_CONSTANT size_t       Bits_Per_Element   = 0U;
-    static ETL_CONSTANT size_t       Number_Of_Elements = 0U;
-    static ETL_CONSTANT size_t       Allocated_Bits     = 0U;
-    static ETL_CONSTANT element_type All_Set_Element    = 0U;
-    static ETL_CONSTANT element_type All_Clear_Element  = 0U;
-    static ETL_CONSTANT size_t       Top_Mask_Shift     = 0U;
-    static ETL_CONSTANT element_type Top_Mask           = 0U;
-  };
-
-  //***************************************************************************
-  /// Specialisation that uses a single element if the number of active bits
-  /// fits into the element type size.
-  //***************************************************************************
+  //*************************************************************************
+  /// The bitset top level template.
+  //*************************************************************************
   template <size_t Active_Bits, typename TElement>
-  class bitset<Active_Bits, TElement, true> : public bitset_constants<>
+  class bitset
   {
   public:
 
-    // The element type is the unsigned variant of 'TElement'.
-    typedef typename etl::make_unsigned<TElement>::type element_type;
+    ETL_STATIC_ASSERT(etl::is_unsigned<TElement>::value, "The element type must be unsigned");
 
+    typedef TElement            element_type;
     typedef element_type*       pointer;
     typedef const element_type* const_pointer;
 
+    static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
+
+    //static ETL_CONSTANT bool Element_Layout = implementation::Element_Layout;
+
     static ETL_CONSTANT size_t       Bits_Per_Element   = etl::integral_limits<element_type>::bits;
-    static ETL_CONSTANT size_t       Number_Of_Elements = 1U;
-    static ETL_CONSTANT size_t       Allocated_Bits     = Bits_Per_Element;
-    static ETL_CONSTANT element_type All_Set_Element    = etl::integral_limits<typename etl::make_unsigned<element_type>::type>::max;
+    static ETL_CONSTANT element_type All_Set_Element    = etl::integral_limits<element_type>::max;
     static ETL_CONSTANT element_type All_Clear_Element  = element_type(0);
-    static ETL_CONSTANT size_t       Top_Mask_Shift     = 0U;
-    static ETL_CONSTANT element_type Top_Mask           = All_Set_Element;
-
-    typedef etl::span<element_type, Number_Of_Elements>       span_type;
-    typedef etl::span<const element_type, Number_Of_Elements> const_span_type;
-
-    //*************************************************************************
-    /// The reference type returned.
-    //*************************************************************************
-    class bit_reference
-    {
-    public:
-
-      friend class bitset;
-
-      //*******************************
-      /// Copy constructor.
-      //*******************************
-      ETL_CONSTEXPR14 bit_reference(const bit_reference& other) ETL_NOEXCEPT
-        : p_bitset(other.p_bitset)
-        , position(other.position)
-      {
-      }
-
-      //*******************************
-      /// Conversion operator.
-      //*******************************
-      ETL_CONSTEXPR14 operator bool() const ETL_NOEXCEPT
-      {
-        return p_bitset->test(position);
-      }
-
-      //*******************************
-      /// Assignment operator.
-      //*******************************
-      ETL_CONSTEXPR14 bit_reference& operator = (bool b) ETL_NOEXCEPT
-      {
-        p_bitset->set(position, b);
-        return *this;
-      }
-
-      //*******************************
-      /// Assignment operator.
-      //*******************************
-      ETL_CONSTEXPR14 bit_reference& operator = (const bit_reference& r) ETL_NOEXCEPT
-      {
-        p_bitset->set(position, bool(r));
-        return *this;
-      }
-
-      //*******************************
-      /// Flip the bit.
-      //*******************************
-      ETL_CONSTEXPR14 bit_reference& flip() ETL_NOEXCEPT
-      {
-        p_bitset->flip(position);
-        return *this;
-      }
-
-      //*******************************
-      /// Return the logical inverse of the bit.
-      //*******************************
-      ETL_CONSTEXPR14 bool operator~() const ETL_NOEXCEPT
-      {
-        return !p_bitset->test(position);
-      }
-
-    private:
-
-      //*******************************
-      /// Default constructor.
-      //*******************************
-      ETL_CONSTEXPR14 bit_reference() ETL_NOEXCEPT
-        : p_bitset(ETL_NULLPTR)
-        , position(0)
-      {
-      }
-
-      //*******************************
-      /// Constructor.
-      //*******************************
-      ETL_CONSTEXPR14 bit_reference(bitset<Active_Bits, TElement, true>& r_bitset, size_t position_) ETL_NOEXCEPT
-        : p_bitset(&r_bitset)
-        , position(position_)
-      {
-      }
-
-      bitset<Active_Bits, TElement, true>* p_bitset; ///< The bitset.
-      size_t position; ///< The position in the bitset.
-    };
-
-    //*************************************************************************
-    /// Default constructor.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset() ETL_NOEXCEPT
-      : buffer(All_Clear_Element)
-    {
-    }
-
-    //*************************************************************************
-    /// Copy constructor.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset(const bitset<Active_Bits, TElement, true>& other) ETL_NOEXCEPT
-      : buffer(other.buffer)
-    {
-    }
-
-    //*************************************************************************
-    /// Construct from a value.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset(unsigned long long value) ETL_NOEXCEPT
-      : buffer(element_type(value))
-    {
-    }
-
-    //*************************************************************************
-    /// Construct from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset(const char* text) ETL_NOEXCEPT
-      : buffer(All_Clear_Element)
-    {
-      set(text);
-    }
-
-    //*************************************************************************
-    /// Construct from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset(const wchar_t* text) ETL_NOEXCEPT
-      : buffer(All_Clear_Element)
-    {
-      set(text);
-    }
-
-    //*************************************************************************
-    /// Construct from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset(const char16_t* text) ETL_NOEXCEPT
-      : buffer(All_Clear_Element)
-    {
-      set(text);
-    }
-
-    //*************************************************************************
-    /// Construct from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset(const char32_t* text) ETL_NOEXCEPT
-      : buffer(All_Clear_Element)
-    {
-      set(text);
-    }
-
-    //*************************************************************************
-    /// Assignment operator.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset& operator =(const bitset<Active_Bits, TElement, true>& other) ETL_NOEXCEPT
-    {
-      buffer = other.buffer;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set all of the bits.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& set() ETL_NOEXCEPT
-    {
-      buffer = All_Set_Element;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set the bit at the position.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& set(size_t position, bool value = true)
-    {
-      ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
-      
-      const element_type mask = element_type(element_type(1) << position);
-      if (value == true)
-      {
-        buffer |= mask;
-      }
-      else
-      {
-        buffer &= ~mask;
-      }
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& set(const char* text) ETL_NOEXCEPT
-    {      
-      from_string(text);
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& set(const wchar_t* text) ETL_NOEXCEPT
-    {
-      from_string(text);
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& set(const char16_t* text) ETL_NOEXCEPT
-    {
-      from_string(text);
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& set(const char32_t* text) ETL_NOEXCEPT
-    {
-      from_string(text);
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& from_string(const char* text) ETL_NOEXCEPT
-    {
-      if (text == ETL_NULLPTR)
-      {
-        reset();
-      }
-      else
-      {
-        size_t string_length = etl::strlen(text);
-
-        // Build from the string.
-        string_length = etl::min(Active_Bits, string_length);
-
-        element_type mask = element_type(element_type(1) << (string_length - 1U));
-
-        for (size_t i = 0U; i < string_length; ++i)
-        {
-          if (text[i] == ETL_STR('1'))
-          {
-            buffer |= mask;
-          }
-          else
-          {
-            buffer &= ~mask;
-          }
-
-          mask >>= 1U;
-        }
-      }
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a wide string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& from_string(const wchar_t* text) ETL_NOEXCEPT
-    {
-      if (text == ETL_NULLPTR)
-      {
-        reset();
-      }
-      else
-      {
-        size_t string_length = etl::strlen(text);
-
-        // Build from the string.
-        string_length = etl::min(Active_Bits, string_length);
-
-        element_type mask = element_type(element_type(1) << (string_length - 1U));
-
-        for (size_t i = 0U; i < string_length; ++i)
-        {
-          if (text[i] == ETL_STRL('1'))
-          {
-            buffer |= mask;
-          }
-          else
-          {
-            buffer &= ~mask;
-          }
-
-          mask >>= 1U;
-        }
-      }
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a u16 string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& from_string(const char16_t* text) ETL_NOEXCEPT
-    {
-      if (text == ETL_NULLPTR)
-      {
-        reset();
-      }
-      else
-      {
-        size_t string_length = etl::strlen(text);
-
-        // Build from the string.
-        string_length = etl::min(Active_Bits, string_length);
-
-        element_type mask = element_type(element_type(1) << (string_length - 1U));
-
-        for (size_t i = 0U; i < string_length; ++i)
-        {
-          if (text[i] == ETL_STRu('1'))
-          {
-            buffer |= mask;
-          }
-          else
-          {
-            buffer &= ~mask;
-          }
-
-          mask >>= 1U;
-        }
-      }
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a u32 string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& from_string(const char32_t* text) ETL_NOEXCEPT
-    {
-      if (text == ETL_NULLPTR)
-      {
-        reset();
-      }
-      else
-      {
-        size_t string_length = etl::strlen(text);
-
-        // Build from the string.
-        string_length = etl::min(Active_Bits, string_length);
-
-        element_type mask = element_type(element_type(1) << (string_length - 1U));
-
-        for (size_t i = 0U; i < string_length; ++i)
-        {
-          if (text[i] == ETL_STRU('1'))
-          {
-            buffer |= mask;
-          }
-          else
-          {
-            buffer &= ~mask;
-          }
-
-          mask >>= 1U;
-        }
-      }
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Get as an integral value.
-    //*************************************************************************
-    template <typename T>
-    ETL_CONSTEXPR14
-    typename etl::enable_if<etl::is_integral<T>::value, T>::type
-      value() const ETL_NOEXCEPT
-    {
-      ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Only integral types are supported");
-      ETL_STATIC_ASSERT((sizeof(T) * CHAR_BIT) >= (Number_Of_Elements * Bits_Per_Element), "Integral type too small");
-
-      T v = T(0);
-
-      const bool OK = (sizeof(T) * CHAR_BIT) >= Bits_Per_Element;
-
-      if (OK)
-      {
-        v = T(typename etl::make_unsigned<T>::type(buffer));
-      }
-
-      return v;
-    }
-
-    //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
-    //*************************************************************************
-    template <typename T>
-    ETL_CONSTEXPR14
-    typename etl::enable_if<etl::is_integral<T>::value, T>::type
-      extract(size_t position, size_t length = etl::integral_limits<T>::bits) const
-    {
-      ETL_ASSERT_OR_RETURN_VALUE(length <= etl::integral_limits<T>::bits, ETL_ERROR(bitset_overflow), 0);
-      ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits,      ETL_ERROR(bitset_overflow), 0);
-
-      typedef typename etl::make_unsigned<T>::type unsigned_t;
-
-      const unsigned_t Mask  = etl::make_lsb_mask< unsigned_t>(length);
-      const unsigned_t Shift = position % Bits_Per_Element;
-
-      unsigned_t value = static_cast<unsigned_t>(buffer >> Shift) & Mask;
-
-      if ((length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
-      {
-        value = etl::sign_extend<T>(value, length);
-      }
-
-      return static_cast<T>(value);
-    }
-
-    //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
-    //*************************************************************************
-    template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
-    ETL_CONSTEXPR14
-    typename etl::enable_if<etl::is_integral<T>::value, T>::type
-      extract() const ETL_NOEXCEPT
-    {
-      ETL_STATIC_ASSERT(Length <= etl::integral_limits<T>::bits, "Length is larger that the required type");
-      ETL_STATIC_ASSERT((Position + Length) <= Active_Bits,      "Position/Length overflows bitset");
-      
-      typedef typename etl::make_unsigned<T>::type unsigned_t;
-
-      const unsigned_t Mask  = etl::make_lsb_mask<unsigned_t, Length>();
-      const unsigned_t Shift = Position % Bits_Per_Element;
-
-      unsigned_t value = static_cast<unsigned_t>(buffer >> Shift) & Mask;
-
-      if ETL_IF_CONSTEXPR((Length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
-      {
-        value = etl::sign_extend<T, Length>(value);
-      }
-
-      return static_cast<T>(value);
-    }
-
-    //*************************************************************************
-    /// Get as an unsigned long.
-    //*************************************************************************
-    ETL_CONSTEXPR14 unsigned long to_ulong() const ETL_NOEXCEPT
-    {
-      return value<unsigned long>();
-    }
-
-    //*************************************************************************
-    /// Get as an unsigned long long.
-    //*************************************************************************
-    ETL_CONSTEXPR14 unsigned long long to_ullong() const ETL_NOEXCEPT
-    {
-      return value<unsigned long long>();
-    }
-
-    //*************************************************************************
-    /// Reset all of the bits.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& reset() ETL_NOEXCEPT
-    {
-      buffer = All_Clear_Element;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Reset the bit at the position.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& reset(size_t position)
-    {
-      ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
-      
-      const element_type mask = element_type(element_type(1) << position);
-      buffer &= ~mask;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Tests a bit at a position.
-    /// Positions greater than the number of configured bits will return <b>false</b>.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool test(size_t position) const
-    {
-      ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), false);
-
-      const element_type mask = element_type(element_type(1) << position);
-      return (buffer & mask) != 0U;
-    }
-
-    //*************************************************************************
-    /// The number of bits in the bitset.
-    //*************************************************************************
-    ETL_CONSTEXPR14 size_t size() const ETL_NOEXCEPT
-    {
-      return Active_Bits;
-    }
-
-    //*************************************************************************
-    /// Count the number of bits set.
-    //*************************************************************************
-    ETL_CONSTEXPR14 size_t count() const ETL_NOEXCEPT
-    {
-      return etl::count_bits(buffer);
-    }
-
-    //*************************************************************************
-    // Are all the bits sets?
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool all() const ETL_NOEXCEPT
-    {
-      return buffer == All_Set_Element;
-    }
-
-    //*************************************************************************
-    // Are all the bits sets?
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool all(element_type mask) const ETL_NOEXCEPT
-    {
-      return buffer == (All_Set_Element & mask);
-    }
-
-    //*************************************************************************
-    /// Are none of the bits set?
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool none() const ETL_NOEXCEPT
-    {
-      return buffer == All_Clear_Element;
-    }
-
-    //*************************************************************************
-    /// Are none of the bits set?
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool none(element_type mask) const ETL_NOEXCEPT
-    {
-      return (buffer & mask) == All_Clear_Element;
-    }
-
-    //*************************************************************************
-    /// Are any of the bits set?
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool any() const ETL_NOEXCEPT
-    {
-      return !none();
-    }
-
-    //*************************************************************************
-    /// Are any of the bits set?
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool any(element_type mask) const ETL_NOEXCEPT
-    {
-      return !none(mask);
-    }
-
-    //*************************************************************************
-    /// Flip all of the bits.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& flip() ETL_NOEXCEPT
-    {
-      buffer = ~buffer;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Flip some of the bits.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& flip_bits(element_type mask = etl::integral_limits<element_type>::max) ETL_NOEXCEPT
-    {
-      buffer ^= mask;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Flip the bit at the position.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& flip(size_t position)
-    {
-      ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
-      
-      const element_type mask = element_type(element_type(1) << position);
-      buffer ^= mask;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Read [] operator.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool operator[] (size_t position) const ETL_NOEXCEPT
-    {
-      if (position < Active_Bits)
-      {
-        const element_type mask = element_type(element_type(1) << position);
-        return (buffer & mask) != 0U;
-      }
-
-      return false;
-    }
-
-    //*************************************************************************
-    /// Write [] operator.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bit_reference operator [] (size_t position) ETL_NOEXCEPT
-    {
-      return bit_reference(*this, position);
-    }
-
-    //*************************************************************************
-    /// Returns a string representing the bitset.
-    //*************************************************************************
-#if ETL_USING_CPP11
-    template <typename TString = etl::string<Active_Bits>>
-#else
-    template <typename TString>
-#endif
-    ETL_CONSTEXPR14 TString to_string(typename TString::value_type zero = typename TString::value_type('0'),
-                                      typename TString::value_type one  = typename TString::value_type('1')) const
-    {
-      TString result;
-
-      result.resize(Active_Bits, '\0');
-
-      // Check that the string type can contain the digits.
-      ETL_ASSERT_OR_RETURN_VALUE(result.size() == Active_Bits, ETL_ERROR(etl::bitset_string_too_small), result);
-
-      for (size_t i = Active_Bits; i > 0; --i)
-      {
-        result[Active_Bits - i] = test(i - 1) ? one : zero;
-      }
-
-      return result;
-    }
-
-    //*************************************************************************
-    /// Finds the first bit in the specified state.
-    ///\param state The state to search for.
-    ///\returns The position of the bit or npos if none were found.
-    //*************************************************************************
-    ETL_CONSTEXPR14 size_t find_first(bool state) const ETL_NOEXCEPT
-    {
-      return find_next(state, 0U);
-    }
-
-    //*************************************************************************
-    /// Finds the next bit in the specified state.
-    ///\param state    The state to search for.
-    ///\param position The position to start from.
-    ///\returns The position of the bit or npos if none were found.
-    //*************************************************************************
-    ETL_CONSTEXPR14 size_t find_next(bool state, size_t position) const ETL_NOEXCEPT
-    {
-      if (position < Active_Bits)
-      {
-        // Where to start.
-        size_t bit = position;
-
-        element_type mask = 1U << position;
-
-        // Needs checking?
-        if ((state && (buffer != All_Clear_Element)) || (!state && (buffer != All_Set_Element)))
-        {
-          // For each bit in the element...
-          while (bit < Active_Bits)
-          {
-            // Equal to the required state?
-            if (((buffer & mask) != 0) == state)
-            {
-              return bit;
-            }
-
-            // Move on to the next bit.
-            mask <<= 1;
-            ++bit;
-          }
-        }
-      }
-
-      return npos;
-    }
-
-    //*************************************************************************
-    /// operator &
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true> operator &(const bitset<Active_Bits, TElement, true>& other) const ETL_NOEXCEPT
-    {
-      etl::bitset<Active_Bits, TElement, true> temp(*this);
-
-      temp &= other;
-
-      return temp;
-    }
-
-    //*************************************************************************
-    /// operator &=
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& operator &=(const bitset<Active_Bits, TElement, true>& other) ETL_NOEXCEPT
-    {
-      buffer &= other.buffer;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// operator |
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true> operator |(const bitset<Active_Bits, TElement, true>& other) const ETL_NOEXCEPT
-    {
-      etl::bitset<Active_Bits, TElement, true> temp(*this);
-
-      temp |= other;
-
-      return temp;
-    }
-
-    //*************************************************************************
-    /// operator |=
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& operator |=(const bitset<Active_Bits, TElement, true>& other) ETL_NOEXCEPT
-    {
-      buffer |= other.buffer;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// operator ^
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true> operator ^(const bitset<Active_Bits, TElement, true>& other) const ETL_NOEXCEPT
-    {
-      etl::bitset<Active_Bits, TElement, true> temp(*this);
-
-      temp ^= other;
-
-      return temp;
-    }
-
-    //*************************************************************************
-    /// operator ^=
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& operator ^=(const bitset<Active_Bits, TElement, true>& other) ETL_NOEXCEPT
-    {
-      buffer ^= other.buffer;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// operator ~
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true> operator ~() const ETL_NOEXCEPT
-    {
-      etl::bitset<Active_Bits, TElement, true> temp(*this);
-
-      temp.flip();
-
-      return temp;
-    }
-
-    //*************************************************************************
-    /// operator <<
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true> operator <<(size_t shift) const ETL_NOEXCEPT
-    {
-      etl::bitset<Active_Bits, TElement, true> temp(*this);
-
-      temp <<= shift;
-
-      return temp;
-    }
-
-    //*************************************************************************
-    /// operator <<=
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& operator <<=(size_t shift) ETL_NOEXCEPT
-    {
-      if (shift >= Active_Bits)
-      {
-        reset();
-      }
-      else
-      {
-        buffer <<= shift;
-      }
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// operator >>
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true> operator >>(size_t shift) const ETL_NOEXCEPT
-    {
-      etl::bitset<Active_Bits, TElement> temp(*this);
-
-      temp >>= shift;
-
-      return temp;
-    }
-
-    //*************************************************************************
-    /// operator >>=
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, true>& operator >>=(size_t shift) ETL_NOEXCEPT
-    {
-      if (shift >= Active_Bits)
-      {
-        reset();
-      }
-      else
-      {
-        buffer >>= shift;
-      }
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// operator ==
-    //*************************************************************************
-    friend ETL_CONSTEXPR14 bool operator ==(const bitset<Active_Bits, TElement, true>& lhs, const bitset<Active_Bits, TElement, true>& rhs) ETL_NOEXCEPT
-    {
-      return (lhs.buffer == rhs.buffer);
-    }
-
-    //*************************************************************************
-    /// swap
-    //*************************************************************************
-    ETL_CONSTEXPR14 void swap(etl::bitset<Active_Bits, TElement, true>& other) ETL_NOEXCEPT
-    {
-      element_type temp = buffer;
-      buffer = other.buffer;
-      other.buffer = temp;
-    }
-
-    //*************************************************************************
-    /// span
-    /// Returns a span of the underlying buffer.
-    //*************************************************************************
-    ETL_CONSTEXPR14 span_type span() ETL_NOEXCEPT
-    {
-      return span_type(&buffer, 1);
-    }
-
-    //*************************************************************************
-    /// span
-    /// Returns a const span of the underlying buffer.
-    //*************************************************************************
-    ETL_CONSTEXPR14 const_span_type span() const ETL_NOEXCEPT
-    {
-      return const_span_type(&buffer, 1);
-    }
-
-  private:
-
-    element_type buffer;
-  };
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset<Active_Bits, TElement, true>::Bits_Per_Element;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset<Active_Bits, TElement, true>::Number_Of_Elements;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset<Active_Bits, TElement, true>::Allocated_Bits;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT typename bitset<Active_Bits, TElement, true>::element_type bitset<Active_Bits, TElement, true>::All_Set_Element;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT typename bitset<Active_Bits, TElement, true>::element_type bitset<Active_Bits, TElement, true>::All_Clear_Element;
-  
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset<Active_Bits, TElement, true>::Top_Mask_Shift;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT typename bitset<Active_Bits, TElement, true>::element_type bitset<Active_Bits, TElement, true>::Top_Mask;
-
-  //*************************************************************************
-  /// The specialisation that uses an array of the default element type.
-  //*************************************************************************
-  template <size_t Active_Bits, typename TElement>
-  class bitset<Active_Bits, TElement, false> : public bitset_constants<>
-  {
-  private:
-
-    //*************************************************************************
-    // If the 'TElement' is the default 'void', then use 'char', otherwise uses
-    // the unsigned variant of 'TElement'.
-    //*************************************************************************
-    struct select_element_type
-    {
-      typedef typename etl::make_unsigned<typename etl::conditional<etl::is_same<void, TElement>::value, char, TElement>::type>::type type;
-    };  
-
-  public:
-
-    typedef typename select_element_type::type element_type;
-    typedef element_type*       pointer;
-    typedef const element_type* const_pointer;
-      
-    static ETL_CONSTANT size_t       Bits_Per_Element   = etl::bitset_impl<element_type>::Bits_Per_Element;
     static ETL_CONSTANT size_t       Number_Of_Elements = (Active_Bits % Bits_Per_Element == 0) ? Active_Bits / Bits_Per_Element : Active_Bits / Bits_Per_Element + 1;
     static ETL_CONSTANT size_t       Allocated_Bits     = Number_Of_Elements * Bits_Per_Element;
     static ETL_CONSTANT size_t       Top_Mask_Shift     = ((Bits_Per_Element - (Allocated_Bits - Active_Bits)) % Bits_Per_Element);
-    static ETL_CONSTANT element_type All_Set_Element    = etl::bitset_impl<element_type>::All_Set_Element;
-    static ETL_CONSTANT element_type All_Clear_Element  = etl::bitset_impl<element_type>::All_Clear_Element;
     static ETL_CONSTANT element_type Top_Mask           = element_type(Top_Mask_Shift == 0 ? All_Set_Element : ~(All_Set_Element << Top_Mask_Shift));
 
     static ETL_CONSTANT size_t ALLOCATED_BITS = Allocated_Bits; ///< For backward compatibility.
@@ -2042,7 +1902,7 @@ namespace etl
       {
       }
 
-      bitset<Active_Bits, TElement, false>* p_bitset; ///< The bitset.
+      bitset<Active_Bits, TElement>* p_bitset; ///< The bitset.
       size_t position; ///< The position in the bitset.
     };
 
@@ -2050,18 +1910,17 @@ namespace etl
     /// Default constructor.
     //*************************************************************************
     ETL_CONSTEXPR14 bitset() ETL_NOEXCEPT
-      : buffer()
     {
-      reset();
+      implementation::reset(buffer, Number_Of_Elements);
     }
 
     //*************************************************************************
     /// Copy constructor.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset(const bitset<Active_Bits, TElement, false>& other) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset(const bitset<Active_Bits, TElement>& other) ETL_NOEXCEPT
       : buffer()
     {
-      etl::copy_n(other.buffer, Number_Of_Elements, buffer);
+      implementation::operator_assignment(buffer, other.buffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -2070,8 +1929,7 @@ namespace etl
     ETL_CONSTEXPR14 bitset(unsigned long long value) ETL_NOEXCEPT
       : buffer()
     {
-      ibitset.initialise(buffer, Number_Of_Elements, value);
-      clear_unused_bits_in_msb();
+      implementation::initialise(buffer, Number_Of_Elements, value);
     }
 
     //*************************************************************************
@@ -2080,8 +1938,7 @@ namespace etl
     ETL_CONSTEXPR14 bitset(const char* text) ETL_NOEXCEPT
       : buffer()
     {
-      ibitset.set(buffer, Number_Of_Elements, Active_Bits, text);
-      clear_unused_bits_in_msb();
+      implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -2090,8 +1947,7 @@ namespace etl
     ETL_CONSTEXPR14 bitset(const wchar_t* text) ETL_NOEXCEPT
       : buffer()
     {
-      ibitset.set(buffer, Number_Of_Elements, Active_Bits, text);
-      clear_unused_bits_in_msb();
+      implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -2100,8 +1956,7 @@ namespace etl
     ETL_CONSTEXPR14 bitset(const char16_t* text) ETL_NOEXCEPT
       : buffer()
     {
-      ibitset.set(buffer, Number_Of_Elements, Active_Bits, text);
-      clear_unused_bits_in_msb();
+      implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -2110,14 +1965,13 @@ namespace etl
     ETL_CONSTEXPR14 bitset(const char32_t* text) ETL_NOEXCEPT
       : buffer()
     {
-      ibitset.set(buffer, Number_Of_Elements, Active_Bits, text);
-      clear_unused_bits_in_msb();
+      implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
     /// Assignment operator.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset& operator =(const bitset<Active_Bits, TElement, false>& other) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset& operator =(const bitset<Active_Bits, TElement>& other) ETL_NOEXCEPT
     {
       etl::copy_n(other.buffer, Number_Of_Elements, buffer);
 
@@ -2127,10 +1981,9 @@ namespace etl
     //*************************************************************************
     /// Set all of the bits.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& set() ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& set() ETL_NOEXCEPT
     {
-      etl::fill_n(buffer, Number_Of_Elements, All_Set_Element);
-      clear_unused_bits_in_msb();
+      implementation::set(buffer, Number_Of_Elements);
 
       return *this;
     }
@@ -2138,12 +1991,11 @@ namespace etl
     //*************************************************************************
     /// Set the bit at the position.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& set(size_t position, bool value = true)
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& set(size_t position, bool value = true)
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
 
-      ibitset.set(buffer, Number_Of_Elements, position, value);
-      clear_unused_bits_in_msb();
+      implementation::set(buffer, Number_Of_Elements, position, value);
       
       return *this;
     }
@@ -2151,9 +2003,9 @@ namespace etl
     //*************************************************************************
     /// Set from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& set(const char* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& set(const char* text) ETL_NOEXCEPT
     {
-      ibitset.set(buffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -2161,9 +2013,9 @@ namespace etl
     //*************************************************************************
     /// Set from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& set(const wchar_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& set(const wchar_t* text) ETL_NOEXCEPT
     {
-      ibitset.set(buffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -2171,9 +2023,9 @@ namespace etl
     //*************************************************************************
     /// Set from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& set(const char16_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& set(const char16_t* text) ETL_NOEXCEPT
     {
-      ibitset.set(buffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -2181,9 +2033,9 @@ namespace etl
     //*************************************************************************
     /// Set from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& set(const char32_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& set(const char32_t* text) ETL_NOEXCEPT
     {
-      ibitset.set(buffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -2191,9 +2043,9 @@ namespace etl
     //*************************************************************************
     /// Set from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& from_string(const char* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& from_string(const char* text) ETL_NOEXCEPT
     {
-      ibitset.from_string(buffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -2201,9 +2053,9 @@ namespace etl
     //*************************************************************************
     /// Set from a wide string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& from_string(const wchar_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& from_string(const wchar_t* text) ETL_NOEXCEPT
     {
-      ibitset.from_string(buffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -2211,9 +2063,9 @@ namespace etl
     //*************************************************************************
     /// Set from a u16 string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& from_string(const char16_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& from_string(const char16_t* text) ETL_NOEXCEPT
     {
-      ibitset.from_string(buffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -2221,9 +2073,9 @@ namespace etl
     //*************************************************************************
     /// Set from a u32 string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& from_string(const char32_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& from_string(const char32_t* text) ETL_NOEXCEPT
     {
-      ibitset.from_string(buffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -2237,9 +2089,9 @@ namespace etl
       value() const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Only integral types are supported");
-      ETL_STATIC_ASSERT((sizeof(T) * CHAR_BIT) >= (Number_Of_Elements * Bits_Per_Element), "Type too small");
+      ETL_STATIC_ASSERT(etl::integral_limits<T>::bits >= (Number_Of_Elements * Bits_Per_Element), "Type too small");
 
-      return ibitset.template value<T>(buffer, Number_Of_Elements);
+      return implementation::template value<T>(buffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -2247,21 +2099,14 @@ namespace etl
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-    typename etl::enable_if<etl::is_integral<T>::value, T>::type
-      extract(size_t position, size_t length = etl::integral_limits<T>::bits) const
+    T extract(size_t position, size_t length = etl::integral_limits<T>::bits) const
     {
-      ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
+      ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Only integral types are supported");
 
-      typedef typename etl::make_unsigned<T>::type unsigned_t;
+      ETL_ASSERT_OR_RETURN_VALUE(length <= etl::integral_limits<T>::bits, ETL_ERROR(bitset_overflow), 0);
+      ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits,      ETL_ERROR(bitset_overflow), 0);
 
-      unsigned_t value = ibitset.template extract_from_buffer<T>(buffer, position, length);;
-
-      if ((length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
-      {
-        value = etl::sign_extend<T>(value, length);
-      }
-
-      return static_cast<T>(value);
+      return implementation::extract<T>(buffer, position, length);
     }
 
     //*************************************************************************
@@ -2269,21 +2114,13 @@ namespace etl
     //*************************************************************************
     template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
     ETL_CONSTEXPR14
-    typename etl::enable_if<etl::is_integral<T>::value, T>::type
-      extract() const ETL_NOEXCEPT
+    T extract() const
     {
-      ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
+      ETL_STATIC_ASSERT(etl::is_integral<T>::value,              "Only integral types are supported");
+      ETL_STATIC_ASSERT(Length <= etl::integral_limits<T>::bits, "Length is larger that the required type");
+      ETL_STATIC_ASSERT((Position + Length) <= Active_Bits,      "Position/Length overflows bitset");
 
-      typedef typename etl::make_unsigned<T>::type unsigned_t;
-
-      unsigned_t value = ibitset.template extract_from_buffer<T, Position, Length>(buffer);
-
-      if ETL_IF_CONSTEXPR((Length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
-      {
-        value = etl::sign_extend<T, Length>(value);
-      }
-
-      return static_cast<T>(value);
+      return implementation::extract<T>(buffer, Position, Length);
     }
 
     //*************************************************************************
@@ -2291,7 +2128,9 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 unsigned long to_ulong() const ETL_NOEXCEPT
     {
-      return value<unsigned long>();
+      ETL_STATIC_ASSERT(etl::integral_limits<unsigned long>::bits >= Active_Bits, "to_ulong() : Active_Bits > unsigned long");
+
+      return implementation::template value<unsigned long>(buffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -2299,14 +2138,17 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 unsigned long long to_ullong() const ETL_NOEXCEPT
     {
-      return value<unsigned long long>();
+      ETL_STATIC_ASSERT(etl::integral_limits<unsigned long long>::bits >= Active_Bits, "to_ullong() : Active_Bits > unsigned long long");
+
+      return implementation::template value<unsigned long long>(buffer, Number_Of_Elements);
     }
+
     //*************************************************************************
     /// Reset all of the bits.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& reset() ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& reset() ETL_NOEXCEPT
     {
-      etl::fill_n(buffer, Number_Of_Elements, All_Clear_Element);
+      implementation::reset(buffer, Number_Of_Elements);
 
       return *this;
     }
@@ -2314,11 +2156,11 @@ namespace etl
     //*************************************************************************
     /// Reset the bit at the position.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& reset(size_t position)
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& reset(size_t position)
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
 
-      ibitset.reset(buffer, Number_Of_Elements, position);
+      implementation::reset(buffer, Number_Of_Elements, position);
 
       return *this;
     }
@@ -2331,7 +2173,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), false);
 
-      return ibitset.test(buffer, Number_Of_Elements, position);
+      return implementation::test(buffer, Number_Of_Elements, position);
     }
  
     //*************************************************************************
@@ -2347,7 +2189,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 size_t count() const ETL_NOEXCEPT
     {
-      return ibitset.count(buffer, Number_Of_Elements);
+      return implementation::count(buffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -2355,7 +2197,15 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool all() const ETL_NOEXCEPT
     {
-      return ibitset.all(buffer, Number_Of_Elements, Top_Mask);
+      return implementation::all(buffer, Number_Of_Elements, Top_Mask);
+    }
+
+    //*************************************************************************
+    // Are all the mask bits sets?
+    //*************************************************************************
+    ETL_CONSTEXPR14 bool all(element_type mask) const ETL_NOEXCEPT
+    {
+      return implementation::all(buffer, Number_Of_Elements, Top_Mask, mask);
     }
 
     //*************************************************************************
@@ -2363,7 +2213,15 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool none() const ETL_NOEXCEPT
     {
-      return ibitset.none(buffer, Number_Of_Elements);
+      return implementation::none(buffer, Number_Of_Elements);
+    }
+
+    //*************************************************************************
+    /// Are none of the mask bits set?
+    //*************************************************************************
+    ETL_CONSTEXPR14 bool none(element_type mask) const ETL_NOEXCEPT
+    {
+      return implementation::none(buffer, Number_Of_Elements, mask);
     }
 
     //*************************************************************************
@@ -2371,16 +2229,23 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool any() const ETL_NOEXCEPT
     {
-      return !none();
+      return implementation::any(buffer, Number_Of_Elements);
     }
  
+    //*************************************************************************
+    /// Are any of the mask bits set?
+    //*************************************************************************
+    ETL_CONSTEXPR14 bool any(element_type mask) const ETL_NOEXCEPT
+    {
+      return implementation::any(buffer, Number_Of_Elements, mask);
+    }
+
     //*************************************************************************
     /// Flip all of the bits.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& flip() ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& flip() ETL_NOEXCEPT
     {
-      ibitset.flip(buffer, Number_Of_Elements);
-      clear_unused_bits_in_msb();
+      implementation::flip(buffer, Number_Of_Elements);
 
       return *this;
     }
@@ -2388,11 +2253,11 @@ namespace etl
     //*************************************************************************
     /// Flip the bit at the position.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& flip(size_t position)
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& flip(size_t position)
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
 
-      ibitset.flip(buffer, Number_Of_Elements, position);
+      implementation::flip(buffer, Number_Of_Elements, position);
 
       return *this;
     }
@@ -2402,7 +2267,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool operator[] (size_t position) const ETL_NOEXCEPT
     {
-      return ibitset.test(buffer, Number_Of_Elements, position);
+      return implementation::test(buffer, Number_Of_Elements, position);
     }
 
     //*************************************************************************
@@ -2424,7 +2289,7 @@ namespace etl
     ETL_CONSTEXPR14 TString to_string(typename TString::value_type zero = typename TString::value_type('0'),
                                       typename TString::value_type one  = typename TString::value_type('1')) const
     {
-      return ibitset.template to_string<TString>(buffer, Number_Of_Elements, Active_Bits, zero, one);
+      return implementation::template to_string<TString>(buffer, Number_Of_Elements, Active_Bits, zero, one);
     }
 
     //*************************************************************************
@@ -2434,7 +2299,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 size_t find_first(bool state) const ETL_NOEXCEPT
     {
-      return ibitset.find_next(buffer, Number_Of_Elements, Active_Bits, state, 0);
+      return implementation::find_next(buffer, Number_Of_Elements, Active_Bits, state, 0);
     }
 
     //*************************************************************************
@@ -2445,17 +2310,17 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 size_t find_next(bool state, size_t position) const ETL_NOEXCEPT
     {
-      return ibitset.find_next(buffer, Number_Of_Elements, Active_Bits, state, position);
+      return implementation::find_next(buffer, Number_Of_Elements, Active_Bits, state, position);
     }
 
     //*************************************************************************
     /// operator &
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false> operator &(const bitset<Active_Bits, TElement, false>& other) const ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement> operator &(const bitset<Active_Bits, TElement>& other) const ETL_NOEXCEPT
     {
-      etl::bitset<Active_Bits, TElement, false> temp(*this);
+      etl::bitset<Active_Bits, TElement> temp(*this);
 
-      temp &= other;
+      implementation::operator_and(temp.buffer, other.buffer, Number_Of_Elements);
 
       return temp;
     }
@@ -2463,9 +2328,9 @@ namespace etl
     //*************************************************************************
     /// operator &=
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& operator &=(const bitset<Active_Bits, TElement, false>& other) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& operator &=(const bitset<Active_Bits, TElement>& other) ETL_NOEXCEPT
     {
-      ibitset.and_equals(&buffer[0], &other.buffer[0], Number_Of_Elements);
+      implementation::operator_and(buffer, other.buffer, Number_Of_Elements);
 
       return *this;
     }
@@ -2473,11 +2338,11 @@ namespace etl
     //*************************************************************************
     /// operator |
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false> operator |(const bitset<Active_Bits, TElement, false>& other) const ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement> operator |(const bitset<Active_Bits, TElement>& other) const ETL_NOEXCEPT
     {
-      etl::bitset<Active_Bits, TElement, false> temp(*this);
+      etl::bitset<Active_Bits, TElement> temp(*this);
 
-      temp |= other;
+      implementation::operator_or(temp.buffer, other.buffer, Number_Of_Elements);
 
       return temp;
     }
@@ -2485,9 +2350,9 @@ namespace etl
     //*************************************************************************
     /// operator |=
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& operator |=(const bitset<Active_Bits, TElement, false>& other) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& operator |=(const bitset<Active_Bits, TElement>& other) ETL_NOEXCEPT
     {
-      ibitset.or_equals(&buffer[0], &other.buffer[0], Number_Of_Elements);
+      implementation::operator_or(&buffer[0], &other.buffer[0], Number_Of_Elements);
 
       return *this;
     }
@@ -2495,11 +2360,11 @@ namespace etl
     //*************************************************************************
     /// operator ^
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false> operator ^(const bitset<Active_Bits, TElement, false>& other) const ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement> operator ^(const bitset<Active_Bits, TElement>& other) const ETL_NOEXCEPT
     {
-      etl::bitset<Active_Bits, TElement, false> temp(*this);
+      etl::bitset<Active_Bits, TElement> temp(*this);
 
-      temp ^= other;
+      implementation::operator_xor(temp.buffer, other.buffer, Number_Of_Elements);
 
       return temp;
     }
@@ -2507,9 +2372,9 @@ namespace etl
     //*************************************************************************
     /// operator ^=
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& operator ^=(const bitset<Active_Bits, TElement, false>& other) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& operator ^=(const bitset<Active_Bits, TElement>& other) ETL_NOEXCEPT
     {
-      ibitset.xor_equals(&buffer[0], &other.buffer[0], Number_Of_Elements);
+      implementation::operator_xor(buffer, other.buffer, Number_Of_Elements);
 
       return *this;
     }
@@ -2517,11 +2382,11 @@ namespace etl
     //*************************************************************************
     /// operator ~
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false> operator ~() const ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement> operator ~() const ETL_NOEXCEPT
     {
-      etl::bitset<Active_Bits, TElement, false> temp(*this);
+      etl::bitset<Active_Bits, TElement> temp(*this);
 
-      temp.flip();
+      implementation::flip(temp.buffer, Number_Of_Elements);
 
       return temp;
     }
@@ -2529,11 +2394,11 @@ namespace etl
     //*************************************************************************
     /// operator <<
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false> operator <<(size_t shift) const ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement> operator <<(size_t shift) const ETL_NOEXCEPT
     {
-      etl::bitset<Active_Bits, TElement, false> temp(*this);
+      etl::bitset<Active_Bits, TElement> temp(*this);
 
-      temp <<= shift;
+      implementation::operator_shift_left(temp.buffer, Number_Of_Elements, Active_Bits, shift);
 
       return temp;
     }
@@ -2541,16 +2406,15 @@ namespace etl
     //*************************************************************************
     /// operator <<=
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& operator <<=(size_t shift) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& operator <<=(size_t shift) ETL_NOEXCEPT
     {
       if (shift >= Active_Bits)
       {
-        reset();
+        implementation::reset(buffer, Number_Of_Elements);
       }
       else
       {
-        ibitset.shift_left_equals(buffer, Number_Of_Elements, shift);
-        clear_unused_bits_in_msb();
+        implementation::operator_shift_left(buffer, Number_Of_Elements, Active_Bits, shift);
       }
       
       return *this;
@@ -2559,11 +2423,11 @@ namespace etl
     //*************************************************************************
     /// operator >>
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false> operator >>(size_t shift) const ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement> operator >>(size_t shift) const ETL_NOEXCEPT
     {
-      bitset<Active_Bits, TElement, false> temp(*this);
+      bitset<Active_Bits, TElement> temp(*this);
 
-      temp >>= shift;
+      implementation::operator_shift_right(temp.buffer, Number_Of_Elements, Active_Bits, shift);
 
       return temp;
     }
@@ -2571,15 +2435,15 @@ namespace etl
     //*************************************************************************
     /// operator >>=
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement, false>& operator >>=(size_t shift) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& operator >>=(size_t shift) ETL_NOEXCEPT
     {
       if (shift >= Active_Bits)
       {
-        reset();
+        implementation::reset(buffer, Number_Of_Elements);
       }
       else
       {
-        ibitset.shift_right_equals(buffer, Number_Of_Elements, shift);
+        implementation::operator_shift_right(buffer, Number_Of_Elements, Active_Bits, shift);
       }
 
       return *this;
@@ -2588,7 +2452,7 @@ namespace etl
     //*************************************************************************
     /// operator ==
     //*************************************************************************
-    friend ETL_CONSTEXPR14 bool operator ==(const bitset<Active_Bits, TElement, false>& lhs, const bitset<Active_Bits, TElement, false>& rhs) ETL_NOEXCEPT
+    friend ETL_CONSTEXPR14 bool operator ==(const bitset<Active_Bits, TElement>& lhs, const bitset<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
     {
       return etl::equal(lhs.buffer, 
                         lhs.buffer + lhs.Number_Of_Elements,
@@ -2598,9 +2462,9 @@ namespace etl
     //*************************************************************************
     /// swap
     //*************************************************************************
-    ETL_CONSTEXPR14 void swap(etl::bitset<Active_Bits, TElement, false>& other) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 void swap(etl::bitset<Active_Bits, TElement>& other) ETL_NOEXCEPT
     {
-      ibitset.swap(buffer, other.buffer, Number_Of_Elements);
+      implementation::swap(buffer, other.buffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -2626,43 +2490,24 @@ namespace etl
     //*************************************************************************
     /// Correct the unused top bits after bit manipulation.
     //*************************************************************************
-    ETL_CONSTEXPR14 void clear_unused_bits_in_msb() ETL_NOEXCEPT
+    ETL_CONSTEXPR14 static void clear_unused_bits_in_msb(pointer pbuffer) ETL_NOEXCEPT
     {
       buffer[Number_Of_Elements - 1U] &= Top_Mask;
     }
 
-    etl::bitset_impl<element_type> ibitset;
+    // The implementation of the bitset functionality.
+    typedef etl::bitset_impl<element_type, (Number_Of_Elements == 1U) ? etl::bitset_layout::Single : etl::bitset_layout::Multi> implementation;
 
-    element_type buffer[Number_Of_Elements > 0U ? Number_Of_Elements : 1U];
+    // The storage for the bitset.
+    element_type buffer[Number_Of_Elements];
   };
 
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset<Active_Bits, TElement, false>::Bits_Per_Element;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset<Active_Bits, TElement, false>::Number_Of_Elements;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset<Active_Bits, TElement, false>::Allocated_Bits;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT typename bitset<Active_Bits, TElement, false>::element_type bitset<Active_Bits, TElement, false>::All_Set_Element;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT typename bitset<Active_Bits, TElement, false>::element_type bitset<Active_Bits, TElement, false>::All_Clear_Element;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset<Active_Bits, TElement, false>::Top_Mask_Shift;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT typename bitset<Active_Bits, TElement, false>::element_type bitset<Active_Bits, TElement, false>::Top_Mask;
-
   //***************************************************************************
   /// operator &
   ///\ingroup bitset
   //***************************************************************************
-  template <size_t Active_Bits, typename TElement, bool IsSingleElement>
-  ETL_CONSTEXPR14 bitset<Active_Bits> operator & (const bitset<Active_Bits, TElement, IsSingleElement>& lhs, const bitset<Active_Bits, TElement, IsSingleElement>& rhs) ETL_NOEXCEPT
+  template <size_t Active_Bits, typename TElement>
+  ETL_CONSTEXPR14 bitset<Active_Bits> operator & (const bitset<Active_Bits, TElement>& lhs, const bitset<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
   {
     bitset<Active_Bits> temp(lhs);
     temp &= rhs;
@@ -2673,8 +2518,8 @@ namespace etl
   /// operator |
   ///\ingroup bitset
   //***************************************************************************
-  template<size_t Active_Bits, typename TElement, bool IsSingleElement>
-  ETL_CONSTEXPR14 bitset<Active_Bits> operator | (const bitset<Active_Bits, TElement, IsSingleElement>& lhs, const bitset<Active_Bits, TElement, IsSingleElement>& rhs) ETL_NOEXCEPT
+  template<size_t Active_Bits, typename TElement>
+  ETL_CONSTEXPR14 bitset<Active_Bits> operator | (const bitset<Active_Bits, TElement>& lhs, const bitset<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
   {
     bitset<Active_Bits> temp(lhs);
     temp |= rhs;
@@ -2685,8 +2530,8 @@ namespace etl
   /// operator ^
   ///\ingroup bitset
   //***************************************************************************
-  template<size_t Active_Bits, typename TElement, bool IsSingleElement>
-  ETL_CONSTEXPR14 bitset<Active_Bits> operator ^ (const bitset<Active_Bits, TElement, IsSingleElement>& lhs, const bitset<Active_Bits, TElement, IsSingleElement>& rhs) ETL_NOEXCEPT
+  template<size_t Active_Bits, typename TElement>
+  ETL_CONSTEXPR14 bitset<Active_Bits> operator ^ (const bitset<Active_Bits, TElement>& lhs, const bitset<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
   {
     bitset<Active_Bits> temp(lhs);
     temp ^= rhs;
@@ -2697,8 +2542,8 @@ namespace etl
   /// operator !=
   ///\ingroup bitset
   //***************************************************************************
-  template<size_t Active_Bits, typename TElement, bool IsSingleElement>
-  ETL_CONSTEXPR14 bool operator != (const bitset<Active_Bits, TElement, IsSingleElement>& lhs, const bitset<Active_Bits, TElement, IsSingleElement>& rhs) ETL_NOEXCEPT
+  template<size_t Active_Bits, typename TElement>
+  ETL_CONSTEXPR14 bool operator != (const bitset<Active_Bits, TElement>& lhs, const bitset<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
   {
     return !(lhs == rhs);
   }
@@ -2707,8 +2552,8 @@ namespace etl
 //*************************************************************************
 /// swap
 //*************************************************************************
-template <size_t Active_Bits, typename TElement, bool IsSingleElement>
-ETL_CONSTEXPR14 void swap(etl::bitset<Active_Bits, TElement, IsSingleElement>& lhs, etl::bitset<Active_Bits, TElement, IsSingleElement>& rhs) ETL_NOEXCEPT
+template <size_t Active_Bits, typename TElement>
+ETL_CONSTEXPR14 void swap(etl::bitset<Active_Bits, TElement>& lhs, etl::bitset<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
 {
   lhs.swap(rhs);
 }
@@ -2720,990 +2565,65 @@ namespace etl
 {
   //***************************************************************************
   template <size_t Active_Bits = 0U,
-            typename TElement = char,
-            bool IsSingleElement = etl::integral_limits<TElement>::bits == Active_Bits>
-    class bitset_ext;
-
-  //***************************************************************************
-  /// Specialisation for zero bits.
-  /// Just defines 'npos'.
-  //***************************************************************************
-  template <>
-  class bitset_ext<0U, char, true> : public bitset_constants<>
-  {
-  };
+            typename TElement = unsigned char>
+  class bitset_ext;
 
   //***************************************************************************
   /// Specialisation for zero bits.
   //***************************************************************************
   template <>
-  class bitset_ext<0U, char, false> : public bitset_constants<>
-  {
-  };
-
-  //***************************************************************************
-  /// Specialisation that uses a single element if the element type is the 
-  /// same size as the number of active bits.
-  //***************************************************************************
-  template <size_t   Active_Bits, typename TElement>
-  class bitset_ext<Active_Bits, TElement, true> : public bitset_constants<>
+  class bitset_ext<0U, unsigned char>
   {
   public:
 
-    // The element type is the unsigned variant of 'TElement'.
-    typedef typename etl::make_unsigned<TElement>::type element_type;
+    typedef unsigned char element_type;
 
     typedef element_type* pointer;
     typedef const element_type* const_pointer;
 
-    static ETL_CONSTANT size_t       Bits_Per_Element   = etl::integral_limits<element_type>::bits;
-    static ETL_CONSTANT size_t       Number_Of_Elements = 1U;
-    static ETL_CONSTANT size_t       Allocated_Bits     = Bits_Per_Element;
-    static ETL_CONSTANT element_type All_Set_Element    = etl::integral_limits<typename etl::make_unsigned<element_type>::type>::max;
-    static ETL_CONSTANT element_type All_Clear_Element  = element_type(0);
+    static ETL_CONSTANT size_t       Bits_Per_Element   = 0U;
+    static ETL_CONSTANT size_t       Number_Of_Elements = 0U;
+    static ETL_CONSTANT size_t       Allocated_Bits     = 0U;
+    static ETL_CONSTANT element_type All_Set_Element    = 0U;
+    static ETL_CONSTANT element_type All_Clear_Element  = 0U;
     static ETL_CONSTANT size_t       Top_Mask_Shift     = 0U;
-    static ETL_CONSTANT element_type Top_Mask           = All_Set_Element;
+    static ETL_CONSTANT element_type Top_Mask           = 0U;
 
-    typedef etl::span<element_type, Number_Of_Elements>       span_type;
-    typedef etl::span<const element_type, Number_Of_Elements> const_span_type;
-
-    typedef element_type buffer_type;
-
-    //*************************************************************************
-    /// The reference type returned.
-    //*************************************************************************
-    class bit_reference
-    {
-    public:
-
-      friend class bitset_ext;
-
-      //*******************************
-      /// Copy constructor.
-      //*******************************
-      ETL_CONSTEXPR14 bit_reference(const bit_reference& other) ETL_NOEXCEPT
-        : p_bitset(other.p_bitset)
-        , position(other.position)
-      {
-      }
-
-      //*******************************
-      /// Conversion operator.
-      //*******************************
-      ETL_CONSTEXPR14 operator bool() const ETL_NOEXCEPT
-      {
-        return p_bitset->test(position);
-      }
-
-      //*******************************
-      /// Assignment operator.
-      //*******************************
-      ETL_CONSTEXPR14 bit_reference& operator = (bool b) ETL_NOEXCEPT
-      {
-        p_bitset->set(position, b);
-        return *this;
-      }
-
-      //*******************************
-      /// Assignment operator.
-      //*******************************
-      ETL_CONSTEXPR14 bit_reference& operator = (const bit_reference& r) ETL_NOEXCEPT
-      {
-        p_bitset->set(position, bool(r));
-        return *this;
-      }
-
-      //*******************************
-      /// Flip the bit.
-      //*******************************
-      ETL_CONSTEXPR14 bit_reference& flip() ETL_NOEXCEPT
-      {
-        p_bitset->flip(position);
-        return *this;
-      }
-
-      //*******************************
-      /// Return the logical inverse of the bit.
-      //*******************************
-      ETL_CONSTEXPR14 bool operator~() const ETL_NOEXCEPT
-      {
-        return !p_bitset->test(position);
-      }
-
-    private:
-
-      //*******************************
-      /// Default constructor.
-      //*******************************
-      ETL_CONSTEXPR14 bit_reference() ETL_NOEXCEPT
-        : p_bitset(ETL_NULLPTR)
-        , position(0)
-      {
-      }
-
-      //*******************************
-      /// Constructor.
-      //*******************************
-      ETL_CONSTEXPR14 bit_reference(bitset_ext<Active_Bits, TElement, true>& r_bitset, size_t position_) ETL_NOEXCEPT
-        : p_bitset(&r_bitset)
-        , position(position_)
-      {
-      }
-
-      bitset_ext<Active_Bits, TElement, true>* p_bitset; ///< The bitset.
-      size_t position; ///< The position in the bitset.
-    };
-
-    //*************************************************************************
-    /// Default constructor.
-    //*************************************************************************
-    ETL_CONSTEXPR14 explicit bitset_ext(element_type* pbuffer_)
-      : pbuffer(pbuffer_)
-    {
-      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      *pbuffer = All_Clear_Element;
-    }
-
-    //*************************************************************************
-    /// Default constructor.
-    //*************************************************************************
-    ETL_CONSTEXPR14 explicit bitset_ext(buffer_type& buffer) ETL_NOEXCEPT
-      : pbuffer(&buffer)
-    {
-      *pbuffer = All_Clear_Element;
-    }
-
-    //*************************************************************************
-    /// Construct copy.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const bitset_ext<Active_Bits, TElement, true>& other, element_type* pbuffer_)
-      : pbuffer(pbuffer_)
-    {
-      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      *pbuffer = *other.pbuffer;
-    }
-
-    //*************************************************************************
-    /// Construct copy.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const bitset_ext<Active_Bits, TElement, true>& other, buffer_type& buffer) ETL_NOEXCEPT
-      : pbuffer(&buffer)
-    {
-      *pbuffer = *other.pbuffer;
-    }
-
-    //*************************************************************************
-    /// Copy Constructor (Deleted).
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const bitset_ext<Active_Bits, TElement, true>& other) ETL_NOEXCEPT ETL_DELETE;
-
-    //*************************************************************************
-    /// Construct from a value.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(unsigned long long value, element_type* pbuffer_)
-      : pbuffer(pbuffer_)
-    {
-      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      *pbuffer = element_type(value);
-    }
-
-    //*************************************************************************
-    /// Construct from a value.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(unsigned long long value, buffer_type& buffer) ETL_NOEXCEPT
-      : pbuffer(&buffer)
-    {
-      *pbuffer = element_type(value);
-    }
-
-    //*************************************************************************
-    /// Construct from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char* text, element_type* pbuffer_)
-      : pbuffer(pbuffer_)
-    {
-      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      *pbuffer = All_Clear_Element;
-      set(text);
-    }
-
-    //*************************************************************************
-    /// Construct from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char* text, buffer_type& buffer) ETL_NOEXCEPT
-      : pbuffer(&buffer)
-    {
-      *pbuffer = All_Clear_Element;
-      set(text);
-    }
-
-    //*************************************************************************
-    /// Construct from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const wchar_t* text, element_type* pbuffer_)
-      : pbuffer(pbuffer_)
-    {
-      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      *pbuffer = All_Clear_Element;
-      set(text);
-    }
-
-    //*************************************************************************
-    /// Construct from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const wchar_t* text, buffer_type& buffer) ETL_NOEXCEPT
-      : pbuffer(&buffer)
-    {
-      *pbuffer = All_Clear_Element;
-      set(text);
-    }
-
-    //*************************************************************************
-    /// Construct from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char16_t* text, element_type* pbuffer_)
-      : pbuffer(pbuffer_)
-    {
-      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      *pbuffer = All_Clear_Element;
-      set(text);
-    }
-
-    //*************************************************************************
-    /// Construct from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char16_t* text, buffer_type& buffer) ETL_NOEXCEPT
-      : pbuffer(&buffer)
-    {
-      *pbuffer = All_Clear_Element;
-      set(text);
-    }
-
-    //*************************************************************************
-    /// Construct from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char32_t* text, element_type* pbuffer_)
-      : pbuffer(pbuffer_)
-    {
-      ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      *pbuffer = All_Clear_Element;
-      set(text);
-    }
-
-    //*************************************************************************
-    /// Construct from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char32_t* text, buffer_type& buffer) ETL_NOEXCEPT
-      : pbuffer(&buffer)
-    {
-      *pbuffer = All_Clear_Element;
-      set(text);
-    }
-
-    //*************************************************************************
-    /// Assignment operator.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext& operator =(const bitset_ext<Active_Bits, TElement, true>& other) ETL_NOEXCEPT
-    {
-      *pbuffer = *other.pbuffer;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set all of the bits.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& set() ETL_NOEXCEPT
-    {
-      *pbuffer = All_Set_Element;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set the bit at the position.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& set(size_t position, bool value = true)
-    {
-      ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
-      
-      const element_type mask = element_type(element_type(1) << position);
-      if (value == true)
-      {
-        *pbuffer |= mask;
-      }
-      else
-      {
-        *pbuffer &= ~mask;
-      }
-      
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& set(const char* text) ETL_NOEXCEPT
-    {
-      from_string(text);
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& set(const wchar_t* text) ETL_NOEXCEPT
-    {
-      from_string(text);
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& set(const char16_t* text) ETL_NOEXCEPT
-    {
-      from_string(text);
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& set(const char32_t* text) ETL_NOEXCEPT
-    {
-      from_string(text);
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& from_string(const char* text) ETL_NOEXCEPT
-    {
-      if (text == ETL_NULLPTR)
-      {
-        reset();
-      }
-      else
-      {
-        size_t string_length = etl::strlen(text);
-
-        // Build from the string.
-        string_length = etl::min(Active_Bits, string_length);
-
-        element_type mask = element_type(element_type(1) << (string_length - 1U));
-
-        for (size_t i = 0U; i < string_length; ++i)
-        {
-          if (text[i] == ETL_STR('1'))
-          {
-            *pbuffer |= mask;
-          }
-          else
-          {
-            *pbuffer &= ~mask;
-          }
-
-          mask >>= 1U;
-        }
-      }
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a wide string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& from_string(const wchar_t* text) ETL_NOEXCEPT
-    {
-      if (text == ETL_NULLPTR)
-      {
-        reset();
-      }
-      else
-      {
-        size_t string_length = etl::strlen(text);
-
-        // Build from the string.
-        string_length = etl::min(Active_Bits, string_length);
-
-        element_type mask = element_type(element_type(1) << (string_length - 1U));
-
-        for (size_t i = 0U; i < string_length; ++i)
-        {
-          if (text[i] == ETL_STRL('1'))
-          {
-            *pbuffer |= mask;
-          }
-          else
-          {
-            *pbuffer &= ~mask;
-          }
-
-          mask >>= 1U;
-        }
-      }
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a u16 string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& from_string(const char16_t* text) ETL_NOEXCEPT
-    {
-      if (text == ETL_NULLPTR)
-      {
-        reset();
-      }
-      else
-      {
-        size_t string_length = etl::strlen(text);
-
-        // Build from the string.
-        string_length = etl::min(Active_Bits, string_length);
-
-        element_type mask = element_type(element_type(1) << (string_length - 1U));
-
-        for (size_t i = 0U; i < string_length; ++i)
-        {
-          if (text[i] == ETL_STRu('1'))
-          {
-            *pbuffer |= mask;
-          }
-          else
-          {
-            *pbuffer &= ~mask;
-          }
-
-          mask >>= 1U;
-        }
-      }
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Set from a u32 string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& from_string(const char32_t* text) ETL_NOEXCEPT
-    {
-      if (text == ETL_NULLPTR)
-      {
-        reset();
-      }
-      else
-      {
-        size_t string_length = etl::strlen(text);
-
-        // Build from the string.
-        string_length = etl::min(Active_Bits, string_length);
-
-        element_type mask = element_type(element_type(1) << (string_length - 1U));
-
-        for (size_t i = 0U; i < string_length; ++i)
-        {
-          if (text[i] == ETL_STRU('1'))
-          {
-            *pbuffer |= mask;
-          }
-          else
-          {
-            *pbuffer &= ~mask;
-          }
-
-          mask >>= 1U;
-        }
-      }
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Get as an integral value.
-    //*************************************************************************
-    template <typename T>
-    ETL_CONSTEXPR14
-    typename etl::enable_if<etl::is_integral<T>::value, T>::type
-      value() const ETL_NOEXCEPT
-    {
-      ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Only integral types are supported");
-      ETL_STATIC_ASSERT((sizeof(T) * CHAR_BIT) >= (Number_Of_Elements * Bits_Per_Element), "Integral type too small");
-
-      T v = T(0);
-
-      const bool OK = (sizeof(T) * CHAR_BIT) >= Bits_Per_Element;
-
-      if (OK)
-      {
-        v = T(typename etl::make_unsigned<T>::type(*pbuffer));
-      }
-
-      return v;
-    }
-
-    //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
-    //*************************************************************************
-    template <typename T>
-    ETL_CONSTEXPR14
-    typename etl::enable_if<etl::is_integral<T>::value, T>::type
-      extract(size_t position, size_t length = etl::integral_limits<T>::bits) const
-    {
-      ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
-
-      typedef typename etl::make_unsigned<T>::type unsigned_t;
-
-      const unsigned_t Mask = etl::make_lsb_mask<unsigned_t>(length);
-      const unsigned_t Shift = position % Bits_Per_Element;
-
-      unsigned_t value = static_cast<unsigned_t>(*pbuffer >> Shift) & Mask;
-
-      if ((length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
-      {
-        value = etl::sign_extend<T>(value, length);
-      }
-
-      return static_cast<T>(value);
-    }
-
-    //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
-    //*************************************************************************
-    template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
-    ETL_CONSTEXPR14
-      typename etl::enable_if<etl::is_integral<T>::value, T>::type
-      extract() const ETL_NOEXCEPT
-    {
-      ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
-
-      typedef typename etl::make_unsigned<T>::type unsigned_t;
-
-      const unsigned_t Mask = etl::make_lsb_mask<unsigned_t, Length>();
-      const unsigned_t Shift = Position % Bits_Per_Element;
-
-      unsigned_t value = static_cast<unsigned_t>(*pbuffer >> Shift) & Mask;
-
-      if ETL_IF_CONSTEXPR((Length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
-      {
-        value = etl::sign_extend<T, Length>(value);
-      }
-
-      return static_cast<T>(value);
-    }
-
-    //*************************************************************************
-    /// Get as an unsigned long.
-    //*************************************************************************
-    ETL_CONSTEXPR14 unsigned long to_ulong() const ETL_NOEXCEPT
-    {
-      return value<unsigned long>();
-    }
-
-    //*************************************************************************
-    /// Get as an unsigned long long.
-    //*************************************************************************
-    ETL_CONSTEXPR14 unsigned long long to_ullong() const ETL_NOEXCEPT
-    {
-      return value<unsigned long long>();
-    }
-
-    //*************************************************************************
-    /// Reset all of the bits.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& reset() ETL_NOEXCEPT
-    {
-      *pbuffer = All_Clear_Element;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Reset the bit at the position.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& reset(size_t position)
-    {
-      ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
-      
-      const element_type mask = element_type(element_type(1) << position);
-      *pbuffer &= ~mask;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Tests a bit at a position.
-    /// Positions greater than the number of configured bits will return <b>false</b>.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool test(size_t position) const
-    {
-      ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), false);
-
-      const element_type mask = element_type(element_type(1) << position);
-      return (*pbuffer & mask) != 0U;
-    }
-
-    //*************************************************************************
-    /// The number of bits in the bitset.
-    //*************************************************************************
-    ETL_CONSTEXPR14 size_t size() const ETL_NOEXCEPT
-    {
-      return Active_Bits;
-    }
-
-    //*************************************************************************
-    /// Count the number of bits set.
-    //*************************************************************************
-    ETL_CONSTEXPR14 size_t count() const ETL_NOEXCEPT
-    {
-      return etl::count_bits(*pbuffer);
-    }
-
-    //*************************************************************************
-    // Are all the bits sets?
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool all() const ETL_NOEXCEPT
-    {
-      return *pbuffer == All_Set_Element;
-    }
-
-    //*************************************************************************
-    // Are all the bits sets?
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool all(element_type mask) const ETL_NOEXCEPT
-    {
-      return *pbuffer == (All_Set_Element & mask);
-    }
-
-    //*************************************************************************
-    /// Are none of the bits set?
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool none() const ETL_NOEXCEPT
-    {
-      return *pbuffer == All_Clear_Element;
-    }
-
-    //*************************************************************************
-    /// Are none of the bits set?
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool none(element_type mask) const ETL_NOEXCEPT
-    {
-      return (*pbuffer & mask) == All_Clear_Element;
-    }
-
-    //*************************************************************************
-    /// Are any of the bits set?
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool any() const ETL_NOEXCEPT
-    {
-      return !none();
-    }
-
-    //*************************************************************************
-    /// Are any of the bits set?
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool any(element_type mask) const ETL_NOEXCEPT
-    {
-      return !none(mask);
-    }
-
-    //*************************************************************************
-    /// Flip all of the bits.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& flip() ETL_NOEXCEPT
-    {
-      *pbuffer = ~*pbuffer;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Flip some of the bits.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& flip_bits(element_type mask = etl::integral_limits<element_type>::max) ETL_NOEXCEPT
-    {
-      *pbuffer ^= mask;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Flip the bit at the position.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& flip(size_t position)
-    {
-      ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
-
-      const element_type mask = element_type(element_type(1) << position);
-      *pbuffer ^= mask;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// Read [] operator.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bool operator[] (size_t position) const ETL_NOEXCEPT
-    {
-      if (position < Active_Bits)
-      {
-        const element_type mask = element_type(element_type(1) << position);
-        return (*pbuffer & mask) != 0U;
-      }
-
-      return false;
-    }
-
-    //*************************************************************************
-    /// Write [] operator.
-    //*************************************************************************
-    ETL_CONSTEXPR14 bit_reference operator [] (size_t position) ETL_NOEXCEPT
-    {
-      return bit_reference(*this, position);
-    }
-
-    //*************************************************************************
-    /// Returns a string representing the bitset.
-    //*************************************************************************
-#if ETL_USING_CPP11
-    template <typename TString = etl::string<Active_Bits>>
-#else
-    template <typename TString>
-#endif
-    ETL_CONSTEXPR14 TString to_string(typename TString::value_type zero = typename TString::value_type('0'),
-                                      typename TString::value_type one  = typename TString::value_type('1')) const
-    {
-      TString result;
-
-      result.resize(Active_Bits, '\0');
-
-      // Check that the string type can contain the digits.
-      ETL_ASSERT_OR_RETURN_VALUE(result.size() == Active_Bits, ETL_ERROR(etl::bitset_string_too_small), result);
-
-      for (size_t i = Active_Bits; i > 0; --i)
-      {
-        result[Active_Bits - i] = test(i - 1) ? one : zero;
-      }
-
-      return result;
-    }
-
-    //*************************************************************************
-    /// Finds the first bit in the specified state.
-    ///\param state The state to search for.
-    ///\returns The position of the bit or npos if none were found.
-    //*************************************************************************
-    ETL_CONSTEXPR14 size_t find_first(bool state) const ETL_NOEXCEPT
-    {
-      return find_next(state, 0U);
-    }
-
-    //*************************************************************************
-    /// Finds the next bit in the specified state.
-    ///\param state    The state to search for.
-    ///\param position The position to start from.
-    ///\returns The position of the bit or npos if none were found.
-    //*************************************************************************
-    ETL_CONSTEXPR14 size_t find_next(bool state, size_t position) const ETL_NOEXCEPT
-    {
-      if (position < Active_Bits)
-      {
-        // Where to start.
-        size_t bit = position;
-
-        element_type mask = 1U << position;
-
-        // Needs checking?
-        if ((state && (*pbuffer != All_Clear_Element)) || (!state && (*pbuffer != All_Set_Element)))
-        {
-          // For each bit in the element...
-          while (bit < Active_Bits)
-          {
-            // Equal to the required state?
-            if (((*pbuffer & mask) != 0) == state)
-            {
-              return bit;
-            }
-
-            // Move on to the next bit.
-            mask <<= 1;
-            ++bit;
-          }
-        }
-      }
-
-      return npos;
-    }
-
-    //*************************************************************************
-    /// operator &=
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& operator &=(const bitset_ext<Active_Bits, TElement, true>& other) ETL_NOEXCEPT
-    {
-      *pbuffer &= *other.pbuffer;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// operator |=
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& operator |=(const bitset_ext<Active_Bits, TElement, true>& other) ETL_NOEXCEPT
-    {
-      *pbuffer |= *other.pbuffer;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// operator ^=
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& operator ^=(const bitset_ext<Active_Bits, TElement, true>& other) ETL_NOEXCEPT
-    {
-      *pbuffer ^= *other.pbuffer;
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// operator <<=
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& operator <<=(size_t shift) ETL_NOEXCEPT
-    {
-      if (shift >= Active_Bits)
-      {
-        reset();
-      }
-      else
-      {
-        *pbuffer <<= shift;
-      }
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// operator >>=
-    //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, true>& operator >>=(size_t shift) ETL_NOEXCEPT
-    {
-      if (shift >= Active_Bits)
-      {
-        reset();
-      }
-      else
-      {
-        *pbuffer >>= shift;
-      }
-
-      return *this;
-    }
-
-    //*************************************************************************
-    /// operator ==
-    //*************************************************************************
-    friend ETL_CONSTEXPR14 bool operator ==(const bitset_ext<Active_Bits, TElement, true>& lhs, const bitset_ext<Active_Bits, TElement, true>& rhs) ETL_NOEXCEPT
-    {
-      return (*lhs.pbuffer == *rhs.pbuffer);
-    }
-
-    //*************************************************************************
-    /// swap
-    //*************************************************************************
-    ETL_CONSTEXPR14 void swap(etl::bitset_ext<Active_Bits, TElement, true>& other) ETL_NOEXCEPT
-    {
-      element_type temp = *pbuffer;
-      *pbuffer = *other.pbuffer;
-      *other.pbuffer = temp;
-    }
-
-    //*************************************************************************
-    /// span
-    /// Returns a span of the underlying buffer.
-    //*************************************************************************
-    ETL_CONSTEXPR14 span_type span() ETL_NOEXCEPT
-    {
-      return span_type(pbuffer, 1);
-    }
-
-    //*************************************************************************
-    /// span
-    /// Returns a const span of the underlying buffer.
-    //*************************************************************************
-    ETL_CONSTEXPR14 const_span_type span() const ETL_NOEXCEPT
-    {
-      return const_span_type(pbuffer, 1);
-    }
-
-  private:
-
-    element_type* pbuffer;
+    static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
   };
 
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset_ext<Active_Bits, TElement, true>::Bits_Per_Element;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset_ext<Active_Bits, TElement, true>::Number_Of_Elements;
-  
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset_ext<Active_Bits, TElement, true>::Allocated_Bits;
-  
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT typename bitset_ext<Active_Bits, TElement, true>::element_type bitset_ext<Active_Bits, TElement, true>::All_Set_Element;
-    
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT typename bitset_ext<Active_Bits, TElement, true>::element_type bitset_ext<Active_Bits, TElement, true>::All_Clear_Element;
-    
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset_ext<Active_Bits, TElement, true>::Top_Mask_Shift;
-  
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT typename bitset_ext<Active_Bits, TElement, true>::element_type bitset_ext<Active_Bits, TElement, true>::Top_Mask;
-
   //*************************************************************************
   /// The specialisation that uses an array of the default element type.
   //*************************************************************************
   template <size_t Active_Bits, typename TElement>
-  class bitset_ext<Active_Bits, TElement, false> : public bitset_constants<>
+  class bitset_ext// : public etl::private_bitset::bitset_common<Active_Bits, TEelement>
   {
-  private:
-
-    //*************************************************************************
-    // If the 'TElement' is the default 'void', then use 'char', otherwise uses
-    // the unsigned variant of 'TElement'.
-    //*************************************************************************
-    struct select_element_type
-    {
-      typedef typename etl::make_unsigned<typename etl::conditional<etl::is_same<void, TElement>::value, char, TElement>::type>::type type;
-    };
-
   public:
 
-    typedef typename select_element_type::type element_type;
-    typedef element_type* pointer;
+    ETL_STATIC_ASSERT(etl::is_unsigned<TElement>::value, "The element type must be unsigned");
+
+    typedef TElement            element_type;
+    typedef element_type*       pointer;
     typedef const element_type* const_pointer;
 
-    static ETL_CONSTANT size_t       Bits_Per_Element   = etl::bitset_impl<element_type>::Bits_Per_Element;
+    static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
+
+    //static ETL_CONSTANT bool Element_Layout = implementation::Element_Layout;
+
+    static ETL_CONSTANT size_t       Bits_Per_Element   = etl::integral_limits<element_type>::bits;
+    static ETL_CONSTANT element_type All_Set_Element    = etl::integral_limits<element_type>::max;
+    static ETL_CONSTANT element_type All_Clear_Element  = element_type(0);
     static ETL_CONSTANT size_t       Number_Of_Elements = (Active_Bits % Bits_Per_Element == 0) ? Active_Bits / Bits_Per_Element : Active_Bits / Bits_Per_Element + 1;
     static ETL_CONSTANT size_t       Allocated_Bits     = Number_Of_Elements * Bits_Per_Element;
     static ETL_CONSTANT size_t       Top_Mask_Shift     = ((Bits_Per_Element - (Allocated_Bits - Active_Bits)) % Bits_Per_Element);
-    static ETL_CONSTANT element_type All_Set_Element    = etl::bitset_impl<element_type>::All_Set_Element;
-    static ETL_CONSTANT element_type All_Clear_Element  = etl::bitset_impl<element_type>::All_Clear_Element;
     static ETL_CONSTANT element_type Top_Mask           = element_type(Top_Mask_Shift == 0 ? All_Set_Element : ~(All_Set_Element << Top_Mask_Shift));
 
     static ETL_CONSTANT size_t ALLOCATED_BITS = Allocated_Bits; ///< For backward compatibility.
 
+    typedef etl::array<TElement, Number_Of_Elements>          buffer_type;
     typedef etl::span<element_type, Number_Of_Elements>       span_type;
     typedef etl::span<const element_type, Number_Of_Elements> const_span_type;
 
-    typedef etl::array<element_type, Number_Of_Elements> buffer_type;
-
     //*************************************************************************
     /// The reference type returned.
     //*************************************************************************
@@ -3785,7 +2705,7 @@ namespace etl
       {
       }
 
-      bitset_ext<Active_Bits, TElement, false>* p_bitset; ///< The bitset.
+      bitset_ext<Active_Bits, TElement>* p_bitset; ///< The bitset.
       size_t position; ///< The position in the bitset.
     };
 
@@ -3812,7 +2732,7 @@ namespace etl
     //*************************************************************************
     /// Construct copy.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const bitset_ext<Active_Bits, TElement, false>& other, element_type* pbuffer_)
+    ETL_CONSTEXPR14 bitset_ext(const bitset_ext<Active_Bits, TElement>& other, element_type* pbuffer_)
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
@@ -3822,7 +2742,7 @@ namespace etl
     //*************************************************************************
     /// Construct copy.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const bitset_ext<Active_Bits, TElement, false>& other, buffer_type& buffer) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext(const bitset_ext<Active_Bits, TElement>& other, buffer_type& buffer) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
       etl::copy_n(other.pbuffer, Number_Of_Elements, pbuffer);
@@ -3831,7 +2751,7 @@ namespace etl
     //*************************************************************************
     /// Copy Constructor (Deleted).
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const bitset_ext<Active_Bits, TElement, false>& other) ETL_NOEXCEPT ETL_DELETE;
+    ETL_CONSTEXPR14 bitset_ext(const bitset_ext<Active_Bits, TElement>& other) ETL_NOEXCEPT ETL_DELETE;
 
     //*************************************************************************
     /// Construct from a value.
@@ -3840,8 +2760,7 @@ namespace etl
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      ibitset.initialise(pbuffer, Number_Of_Elements, value);
-      clear_unused_bits_in_msb();
+      implementation::initialise(pbuffer, Number_Of_Elements, value);
     }
 
     //*************************************************************************
@@ -3850,8 +2769,7 @@ namespace etl
     ETL_CONSTEXPR14 bitset_ext(unsigned long long value, buffer_type& buffer) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
-      ibitset.initialise(pbuffer, Number_Of_Elements, value);
-      clear_unused_bits_in_msb();
+      implementation::initialise(pbuffer, Number_Of_Elements, value);
     }
 
     //*************************************************************************
@@ -3861,8 +2779,7 @@ namespace etl
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
-      clear_unused_bits_in_msb();
+      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -3871,8 +2788,7 @@ namespace etl
     ETL_CONSTEXPR14 bitset_ext(const char* text, buffer_type& buffer) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
-      ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
-      clear_unused_bits_in_msb();
+      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -3882,8 +2798,7 @@ namespace etl
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
-      clear_unused_bits_in_msb();
+      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -3892,8 +2807,7 @@ namespace etl
     ETL_CONSTEXPR14 bitset_ext(const wchar_t* text, buffer_type& buffer) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
-      ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
-      clear_unused_bits_in_msb();
+      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -3903,8 +2817,7 @@ namespace etl
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
-      clear_unused_bits_in_msb();
+      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -3913,8 +2826,7 @@ namespace etl
     ETL_CONSTEXPR14 bitset_ext(const char16_t* text, buffer_type& buffer) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
-      ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
-      clear_unused_bits_in_msb();
+      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -3924,8 +2836,7 @@ namespace etl
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
-      clear_unused_bits_in_msb();
+      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -3934,16 +2845,15 @@ namespace etl
     ETL_CONSTEXPR14 bitset_ext(const char32_t* text, buffer_type& buffer) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
-      ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
-      clear_unused_bits_in_msb();
+      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
     /// Assignment operator.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext& operator =(const bitset_ext<Active_Bits, TElement, false>& other) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext& operator =(const bitset_ext<Active_Bits, TElement>& other) ETL_NOEXCEPT
     {
-      etl::copy_n(other.pbuffer, Number_Of_Elements, pbuffer);
+      implementation::operator_assignment(pbuffer, other.pbuffer, Number_Of_Elements);
 
       return *this;
     }
@@ -3951,10 +2861,9 @@ namespace etl
     //*************************************************************************
     /// Set all of the bits.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& set() ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set() ETL_NOEXCEPT
     {
-      etl::fill_n(pbuffer, Number_Of_Elements, All_Set_Element);
-      clear_unused_bits_in_msb();
+      implementation::set(pbuffer, Number_Of_Elements, All_Set_Element);
 
       return *this;
     }
@@ -3962,12 +2871,11 @@ namespace etl
     //*************************************************************************
     /// Set the bit at the position.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& set(size_t position, bool value = true)
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set(size_t position, bool value = true)
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
       
-      ibitset.set(pbuffer, Number_Of_Elements, position, value);
-      clear_unused_bits_in_msb();
+      implementation::set(pbuffer, Number_Of_Elements, position, value);
 
       return *this;
     }
@@ -3975,9 +2883,9 @@ namespace etl
     //*************************************************************************
     /// Set from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& set(const char* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set(const char* text) ETL_NOEXCEPT
     {
-      ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -3985,9 +2893,9 @@ namespace etl
     //*************************************************************************
     /// Set from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& set(const wchar_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set(const wchar_t* text) ETL_NOEXCEPT
     {
-      ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -3995,9 +2903,9 @@ namespace etl
     //*************************************************************************
     /// Set from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& set(const char16_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set(const char16_t* text) ETL_NOEXCEPT
     {
-      ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -4005,9 +2913,9 @@ namespace etl
     //*************************************************************************
     /// Set from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& set(const char32_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set(const char32_t* text) ETL_NOEXCEPT
     {
-      ibitset.set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -4015,9 +2923,9 @@ namespace etl
     //*************************************************************************
     /// Set from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& from_string(const char* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& from_string(const char* text) ETL_NOEXCEPT
     {
-      ibitset.from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -4025,9 +2933,9 @@ namespace etl
     //*************************************************************************
     /// Set from a wide string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& from_string(const wchar_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& from_string(const wchar_t* text) ETL_NOEXCEPT
     {
-      ibitset.from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -4035,9 +2943,9 @@ namespace etl
     //*************************************************************************
     /// Set from a u16 string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& from_string(const char16_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& from_string(const char16_t* text) ETL_NOEXCEPT
     {
-      ibitset.from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -4045,9 +2953,9 @@ namespace etl
     //*************************************************************************
     /// Set from a u32 string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& from_string(const char32_t* text) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& from_string(const char32_t* text) ETL_NOEXCEPT
     {
-      ibitset.from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -4057,13 +2965,12 @@ namespace etl
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-    typename etl::enable_if<etl::is_integral<T>::value, T>::type
-      value() const ETL_NOEXCEPT
+    T value() const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Only integral types are supported");
-      ETL_STATIC_ASSERT((sizeof(T) * CHAR_BIT) >= (Number_Of_Elements * Bits_Per_Element), "Type too small");
+      ETL_STATIC_ASSERT(etl::integral_limits<T>::bits >= (Number_Of_Elements * Bits_Per_Element), "Type too small");
 
-      return ibitset.template value<T>(pbuffer, Number_Of_Elements);
+      return implementation::template value<T>(pbuffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -4071,21 +2978,14 @@ namespace etl
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
-    typename etl::enable_if<etl::is_integral<T>::value, T>::type
-      extract(size_t position, size_t length = etl::integral_limits<T>::bits) const
+      T extract(size_t position, size_t length = etl::integral_limits<T>::bits)
     {
-      ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits, ETL_ERROR(bitset_overflow), 0);
+      ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Only integral types are supported");
 
-      typedef typename etl::make_unsigned<T>::type unsigned_t;
+      ETL_ASSERT_OR_RETURN_VALUE(length <= etl::integral_limits<T>::bits, ETL_ERROR(bitset_overflow), 0);
+      ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits,      ETL_ERROR(bitset_overflow), 0);
 
-      unsigned_t value = ibitset.template extract_from_buffer<T>(pbuffer, position, length);
-
-      if ((length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
-      {
-        value = etl::sign_extend<T>(value, length);
-      }
-
-      return static_cast<T>(value);
+      return implementation::extract<T>(pbuffer, position, length);
     }
 
     //*************************************************************************
@@ -4093,21 +2993,13 @@ namespace etl
     //*************************************************************************
     template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
     ETL_CONSTEXPR14
-    typename etl::enable_if<etl::is_integral<T>::value, T>::type
-      extract() const ETL_NOEXCEPT
+      T extract() const
     {
-      ETL_STATIC_ASSERT((Position + Length) <= Active_Bits, "Position/Length overflows bitset");
+      ETL_STATIC_ASSERT(etl::is_integral<T>::value,              "Only integral types are supported");
+      ETL_STATIC_ASSERT(Length <= etl::integral_limits<T>::bits, "Length is larger that the required type");
+      ETL_STATIC_ASSERT((Position + Length) <= Active_Bits,      "Position/Length overflows bitset");
 
-      typedef typename etl::make_unsigned<T>::type unsigned_t;
-
-      unsigned_t value = ibitset.template extract_from_buffer<T, Position, Length>(pbuffer);
-
-      if ETL_IF_CONSTEXPR((Length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
-      {
-        value = etl::sign_extend<T, Length>(value);
-      }
-
-      return static_cast<T>(value);
+      return implementation::extract<T>(pbuffer, Position, Length);
     }
 
     //*************************************************************************
@@ -4115,7 +3007,9 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 unsigned long to_ulong() const ETL_NOEXCEPT
     {
-      return value<unsigned long>();
+      ETL_STATIC_ASSERT(etl::integral_limits<unsigned long>::bits >= Active_Bits, "Active_Bits > unsigned long");
+
+      return implementation::template value<unsigned long>(pbuffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -4123,14 +3017,17 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 unsigned long long to_ullong() const ETL_NOEXCEPT
     {
-      return value<unsigned long long>();
+      ETL_STATIC_ASSERT(etl::integral_limits<unsigned long long>::bits >= Active_Bits, "Active_Bits > unsigned long long");
+
+      return implementation::template value<unsigned long long>(pbuffer, Number_Of_Elements);
     }
+
     //*************************************************************************
     /// Reset all of the bits.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& reset() ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& reset() ETL_NOEXCEPT
     {
-      etl::fill_n(pbuffer, Number_Of_Elements, All_Clear_Element);
+      implementation::reset(pbuffer, Number_Of_Elements);
 
       return *this;
     }
@@ -4138,11 +3035,11 @@ namespace etl
     //*************************************************************************
     /// Reset the bit at the position.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& reset(size_t position)
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& reset(size_t position)
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
 
-      ibitset.reset(pbuffer, Number_Of_Elements, position);
+      implementation::reset(pbuffer, Number_Of_Elements, position);
 
       return *this;
     }
@@ -4155,7 +3052,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), false);
       
-      return ibitset.test(pbuffer, Number_Of_Elements, position);
+      return implementation::test(pbuffer, Number_Of_Elements, position);
     }
 
     //*************************************************************************
@@ -4171,7 +3068,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 size_t count() const ETL_NOEXCEPT
     {
-      return ibitset.count(pbuffer, Number_Of_Elements);
+      return implementation::count(pbuffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -4179,7 +3076,15 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool all() const ETL_NOEXCEPT
     {
-      return ibitset.all(pbuffer, Number_Of_Elements, Top_Mask);
+      return implementation::all(pbuffer, Number_Of_Elements, Top_Mask);
+    }
+
+    //*************************************************************************
+    // Are all the mask bits sets?
+    //*************************************************************************
+    ETL_CONSTEXPR14 bool all(element_type mask) const ETL_NOEXCEPT
+    {
+      return implementation::all(pbuffer, Number_Of_Elements, Top_Mask, mask);
     }
 
     //*************************************************************************
@@ -4187,7 +3092,15 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool none() const ETL_NOEXCEPT
     {
-      return ibitset.none(pbuffer, Number_Of_Elements);
+      return implementation::none(pbuffer, Number_Of_Elements);
+    }
+
+    //*************************************************************************
+    /// Are none of the mask bits set?
+    //*************************************************************************
+    ETL_CONSTEXPR14 bool none(element_type mask) const ETL_NOEXCEPT
+    {
+      return implementation::none(pbuffer, Number_Of_Elements, mask);
     }
 
     //*************************************************************************
@@ -4195,16 +3108,23 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool any() const ETL_NOEXCEPT
     {
-      return !none();
+      return implementation::any(pbuffer, Number_Of_Elements, Top_Mask);
+    }
+
+    //*************************************************************************
+    /// Are any of the mask bits set?
+    //*************************************************************************
+    ETL_CONSTEXPR14 bool any(element_type mask) const ETL_NOEXCEPT
+    {
+      return implementation::any(pbuffer, Number_Of_Elements, Top_Mask, mask);
     }
 
     //*************************************************************************
     /// Flip all of the bits.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& flip() ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& flip() ETL_NOEXCEPT
     {
-      ibitset.flip(pbuffer, Number_Of_Elements);
-      clear_unused_bits_in_msb();
+      implementation::flip(pbuffer, Number_Of_Elements);
 
       return *this;
     }
@@ -4212,11 +3132,11 @@ namespace etl
     //*************************************************************************
     /// Flip the bit at the position.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& flip(size_t position)
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& flip(size_t position)
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
       
-      ibitset.flip(pbuffer, Number_Of_Elements, position);
+      implementation::flip(pbuffer, Number_Of_Elements, position);
 
       return *this;
     }
@@ -4226,7 +3146,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool operator[] (size_t position) const ETL_NOEXCEPT
     {
-      return ibitset.test(pbuffer, Number_Of_Elements, position);
+      return implementation::test(pbuffer, Number_Of_Elements, position);
     }
 
     //*************************************************************************
@@ -4248,7 +3168,7 @@ namespace etl
     ETL_CONSTEXPR14 TString to_string(typename TString::value_type zero = typename TString::value_type('0'),
       typename TString::value_type one = typename TString::value_type('1')) const
     {
-      return ibitset.template to_string<TString>(pbuffer, Number_Of_Elements, Active_Bits, zero, one);
+      return implementation::template to_string<TString>(pbuffer, Number_Of_Elements, Active_Bits, zero, one);
     }
 
     //*************************************************************************
@@ -4258,7 +3178,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 size_t find_first(bool state) const ETL_NOEXCEPT
     {
-      return ibitset.find_next(pbuffer, Number_Of_Elements, Active_Bits, state, 0);
+      return implementation::find_next(pbuffer, Number_Of_Elements, Active_Bits, state, 0);
     }
 
     //*************************************************************************
@@ -4269,15 +3189,15 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 size_t find_next(bool state, size_t position) const ETL_NOEXCEPT
     {
-      return ibitset.find_next(pbuffer, Number_Of_Elements, Active_Bits, state, position);
+      return implementation::find_next(pbuffer, Number_Of_Elements, Active_Bits, state, position);
     }
 
     //*************************************************************************
     /// operator &=
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& operator &=(const bitset_ext<Active_Bits, TElement, false>& other) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& operator &=(const bitset_ext<Active_Bits, TElement>& other) ETL_NOEXCEPT
     {
-      ibitset.and_equals(&pbuffer[0], &other.pbuffer[0], Number_Of_Elements);
+      implementation::operator_and(&pbuffer[0], &other.pbuffer[0], Number_Of_Elements);
 
       return *this;
     }
@@ -4285,9 +3205,9 @@ namespace etl
     //*************************************************************************
     /// operator |=
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& operator |=(const bitset_ext<Active_Bits, TElement, false>& other) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& operator |=(const bitset_ext<Active_Bits, TElement>& other) ETL_NOEXCEPT
     {
-      ibitset.or_equals(&pbuffer[0], &other.pbuffer[0], Number_Of_Elements);
+      implementation::operator_or(&pbuffer[0], &other.pbuffer[0], Number_Of_Elements);
 
       return *this;
     }
@@ -4295,9 +3215,9 @@ namespace etl
     //*************************************************************************
     /// operator ^=
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& operator ^=(const bitset_ext<Active_Bits, TElement, false>& other) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& operator ^=(const bitset_ext<Active_Bits, TElement>& other) ETL_NOEXCEPT
     {
-      ibitset.xor_equals(&pbuffer[0], &other.pbuffer[0], Number_Of_Elements);
+      implementation::xoperator_or(&pbuffer[0], &other.pbuffer[0], Number_Of_Elements);
 
       return *this;
     }
@@ -4305,17 +3225,9 @@ namespace etl
     //*************************************************************************
     /// operator <<=
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& operator <<=(size_t shift) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& operator <<=(size_t shift) ETL_NOEXCEPT
     {
-      if (shift >= Active_Bits)
-      {
-        reset();
-      }
-      else
-      {
-        ibitset.shift_left_equals(pbuffer, Number_Of_Elements, shift);
-        clear_unused_bits_in_msb();
-      }
+      implementation::operator_shift_left(pbuffer, Number_Of_Elements, Active_Bits, shift);
 
       return *this;
     }
@@ -4323,16 +3235,9 @@ namespace etl
     //*************************************************************************
     /// operator >>=
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement, false>& operator >>=(size_t shift) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& operator >>=(size_t shift) ETL_NOEXCEPT
     {
-      if (shift >= Active_Bits)
-      {
-        reset();
-      }
-      else
-      {
-        ibitset.shift_right_equals(pbuffer, Number_Of_Elements, shift);
-      }
+      implementation::operator_shift_right(pbuffer, Number_Of_Elements, Active_Bits, shift);
 
       return *this;
     }
@@ -4340,19 +3245,17 @@ namespace etl
     //*************************************************************************
     /// operator ==
     //*************************************************************************
-    friend ETL_CONSTEXPR14 bool operator ==(const bitset_ext<Active_Bits, TElement, false>& lhs, const bitset_ext<Active_Bits, TElement, false>& rhs) ETL_NOEXCEPT
+    friend ETL_CONSTEXPR14 bool operator ==(const bitset_ext<Active_Bits, TElement>& lhs, const bitset_ext<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
     {
-      return etl::equal(lhs.pbuffer,
-        lhs.pbuffer + lhs.Number_Of_Elements,
-        rhs.pbuffer);
+      return etl::equal(lhs.pbuffer, lhs.pbuffer + lhs.Number_Of_Elements, rhs.pbuffer);
     }
 
     //*************************************************************************
     /// swap
     //*************************************************************************
-    ETL_CONSTEXPR14 void swap(etl::bitset_ext<Active_Bits, TElement, false>& other) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 void swap(etl::bitset_ext<Active_Bits, TElement>& other) ETL_NOEXCEPT
     {
-      ibitset.swap(pbuffer, other.pbuffer, Number_Of_Elements);
+      implementation::swap(pbuffer, other.pbuffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -4378,42 +3281,24 @@ namespace etl
     //*************************************************************************
     /// Correct the unused top bits after bit manipulation.
     //*************************************************************************
-    ETL_CONSTEXPR14 void clear_unused_bits_in_msb() ETL_NOEXCEPT
+    ETL_CONSTEXPR14 static void clear_unused_bits_in_msb() ETL_NOEXCEPT
     {
       pbuffer[Number_Of_Elements - 1U] &= Top_Mask;
     }
 
-    etl::bitset_impl<element_type> ibitset;
+    // The implementation of the bitset functionality.
+    typedef etl::bitset_impl<element_type, (Number_Of_Elements == 1U) ? etl::bitset_layout::Single : etl::bitset_layout::Multi> implementation;
+
+    // Pointer to the storage for the bitset.
     element_type* pbuffer;
   };
 
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset_ext<Active_Bits, TElement, false>::Bits_Per_Element;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset_ext<Active_Bits, TElement, false>::Number_Of_Elements;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset_ext<Active_Bits, TElement, false>::Allocated_Bits;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT typename bitset_ext<Active_Bits, TElement, false>::element_type bitset_ext<Active_Bits, TElement, false>::All_Set_Element;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT typename bitset_ext<Active_Bits, TElement, false>::element_type bitset_ext<Active_Bits, TElement, false>::All_Clear_Element;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT size_t bitset_ext<Active_Bits, TElement, false>::Top_Mask_Shift;
-
-  template <size_t Active_Bits, typename TElement>
-  ETL_CONSTANT typename bitset_ext<Active_Bits, TElement, false>::element_type bitset_ext<Active_Bits, TElement, false>::Top_Mask;
-
   //***************************************************************************
   /// operator !=
   ///\ingroup bitset
   //***************************************************************************
-  template<size_t Active_Bits, typename TElement, bool IsSingleElement>
-  ETL_CONSTEXPR14 bool operator != (const bitset_ext<Active_Bits, TElement, IsSingleElement>& lhs, const bitset_ext<Active_Bits, TElement, IsSingleElement>& rhs) ETL_NOEXCEPT
+  template<size_t Active_Bits, typename TElement>
+  ETL_CONSTEXPR14 bool operator != (const bitset_ext<Active_Bits, TElement>& lhs, const bitset_ext<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
   {
     return !(lhs == rhs);
   }
@@ -4422,13 +3307,12 @@ namespace etl
 //*************************************************************************
 /// swap
 //*************************************************************************
-template <size_t Active_Bits, typename TElement, bool IsSingleElement>
-ETL_CONSTEXPR14 void swap(etl::bitset_ext<Active_Bits, TElement, IsSingleElement>& lhs, etl::bitset_ext<Active_Bits, TElement, IsSingleElement>& rhs) ETL_NOEXCEPT
+template <size_t Active_Bits, typename TElement>
+ETL_CONSTEXPR14 void swap(etl::bitset_ext<Active_Bits, TElement>& lhs, etl::bitset_ext<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
 {
   lhs.swap(rhs);
 }
 
-
 #include "minmax_pop.h"
 
 #endif
diff --git a/test/test_bitset_new_explicit_single_element_type.cpp b/test/test_bitset_new_explicit_single_element_type.cpp
index 05ed79a9..291c6836 100644
--- a/test/test_bitset_new_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_explicit_single_element_type.cpp
@@ -123,7 +123,7 @@ namespace
     TEST(test_default_constructor)
     {
       ETL_CONSTEXPR14 std::bitset<64> compare;
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data;
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data;
 
       CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -137,10 +137,10 @@ namespace
     //*************************************************************************
     TEST(test_default_constructor_single_element)
     {
-      etl::bitset<8,  int8_t>  data8;
-      etl::bitset<16, int16_t> data16;
-      etl::bitset<32, int32_t> data32;
-      etl::bitset<64, int64_t> data64;
+      etl::bitset<8,  uint8_t>  data8;
+      etl::bitset<16, uint16_t> data16;
+      etl::bitset<32, uint32_t> data32;
+      etl::bitset<64, uint64_t> data64;
 
       CHECK_EQUAL(1U, data8.Number_Of_Elements);
       CHECK_EQUAL(1U, data16.Number_Of_Elements);
@@ -152,7 +152,7 @@ namespace
     TEST(test_construct_from_value)
     {
       ETL_CONSTEXPR14 std::bitset<64> compare(0x123456731234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data(0x123456731234567ULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(0x123456731234567ULL);
 
       CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -168,10 +168,10 @@ namespace
     TEST(test_copy_construct)
     {
       ETL_CONSTEXPR14 std::bitset<64> compare(0x123456731234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data(0x123456731234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data_copy(data);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(0x123456731234567ULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data_copy(data);
 
-      CHECK_EQUAL(compare.size(), data_copy.size());
+      CHECK_EQUAL(compare.size(),  data_copy.size());
       CHECK_EQUAL(compare.count(), data_copy.count());
 
       for (size_t i = 0UL; i < data_copy.size(); ++i)
@@ -184,7 +184,7 @@ namespace
     TEST(test_construct_from_excess_value)
     {
       ETL_CONSTEXPR14 std::bitset<64> compare(0x8765432187654321ULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data(0x8765432187654321ULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(0x8765432187654321ULL);
 
       CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -199,7 +199,7 @@ namespace
     TEST(test_construct_from_char_string)
     {
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<64, int64_t> data("110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64, uint64_t> data("110001001000110100010101100111001100010010001101000101011001");
 
       CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -214,9 +214,9 @@ namespace
     TEST(test_construct_from_wchar_t_string)
     {
       std::bitset<64> compare(L"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<64, int64_t> data(L"110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64, uint64_t> data(L"110001001000110100010101100111001100010010001101000101011001");
 
-      CHECK_EQUAL(compare.size(), data.size());
+      CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
 
       for (size_t i = 0UL; i < data.size(); ++i)
@@ -229,9 +229,9 @@ namespace
     TEST(test_construct_from_char16_t_string)
     {
       std::bitset<64> compare(u"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<64, int64_t> data(u"110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64, uint64_t> data(u"110001001000110100010101100111001100010010001101000101011001");
 
-      CHECK_EQUAL(compare.size(), data.size());
+      CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
 
       for (size_t i = 0UL; i < data.size(); ++i)
@@ -244,9 +244,9 @@ namespace
     TEST(test_construct_from_char32_t_string)
     {
       std::bitset<64> compare(U"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<64, int64_t> data(U"110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64, uint64_t> data(U"110001001000110100010101100111001100010010001101000101011001");
 
-      CHECK_EQUAL(compare.size(), data.size());
+      CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
 
       for (size_t i = 0UL; i < data.size(); ++i)
@@ -260,7 +260,7 @@ namespace
     {
       const char* s = nullptr;
 
-      etl::bitset<60, int64_t> data(s);
+      etl::bitset<60, uint64_t> data(s);
 
       CHECK_EQUAL(60, data.size());
       CHECK_EQUAL(0, data.count());
@@ -271,10 +271,10 @@ namespace
     {
       const wchar_t* s = nullptr;
 
-      etl::bitset<60, int64_t> data(s);
+      etl::bitset<60, uint64_t> data(s);
 
       CHECK_EQUAL(60, data.size());
-      CHECK_EQUAL(0, data.count());
+      CHECK_EQUAL(0,  data.count());
     }
 
     //*************************************************************************
@@ -282,10 +282,10 @@ namespace
     {
       const char16_t* s = nullptr;
 
-      etl::bitset<60, int64_t> data(s);
+      etl::bitset<60, uint64_t> data(s);
 
       CHECK_EQUAL(60, data.size());
-      CHECK_EQUAL(0, data.count());
+      CHECK_EQUAL(0,  data.count());
     }
 
     //*************************************************************************
@@ -293,17 +293,17 @@ namespace
     {
       const char32_t* s = nullptr;
 
-      etl::bitset<60, int64_t> data(s);
+      etl::bitset<60, uint64_t> data(s);
 
       CHECK_EQUAL(60, data.size());
-      CHECK_EQUAL(0, data.count());
+      CHECK_EQUAL(0,  data.count());
     }
 
     //*************************************************************************
     TEST(test_construct_from_excess_string)
     {
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001111100001");
-      etl::bitset<64, int64_t> data("110001001000110100010101100111001100010010001101000101011001111100001");
+      etl::bitset<64, uint64_t> data("110001001000110100010101100111001100010010001101000101011001111100001");
 
       CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -320,9 +320,9 @@ namespace
     }
 
     //*************************************************************************
-    ETL_CONSTEXPR14 etl::bitset<64, int64_t> test_set_helper()
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_set_helper()
     {
-      etl::bitset<64, int64_t> data;
+      etl::bitset<64, uint64_t> data;
       data.set();
 
       return data;
@@ -331,7 +331,7 @@ namespace
     TEST(test_set)
     {
       std::bitset<64> compare;
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data(test_set_helper());
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(test_set_helper());
 
       compare.set();
 
@@ -357,7 +357,7 @@ namespace
     TEST(test_set_with_char_string)
     {
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<64, int64_t> data;
+      etl::bitset<64, uint64_t> data;
 
       data.set("110001001000110100010101100111001100010010001101000101011001");
 
@@ -377,15 +377,15 @@ namespace
     TEST(test_set_with_wchar_t_string)
     {
       std::bitset<64> compare(L"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<64, int64_t> data;
+      etl::bitset<64, uint64_t> data;
 
       data.set(L"110001001000110100010101100111001100010010001101000101011001");
 
-      CHECK_EQUAL(compare.size(), data.size());
+      CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(), data.none());
-      CHECK_EQUAL(compare.any(), data.any());
-      CHECK_EQUAL(compare.all(), data.all());
+      CHECK_EQUAL(compare.none(),  data.none());
+      CHECK_EQUAL(compare.any(),   data.any());
+      CHECK_EQUAL(compare.all(),   data.all());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -397,15 +397,15 @@ namespace
     TEST(test_set_with_char16_t_string)
     {
       std::bitset<64> compare(u"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<64, int64_t> data;
+      etl::bitset<64, uint64_t> data;
 
       data.set(u"110001001000110100010101100111001100010010001101000101011001");
 
-      CHECK_EQUAL(compare.size(), data.size());
+      CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(), data.none());
-      CHECK_EQUAL(compare.any(), data.any());
-      CHECK_EQUAL(compare.all(), data.all());
+      CHECK_EQUAL(compare.none(),  data.none());
+      CHECK_EQUAL(compare.any(),   data.any());
+      CHECK_EQUAL(compare.all(),   data.all());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -417,15 +417,15 @@ namespace
     TEST(test_set_with_char32_t_string)
     {
       std::bitset<64> compare(U"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<64, int64_t> data;
+      etl::bitset<64, uint64_t> data;
 
       data.set(U"110001001000110100010101100111001100010010001101000101011001");
 
-      CHECK_EQUAL(compare.size(), data.size());
+      CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(), data.none());
-      CHECK_EQUAL(compare.any(), data.any());
-      CHECK_EQUAL(compare.all(), data.all());
+      CHECK_EQUAL(compare.none(),  data.none());
+      CHECK_EQUAL(compare.any(),   data.any());
+      CHECK_EQUAL(compare.all(),   data.all());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -438,11 +438,11 @@ namespace
     {
       const char* s = nullptr;
 
-      etl::bitset<60, int64_t> data;
+      etl::bitset<60, uint64_t> data;
       data.set(s);
 
       CHECK_EQUAL(60, data.size());
-      CHECK_EQUAL(0, data.count());
+      CHECK_EQUAL(0,  data.count());
     }
 
     //*************************************************************************
@@ -450,11 +450,11 @@ namespace
     {
       const wchar_t* s = nullptr;
 
-      etl::bitset<60, int64_t> data;
+      etl::bitset<60, uint64_t> data;
       data.set(s);
 
       CHECK_EQUAL(60, data.size());
-      CHECK_EQUAL(0, data.count());
+      CHECK_EQUAL(0,  data.count());
     }
 
     //*************************************************************************
@@ -462,11 +462,11 @@ namespace
     {
       const char16_t* s = nullptr;
 
-      etl::bitset<60, int64_t> data;
+      etl::bitset<60, uint64_t> data;
       data.set(s);
 
       CHECK_EQUAL(60, data.size());
-      CHECK_EQUAL(0, data.count());
+      CHECK_EQUAL(0,  data.count());
     }
 
     //*************************************************************************
@@ -474,26 +474,26 @@ namespace
     {
       const char32_t* s = nullptr;
 
-      etl::bitset<60, int64_t> data;
+      etl::bitset<60, uint64_t> data;
       data.set(s);
 
       CHECK_EQUAL(60, data.size());
-      CHECK_EQUAL(0, data.count());
+      CHECK_EQUAL(0,  data.count());
     }
 
     //*************************************************************************
     TEST(test_from_string_with_char)
     {
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<64, int64_t> data;
+      etl::bitset<64, uint64_t> data;
 
       data.from_string("110001001000110100010101100111001100010010001101000101011001");
 
-      CHECK_EQUAL(compare.size(), data.size());
+      CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(), data.none());
-      CHECK_EQUAL(compare.any(), data.any());
-      CHECK_EQUAL(compare.all(), data.all());
+      CHECK_EQUAL(compare.none(),  data.none());
+      CHECK_EQUAL(compare.any(),   data.any());
+      CHECK_EQUAL(compare.all(),   data.all());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -505,15 +505,15 @@ namespace
     TEST(test_from_string_with_wchar_t)
     {
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<64, int64_t> data;
+      etl::bitset<64, uint64_t> data;
 
       data.from_string(L"110001001000110100010101100111001100010010001101000101011001");
 
-      CHECK_EQUAL(compare.size(), data.size());
+      CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(), data.none());
-      CHECK_EQUAL(compare.any(), data.any());
-      CHECK_EQUAL(compare.all(), data.all());
+      CHECK_EQUAL(compare.none(),  data.none());
+      CHECK_EQUAL(compare.any(),   data.any());
+      CHECK_EQUAL(compare.all(),   data.all());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -525,15 +525,15 @@ namespace
     TEST(test_from_char16_t_6string)
     {
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<64, int64_t> data;
+      etl::bitset<64, uint64_t> data;
 
       data.from_string(u"110001001000110100010101100111001100010010001101000101011001");
 
-      CHECK_EQUAL(compare.size(), data.size());
+      CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(), data.none());
-      CHECK_EQUAL(compare.any(), data.any());
-      CHECK_EQUAL(compare.all(), data.all());
+      CHECK_EQUAL(compare.none(),  data.none());
+      CHECK_EQUAL(compare.any(),   data.any());
+      CHECK_EQUAL(compare.all(),   data.all());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -545,15 +545,15 @@ namespace
     TEST(test_from_string_with_char32_t)
     {
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<64, int64_t> data;
+      etl::bitset<64, uint64_t> data;
 
       data.from_string(U"110001001000110100010101100111001100010010001101000101011001");
 
-      CHECK_EQUAL(compare.size(), data.size());
+      CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(), data.none());
-      CHECK_EQUAL(compare.any(), data.any());
-      CHECK_EQUAL(compare.all(), data.all());
+      CHECK_EQUAL(compare.none(),  data.none());
+      CHECK_EQUAL(compare.any(),   data.any());
+      CHECK_EQUAL(compare.all(),   data.all());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -566,11 +566,11 @@ namespace
     {
       const char* s = nullptr;
 
-      etl::bitset<60, int64_t> data;
+      etl::bitset<60, uint64_t> data;
       data.from_string(s);
 
       CHECK_EQUAL(60, data.size());
-      CHECK_EQUAL(0, data.count());
+      CHECK_EQUAL(0,  data.count());
     }
 
     //*************************************************************************
@@ -578,11 +578,11 @@ namespace
     {
       const wchar_t* s = nullptr;
 
-      etl::bitset<60, int64_t> data;
+      etl::bitset<60, uint64_t> data;
       data.from_string(s);
 
       CHECK_EQUAL(60, data.size());
-      CHECK_EQUAL(0, data.count());
+      CHECK_EQUAL(0,  data.count());
     }
 
     //*************************************************************************
@@ -590,11 +590,11 @@ namespace
     {
       const char16_t* s = nullptr;
 
-      etl::bitset<60, int64_t> data;
+      etl::bitset<60, uint64_t> data;
       data.from_string(s);
 
       CHECK_EQUAL(60, data.size());
-      CHECK_EQUAL(0, data.count());
+      CHECK_EQUAL(0,  data.count());
     }
 
     //*************************************************************************
@@ -602,11 +602,11 @@ namespace
     {
       const char32_t* s = nullptr;
 
-      etl::bitset<60, int64_t> data;
+      etl::bitset<60, uint64_t> data;
       data.from_string(s);
 
       CHECK_EQUAL(60, data.size());
-      CHECK_EQUAL(0, data.count());
+      CHECK_EQUAL(0,  data.count());
     }
 
     //*************************************************************************
@@ -721,7 +721,7 @@ namespace
     TEST(test_value_u64_min)
     {
       ETL_CONSTEXPR14 etl::bitset<64> data((unsigned long long)etl::integral_limits<int64_t>::min);
-      ETL_CONSTEXPR14 int64_t value = data.value<int64_t>();
+      ETL_CONSTEXPR14 uint64_t value = data.value<int64_t>();
 
       CHECK_EQUAL(std::numeric_limits<int64_t>::min(), value);
     }
@@ -730,7 +730,7 @@ namespace
     TEST(test_value_u64_max)
     {
       ETL_CONSTEXPR14 etl::bitset<64> data((unsigned long long)etl::integral_limits<int64_t>::max);
-      ETL_CONSTEXPR14 int64_t value = data.value<int64_t>();
+      ETL_CONSTEXPR14 uint64_t value = data.value<int64_t>();
 
       CHECK_EQUAL(std::numeric_limits<int64_t>::max(), value);
     }
@@ -739,7 +739,7 @@ namespace
     TEST(test_value_s64_min)
     {
       ETL_CONSTEXPR14 etl::bitset<64> data((unsigned long long)etl::integral_limits<int64_t>::min);
-      ETL_CONSTEXPR14 int64_t value = data.value<int64_t>();
+      ETL_CONSTEXPR14 uint64_t value = data.value<int64_t>();
 
       CHECK_EQUAL(std::numeric_limits<int64_t>::min(), value);
     }
@@ -748,7 +748,7 @@ namespace
     TEST(test_value_s64_max)
     {
       ETL_CONSTEXPR14 etl::bitset<64> data((unsigned long long)etl::integral_limits<int64_t>::max);
-      ETL_CONSTEXPR14 int64_t value = data.value<int64_t>();
+      ETL_CONSTEXPR14 uint64_t value = data.value<int64_t>();
 
       CHECK_EQUAL(std::numeric_limits<int64_t>::max(), value);
     }
@@ -757,7 +757,7 @@ namespace
     TEST(test_position_set)
     {
       std::bitset<64> compare;
-      etl::bitset<64, int64_t> data;
+      etl::bitset<64, uint64_t> data;
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -786,9 +786,9 @@ namespace
     }
 
     //*************************************************************************
-    ETL_CONSTEXPR14 etl::bitset<64, int64_t> test_reset_helper()
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_reset_helper()
     {
-      etl::bitset<64, int64_t> data(0xFFFFFFFFFFFFFFFULL);
+      etl::bitset<64, uint64_t> data(0xFFFFFFFFFFFFFFFULL);
       data.reset();
 
       return data;
@@ -797,7 +797,7 @@ namespace
     TEST(test_reset)
     {
       std::bitset<64> compare(0xFFFFFFFFFFFFFFFULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data(test_reset_helper());
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(test_reset_helper());
 
       compare.reset();
       
@@ -814,9 +814,9 @@ namespace
     }
 
     //*************************************************************************
-    ETL_CONSTEXPR14 etl::bitset<64, int64_t> test_position_reset_helper()
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_position_reset_helper()
     {
-      etl::bitset<64, int64_t> data(0xFFFFFFFFFFFFFFFULL);
+      etl::bitset<64, uint64_t> data(0xFFFFFFFFFFFFFFFULL);
       data.reset(1);
       data.reset(3);
       data.reset(7);
@@ -828,7 +828,7 @@ namespace
     TEST(test_position_reset)
     {
       std::bitset<64> compare(0xFFFFFFFFFFFFFFFULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data(test_position_reset_helper());
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(test_position_reset_helper());
 
       compare.reset(1);
       compare.reset(3);
@@ -875,7 +875,7 @@ namespace
     TEST(test_index_operator_read)
     {
       ETL_CONSTEXPR14 std::bitset<64> compare(0x3123456731234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data(0x3123456731234567ULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(0x3123456731234567ULL);
 
       ETL_CONSTEXPR14 bool bc0 = compare[1U];
       ETL_CONSTEXPR14 bool bd0 = data[1U];
@@ -895,9 +895,9 @@ namespace
     }
 
     //*************************************************************************
-    ETL_CONSTEXPR14 etl::bitset<64, int64_t> test_index_operator_write_helper()
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_index_operator_write_helper()
     {
-      etl::bitset<64, int64_t> data;
+      etl::bitset<64, uint64_t> data;
 
       data[1U]  = true;
       data[3U]  = true;
@@ -909,7 +909,7 @@ namespace
 
     TEST(test_index_operator_write)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data(test_index_operator_write_helper());
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(test_index_operator_write_helper());
 
       CHECK(data[1U]);
       CHECK(data[3U]);
@@ -920,10 +920,10 @@ namespace
     //*************************************************************************
     TEST(test_any)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data1(ull(0x0000000000000000));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data2(ull(0x0000010000000000));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data3(ull(0x1000010001000100));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data4(ull(0xFFFFFFFFFFFFFFFF));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(ull(0x0000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF));
 
       ETL_CONSTEXPR14 bool bd1 = data1.any();
       ETL_CONSTEXPR14 bool bd2 = data2.any();
@@ -939,10 +939,10 @@ namespace
     //*************************************************************************
     TEST(test_any_with_mask)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data1(ull(0xF000000000000000));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data2(ull(0x0000010000000000));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data3(ull(0x1000010001000100));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data4(ull(0xFFFFFFFFFFFFFFFF));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(ull(0xF000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF));
 
       ETL_CONSTEXPR14 ull mask = ull(0x0FFFFFFFFFFFFFFF);
 
@@ -960,10 +960,10 @@ namespace
     //*************************************************************************
     TEST(test_none)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data1(ull(0x0000000000000000));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data2(ull(0x0000010000000000));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data3(ull(0x1000010001000100));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data4(ull(0xFFFFFFFFFFFFFFFF));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(ull(0x0000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF));
 
       ETL_CONSTEXPR14 bool bd1 = data1.none();
       ETL_CONSTEXPR14 bool bd2 = data2.none();
@@ -979,10 +979,10 @@ namespace
     //*************************************************************************
     TEST(test_none_with_mask)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data1(ull(0xF000000000000000));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data2(ull(0x0000010000000000));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data3(ull(0x1000010001000100));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data4(ull(0xFFFFFFFFFFFFFFFF));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(ull(0xF000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF));
 
       ETL_CONSTEXPR14 ull mask = ull(0x0FFFFFFFFFFFFFFF);
 
@@ -1000,10 +1000,10 @@ namespace
     //*************************************************************************
     TEST(test_all)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data1(ull(0x0000000000000000));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data2(ull(0x0000010000000000));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data3(ull(0x1000010001000100));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data4(ull(0xFFFFFFFFFFFFFFFF));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(ull(0x0000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF));
 
       ETL_CONSTEXPR14 bool bd1 = data1.all();
       ETL_CONSTEXPR14 bool bd2 = data2.all();
@@ -1019,10 +1019,10 @@ namespace
     //*************************************************************************
     TEST(test_all_with_mask)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data1(ull(0x0000000000000000));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data2(ull(0x0000010000000000));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data3(ull(0x1000010001000100));
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data4(ull(0x0FFFFFFFFFFFFFFF));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(ull(0x0000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data4(ull(0x0FFFFFFFFFFFFFFF));
 
       ETL_CONSTEXPR14 ull mask = ull(0x0FFFFFFFFFFFFFFF);
 
@@ -1038,9 +1038,129 @@ namespace
     }
 
     //*************************************************************************
-    ETL_CONSTEXPR14 etl::bitset<64, int64_t> test_flip_helper()
+    TEST(test_any_with_reduced_active_bits)
     {
-      etl::bitset<64, int64_t> data;
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data1(ull(0x0000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF));
+
+      ETL_CONSTEXPR14 bool bd1 = data1.any();
+      ETL_CONSTEXPR14 bool bd2 = data2.any();
+      ETL_CONSTEXPR14 bool bd3 = data3.any();
+      ETL_CONSTEXPR14 bool bd4 = data4.any();
+
+      CHECK_FALSE(bd1);
+      CHECK_TRUE(bd2);
+      CHECK_TRUE(bd3);
+      CHECK_TRUE(bd4);
+    }
+
+    //*************************************************************************
+    TEST(test_any_with_mask_with_reduced_active_bits)
+    {
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data1(ull(0xF000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF));
+
+      ETL_CONSTEXPR14 ull mask = ull(0x0FFFFFFFFFFFFFFF);
+
+      ETL_CONSTEXPR14 bool bd1 = data1.any(mask);
+      ETL_CONSTEXPR14 bool bd2 = data2.any(mask);
+      ETL_CONSTEXPR14 bool bd3 = data3.any(mask);
+      ETL_CONSTEXPR14 bool bd4 = data4.any(mask);
+
+      CHECK_FALSE(bd1);
+      CHECK_TRUE(bd2);
+      CHECK_TRUE(bd3);
+      CHECK_TRUE(bd4);
+    }
+
+    //*************************************************************************
+    TEST(test_none_with_reduced_active_bits)
+    {
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data1(ull(0x0000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF));
+
+      ETL_CONSTEXPR14 bool bd1 = data1.none();
+      ETL_CONSTEXPR14 bool bd2 = data2.none();
+      ETL_CONSTEXPR14 bool bd3 = data3.none();
+      ETL_CONSTEXPR14 bool bd4 = data4.none();
+
+      CHECK_TRUE(bd1);
+      CHECK_FALSE(bd2);
+      CHECK_FALSE(bd3);
+      CHECK_FALSE(bd4);
+    }
+
+    //*************************************************************************
+    TEST(test_none_with_mask_with_reduced_active_bits)
+    {
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data1(ull(0xF000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF));
+
+      ETL_CONSTEXPR14 ull mask = ull(0x0FFFFFFFFFFFFFFF);
+
+      ETL_CONSTEXPR14 bool bd1 = data1.none(mask);
+      ETL_CONSTEXPR14 bool bd2 = data2.none(mask);
+      ETL_CONSTEXPR14 bool bd3 = data3.none(mask);
+      ETL_CONSTEXPR14 bool bd4 = data4.none(mask);
+
+      CHECK_TRUE(bd1);
+      CHECK_FALSE(bd2);
+      CHECK_FALSE(bd3);
+      CHECK_FALSE(bd4);
+    }
+
+    //*************************************************************************
+    TEST(test_all_with_reduced_active_bits)
+    {
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data1(ull(0x0000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF));
+
+      ETL_CONSTEXPR14 bool bd1 = data1.all();
+      ETL_CONSTEXPR14 bool bd2 = data2.all();
+      ETL_CONSTEXPR14 bool bd3 = data3.all();
+      ETL_CONSTEXPR14 bool bd4 = data4.all();
+
+      CHECK_FALSE(bd1);
+      CHECK_FALSE(bd2);
+      CHECK_FALSE(bd3);
+      CHECK_TRUE(bd4);
+    }
+
+    //*************************************************************************
+    TEST(test_all_with_mask_with_reduced_active_bits)
+    {
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data1(ull(0x0000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<60, uint64_t> data4(ull(0x0FFFFFFFFFFFFFFF));
+
+      ETL_CONSTEXPR14 ull mask = ull(0x00FFFFFFFFFFFFFF);
+
+      ETL_CONSTEXPR14 bool bd1 = data1.all(mask);
+      ETL_CONSTEXPR14 bool bd2 = data2.all(mask);
+      ETL_CONSTEXPR14 bool bd3 = data3.all(mask);
+      ETL_CONSTEXPR14 bool bd4 = data4.all(mask);
+
+      CHECK_FALSE(bd1);
+      CHECK_FALSE(bd2);
+      CHECK_FALSE(bd3);
+      CHECK_TRUE(bd4);
+    }
+
+    //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_flip_helper()
+    {
+      etl::bitset<64, uint64_t> data;
       data.flip();
 
       return data;
@@ -1049,7 +1169,7 @@ namespace
     TEST(test_flip)
     {
       std::bitset<64> compare;
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data(test_flip_helper());
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(test_flip_helper());
 
       compare.flip();
 
@@ -1060,9 +1180,9 @@ namespace
     }
 
     //*************************************************************************
-    ETL_CONSTEXPR14 etl::bitset<64, int64_t> test_flip_position_helper()
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_flip_position_helper()
     {
-      etl::bitset<64, int64_t> data;
+      etl::bitset<64, uint64_t> data;
       data.flip(1);
       data.flip(3);
       data.flip(7);
@@ -1074,7 +1194,7 @@ namespace
     TEST(test_flip_position)
     {
       std::bitset<64> compare;
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data(test_flip_position_helper());
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(test_flip_position_helper());
 
       compare.flip(1);
       compare.flip(3);
@@ -1088,9 +1208,9 @@ namespace
     }
 
     //*************************************************************************
-    ETL_CONSTEXPR14 etl::bitset<64, int64_t> test_flip_reference_helper()
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_flip_reference_helper()
     {
-      etl::bitset<64, int64_t> data;
+      etl::bitset<64, uint64_t> data;
       data[1].flip();
       data[3].flip();
       data[7].flip();
@@ -1102,7 +1222,7 @@ namespace
     TEST(test_flip_reference)
     {
       std::bitset<64> compare;
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data(test_flip_reference_helper());
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(test_flip_reference_helper());
 
       compare[1].flip();
       compare[3].flip();
@@ -1119,7 +1239,7 @@ namespace
     TEST(test_invert_reference)
     {
       std::bitset<64> compare;
-      etl::bitset<64, int64_t> data;
+      etl::bitset<64, uint64_t> data;
 
       bool bc = ~compare[3];
       bool bd = ~data[3];
@@ -1127,7 +1247,7 @@ namespace
     }
 
     //*************************************************************************
-    ETL_CONSTEXPR14 etl::bitset<64, int64_t> test_assignment_operator_helper(etl::bitset<64, int64_t> to, const etl::bitset<64, int64_t>& from)
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_assignment_operator_helper(etl::bitset<64, uint64_t> to, const etl::bitset<64, uint64_t>& from)
     {
       to = from;
 
@@ -1137,8 +1257,8 @@ namespace
     TEST(test_assignment_operator)
     {
       ETL_CONSTEXPR14 std::bitset<64> compare(0xFFFFFFFFFFFFFFFULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data1(0xFFFFFFFFFFFFFFFULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data2(test_assignment_operator_helper(etl::bitset<64, int64_t>(), data1));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(0xFFFFFFFFFFFFFFFULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(test_assignment_operator_helper(etl::bitset<64, uint64_t>(), data1));
 
       for (size_t i = 0UL; i < data2.size(); ++i)
       {
@@ -1149,9 +1269,9 @@ namespace
     //*************************************************************************
     TEST(test_equality_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data1(0x123456781234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data2(0x123456781234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data3;
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(0x123456781234567ULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(0x123456781234567ULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data3;
 
       ETL_CONSTEXPR14 bool equal     =  (data1 == data2);
       ETL_CONSTEXPR14 bool not_equal = !(data1 == data3);
@@ -1163,9 +1283,9 @@ namespace
     //*************************************************************************
     TEST(test_inequality_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data1(0x123456781234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data2(0x123456781234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data3;
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(0x123456781234567ULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(0x123456781234567ULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data3;
 
       ETL_CONSTEXPR14 bool equal = !(data1 != data2);
       ETL_CONSTEXPR14 bool not_equal = (data1 != data3);
@@ -1177,38 +1297,38 @@ namespace
     //*************************************************************************
     TEST(test_shift_left_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> shift1(0x2468ACF0ULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> shift2(0x48D159E0ULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> shift11(0x91A2B3C000ULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> shift1(0x2468ACF0ULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> shift2(0x48D159E0ULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> shift11(0x91A2B3C000ULL);
 
-      CHECK((generate_shift_left_bitset<64, int64_t>(0x12345678ULL, 1U)) == shift1);
-      CHECK((generate_shift_left_bitset<64, int64_t>(0x12345678ULL, 2U)) == shift2);
-      CHECK((generate_shift_left_bitset<64, int64_t>(0x12345678ULL, 11U)) == shift11);
+      CHECK((generate_shift_left_bitset<64, uint64_t>(0x12345678ULL, 1U)) == shift1);
+      CHECK((generate_shift_left_bitset<64, uint64_t>(0x12345678ULL, 2U)) == shift2);
+      CHECK((generate_shift_left_bitset<64, uint64_t>(0x12345678ULL, 11U)) == shift11);
     }
 
     //*************************************************************************
     TEST(test_shift_left_operator_overflow)
     {
-      ETL_CONSTEXPR14 etl::bitset<32, int32_t> data(generate_shift_left_bitset<32, int32_t>(0x7FFFFFFFULL, 1U));
-      ETL_CONSTEXPR14 etl::bitset<32, int32_t> shifted(0xFFFFFFFEUL);
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> data(generate_shift_left_bitset<32, uint32_t>(0x7FFFFFFFULL, 1U));
+      ETL_CONSTEXPR14 etl::bitset<32, uint32_t> shifted(0xFFFFFFFEUL);
 
-      CHECK_EQUAL_HEX(shifted.value<int32_t>(), data.value<int32_t>());
+      CHECK_EQUAL_HEX(shifted.value<uint32_t>(), data.value<uint32_t>());
     }
 
     //*************************************************************************
     TEST(test_shift_left_copy_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> shift8(0x1234567800ULL);
-      CHECK_EQUAL_HEX(shift8.value<int64_t>(), (generate_shift_left_bitset_copy<64, int64_t>(0x12345678UL, 8U).value<int64_t>()));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> shift8(0x1234567800ULL);
+      CHECK_EQUAL_HEX(shift8.value<int64_t>(), (generate_shift_left_bitset_copy<64, uint64_t>(0x12345678UL, 8U).value<int64_t>()));
 
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> shift16(0x123456780000ULL);
-      CHECK_EQUAL_HEX(shift16.value<int64_t>(), (generate_shift_left_bitset_copy<64, int64_t>(0x12345678UL, 16U).value<int64_t>()));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> shift16(0x123456780000ULL);
+      CHECK_EQUAL_HEX(shift16.value<int64_t>(), (generate_shift_left_bitset_copy<64, uint64_t>(0x12345678UL, 16U).value<int64_t>()));
 
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> shift24(0x12345678000000ULL);
-      CHECK_EQUAL_HEX(shift24.value<int64_t>(), (generate_shift_left_bitset_copy<64, int64_t>(0x12345678UL, 24U).value<int64_t>()));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> shift24(0x12345678000000ULL);
+      CHECK_EQUAL_HEX(shift24.value<int64_t>(), (generate_shift_left_bitset_copy<64, uint64_t>(0x12345678UL, 24U).value<int64_t>()));
 
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> shift64(0x0000000000000000ULL);
-      CHECK_EQUAL_HEX(shift64.value<int64_t>(), (generate_shift_left_bitset_copy<64, int64_t>(0x12345678UL, 64U).value<int64_t>()));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> shift64(0x0000000000000000ULL);
+      CHECK_EQUAL_HEX(shift64.value<int64_t>(), (generate_shift_left_bitset_copy<64, uint64_t>(0x12345678UL, 64U).value<int64_t>()));
     }
 
     //*************************************************************************
@@ -1286,189 +1406,189 @@ namespace
     //*************************************************************************
     TEST(test_shift_right_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> shift1(0x91A2B3CULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> shift2(0x48D159EULL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> shift11(0x2468AULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> shift1(0x91A2B3CULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> shift2(0x48D159EULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> shift11(0x2468AULL);
 
-      CHECK_EQUAL_HEX(shift1.value<int64_t>(),  (generate_shift_right_bitset<64, int64_t>(0x12345678ULL, 1U).value<int64_t>()));
-      CHECK_EQUAL_HEX(shift2.value<int64_t>(),  (generate_shift_right_bitset<64, int64_t>(0x12345678ULL, 2U).value<int64_t>()));
-      CHECK_EQUAL_HEX(shift11.value<int64_t>(), (generate_shift_right_bitset<64, int64_t>(0x12345678ULL, 11U).value<int64_t>()));
+      CHECK_EQUAL_HEX(shift1.value<int64_t>(),  (generate_shift_right_bitset<64, uint64_t>(0x12345678ULL, 1U).value<int64_t>()));
+      CHECK_EQUAL_HEX(shift2.value<int64_t>(),  (generate_shift_right_bitset<64, uint64_t>(0x12345678ULL, 2U).value<int64_t>()));
+      CHECK_EQUAL_HEX(shift11.value<int64_t>(), (generate_shift_right_bitset<64, uint64_t>(0x12345678ULL, 11U).value<int64_t>()));
     }
 
     //*************************************************************************
     TEST(test_shift_right_copy_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> shift8(0x123456ULL);
-      CHECK_EQUAL_HEX(shift8.value<int64_t>(), (generate_shift_right_bitset_copy<64, int64_t>(0x12345678UL, 8U).value<int64_t>()));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> shift8(0x123456ULL);
+      CHECK_EQUAL_HEX(shift8.value<int64_t>(), (generate_shift_right_bitset_copy<64, uint64_t>(0x12345678UL, 8U).value<int64_t>()));
 
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> shift16(0x1234ULL);
-      CHECK_EQUAL_HEX(shift16.value<int64_t>(), (generate_shift_right_bitset_copy<64, int64_t>(0x12345678UL, 16U).value<int64_t>()));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> shift16(0x1234ULL);
+      CHECK_EQUAL_HEX(shift16.value<int64_t>(), (generate_shift_right_bitset_copy<64, uint64_t>(0x12345678UL, 16U).value<int64_t>()));
 
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> shift24(0x12ULL);
-      CHECK_EQUAL_HEX(shift24.value<int64_t>(), (generate_shift_right_bitset_copy<64, int64_t>(0x12345678UL, 24U).value<int64_t>()));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> shift24(0x12ULL);
+      CHECK_EQUAL_HEX(shift24.value<int64_t>(), (generate_shift_right_bitset_copy<64, uint64_t>(0x12345678UL, 24U).value<int64_t>()));
 
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> shift60(0x00ULL);
-      CHECK_EQUAL_HEX(shift60.value<int64_t>(), (generate_shift_right_bitset_copy<64, int64_t>(0x12345678UL, 60U).value<int64_t>()));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> shift60(0x00ULL);
+      CHECK_EQUAL_HEX(shift60.value<int64_t>(), (generate_shift_right_bitset_copy<64, uint64_t>(0x12345678UL, 60U).value<int64_t>()));
     }
 
     //*************************************************************************
     TEST(test_shift_right_operator_all_shifts_full_size)
     {
-      int64_t value = 0x0123456789ABCDEFULL;
+      uint64_t value = 0x0123456789ABCDEFULL;
 
-      CHECK_EQUAL_HEX((value >> 0U), (generate_shift_right_bitset<64, int64_t>(value, 0U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 1U), (generate_shift_right_bitset<64, int64_t>(value, 1U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 2U), (generate_shift_right_bitset<64, int64_t>(value, 2U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 3U), (generate_shift_right_bitset<64, int64_t>(value, 3U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 4U), (generate_shift_right_bitset<64, int64_t>(value, 4U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 5U), (generate_shift_right_bitset<64, int64_t>(value, 5U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 6U), (generate_shift_right_bitset<64, int64_t>(value, 6U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 7U), (generate_shift_right_bitset<64, int64_t>(value, 7U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 8U), (generate_shift_right_bitset<64, int64_t>(value, 8U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 9U), (generate_shift_right_bitset<64, int64_t>(value, 9U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 10U), (generate_shift_right_bitset<64, int64_t>(value, 10U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 11U), (generate_shift_right_bitset<64, int64_t>(value, 11U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 12U), (generate_shift_right_bitset<64, int64_t>(value, 12U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 13U), (generate_shift_right_bitset<64, int64_t>(value, 13U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 14U), (generate_shift_right_bitset<64, int64_t>(value, 14U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 15U), (generate_shift_right_bitset<64, int64_t>(value, 15U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 16U), (generate_shift_right_bitset<64, int64_t>(value, 16U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 17U), (generate_shift_right_bitset<64, int64_t>(value, 17U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 18U), (generate_shift_right_bitset<64, int64_t>(value, 18U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 19U), (generate_shift_right_bitset<64, int64_t>(value, 19U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 20U), (generate_shift_right_bitset<64, int64_t>(value, 20U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 21U), (generate_shift_right_bitset<64, int64_t>(value, 21U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 22U), (generate_shift_right_bitset<64, int64_t>(value, 22U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 23U), (generate_shift_right_bitset<64, int64_t>(value, 23U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 24U), (generate_shift_right_bitset<64, int64_t>(value, 24U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 25U), (generate_shift_right_bitset<64, int64_t>(value, 25U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 26U), (generate_shift_right_bitset<64, int64_t>(value, 26U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 27U), (generate_shift_right_bitset<64, int64_t>(value, 27U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 28U), (generate_shift_right_bitset<64, int64_t>(value, 28U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 29U), (generate_shift_right_bitset<64, int64_t>(value, 29U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 30U), (generate_shift_right_bitset<64, int64_t>(value, 30U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 31U), (generate_shift_right_bitset<64, int64_t>(value, 31U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 32U), (generate_shift_right_bitset<64, int64_t>(value, 32U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 33U), (generate_shift_right_bitset<64, int64_t>(value, 33U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 34U), (generate_shift_right_bitset<64, int64_t>(value, 34U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 35U), (generate_shift_right_bitset<64, int64_t>(value, 35U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 36U), (generate_shift_right_bitset<64, int64_t>(value, 36U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 37U), (generate_shift_right_bitset<64, int64_t>(value, 37U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 38U), (generate_shift_right_bitset<64, int64_t>(value, 38U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 39U), (generate_shift_right_bitset<64, int64_t>(value, 39U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 40U), (generate_shift_right_bitset<64, int64_t>(value, 40U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 41U), (generate_shift_right_bitset<64, int64_t>(value, 41U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 42U), (generate_shift_right_bitset<64, int64_t>(value, 42U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 43U), (generate_shift_right_bitset<64, int64_t>(value, 43U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 44U), (generate_shift_right_bitset<64, int64_t>(value, 44U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 45U), (generate_shift_right_bitset<64, int64_t>(value, 45U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 46U), (generate_shift_right_bitset<64, int64_t>(value, 46U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 47U), (generate_shift_right_bitset<64, int64_t>(value, 47U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 48U), (generate_shift_right_bitset<64, int64_t>(value, 48U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 49U), (generate_shift_right_bitset<64, int64_t>(value, 49U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 50U), (generate_shift_right_bitset<64, int64_t>(value, 50U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 51U), (generate_shift_right_bitset<64, int64_t>(value, 51U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 52U), (generate_shift_right_bitset<64, int64_t>(value, 52U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 53U), (generate_shift_right_bitset<64, int64_t>(value, 53U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 54U), (generate_shift_right_bitset<64, int64_t>(value, 54U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 55U), (generate_shift_right_bitset<64, int64_t>(value, 55U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 56U), (generate_shift_right_bitset<64, int64_t>(value, 56U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 57U), (generate_shift_right_bitset<64, int64_t>(value, 57U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 58U), (generate_shift_right_bitset<64, int64_t>(value, 58U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 59U), (generate_shift_right_bitset<64, int64_t>(value, 59U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 60U), (generate_shift_right_bitset<64, int64_t>(value, 60U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 61U), (generate_shift_right_bitset<64, int64_t>(value, 61U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 62U), (generate_shift_right_bitset<64, int64_t>(value, 62U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 63U), (generate_shift_right_bitset<64, int64_t>(value, 63U).value<int64_t>()));
-      CHECK_EQUAL_HEX(0ULL, (generate_shift_right_bitset<64, int64_t>(value, 64U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 0U), (generate_shift_right_bitset<64, uint64_t>(value, 0U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 1U), (generate_shift_right_bitset<64, uint64_t>(value, 1U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 2U), (generate_shift_right_bitset<64, uint64_t>(value, 2U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 3U), (generate_shift_right_bitset<64, uint64_t>(value, 3U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 4U), (generate_shift_right_bitset<64, uint64_t>(value, 4U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 5U), (generate_shift_right_bitset<64, uint64_t>(value, 5U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 6U), (generate_shift_right_bitset<64, uint64_t>(value, 6U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 7U), (generate_shift_right_bitset<64, uint64_t>(value, 7U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 8U), (generate_shift_right_bitset<64, uint64_t>(value, 8U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 9U), (generate_shift_right_bitset<64, uint64_t>(value, 9U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 10U), (generate_shift_right_bitset<64, uint64_t>(value, 10U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 11U), (generate_shift_right_bitset<64, uint64_t>(value, 11U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 12U), (generate_shift_right_bitset<64, uint64_t>(value, 12U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 13U), (generate_shift_right_bitset<64, uint64_t>(value, 13U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 14U), (generate_shift_right_bitset<64, uint64_t>(value, 14U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 15U), (generate_shift_right_bitset<64, uint64_t>(value, 15U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 16U), (generate_shift_right_bitset<64, uint64_t>(value, 16U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 17U), (generate_shift_right_bitset<64, uint64_t>(value, 17U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 18U), (generate_shift_right_bitset<64, uint64_t>(value, 18U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 19U), (generate_shift_right_bitset<64, uint64_t>(value, 19U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 20U), (generate_shift_right_bitset<64, uint64_t>(value, 20U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 21U), (generate_shift_right_bitset<64, uint64_t>(value, 21U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 22U), (generate_shift_right_bitset<64, uint64_t>(value, 22U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 23U), (generate_shift_right_bitset<64, uint64_t>(value, 23U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 24U), (generate_shift_right_bitset<64, uint64_t>(value, 24U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 25U), (generate_shift_right_bitset<64, uint64_t>(value, 25U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 26U), (generate_shift_right_bitset<64, uint64_t>(value, 26U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 27U), (generate_shift_right_bitset<64, uint64_t>(value, 27U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 28U), (generate_shift_right_bitset<64, uint64_t>(value, 28U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 29U), (generate_shift_right_bitset<64, uint64_t>(value, 29U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 30U), (generate_shift_right_bitset<64, uint64_t>(value, 30U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 31U), (generate_shift_right_bitset<64, uint64_t>(value, 31U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 32U), (generate_shift_right_bitset<64, uint64_t>(value, 32U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 33U), (generate_shift_right_bitset<64, uint64_t>(value, 33U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 34U), (generate_shift_right_bitset<64, uint64_t>(value, 34U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 35U), (generate_shift_right_bitset<64, uint64_t>(value, 35U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 36U), (generate_shift_right_bitset<64, uint64_t>(value, 36U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 37U), (generate_shift_right_bitset<64, uint64_t>(value, 37U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 38U), (generate_shift_right_bitset<64, uint64_t>(value, 38U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 39U), (generate_shift_right_bitset<64, uint64_t>(value, 39U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 40U), (generate_shift_right_bitset<64, uint64_t>(value, 40U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 41U), (generate_shift_right_bitset<64, uint64_t>(value, 41U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 42U), (generate_shift_right_bitset<64, uint64_t>(value, 42U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 43U), (generate_shift_right_bitset<64, uint64_t>(value, 43U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 44U), (generate_shift_right_bitset<64, uint64_t>(value, 44U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 45U), (generate_shift_right_bitset<64, uint64_t>(value, 45U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 46U), (generate_shift_right_bitset<64, uint64_t>(value, 46U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 47U), (generate_shift_right_bitset<64, uint64_t>(value, 47U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 48U), (generate_shift_right_bitset<64, uint64_t>(value, 48U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 49U), (generate_shift_right_bitset<64, uint64_t>(value, 49U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 50U), (generate_shift_right_bitset<64, uint64_t>(value, 50U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 51U), (generate_shift_right_bitset<64, uint64_t>(value, 51U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 52U), (generate_shift_right_bitset<64, uint64_t>(value, 52U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 53U), (generate_shift_right_bitset<64, uint64_t>(value, 53U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 54U), (generate_shift_right_bitset<64, uint64_t>(value, 54U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 55U), (generate_shift_right_bitset<64, uint64_t>(value, 55U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 56U), (generate_shift_right_bitset<64, uint64_t>(value, 56U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 57U), (generate_shift_right_bitset<64, uint64_t>(value, 57U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 58U), (generate_shift_right_bitset<64, uint64_t>(value, 58U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 59U), (generate_shift_right_bitset<64, uint64_t>(value, 59U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 60U), (generate_shift_right_bitset<64, uint64_t>(value, 60U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 61U), (generate_shift_right_bitset<64, uint64_t>(value, 61U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 62U), (generate_shift_right_bitset<64, uint64_t>(value, 62U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 63U), (generate_shift_right_bitset<64, uint64_t>(value, 63U).value<int64_t>()));
+      CHECK_EQUAL_HEX(0ULL, (generate_shift_right_bitset<64, uint64_t>(value, 64U).value<int64_t>()));
     }
 
     //*************************************************************************
     TEST(test_shift_right_operator_all_shifts_partial_size)
     {
-      int64_t value = 0x0123456789ABCDEFULL;
-      int64_t mask  = 0x0FFFFFFFFFFFFFFFULL;
+      uint64_t value = 0x0123456789ABCDEFULL;
+      uint64_t mask  = 0x0FFFFFFFFFFFFFFFULL;
 
-      CHECK_EQUAL_HEX((value >> 0U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 0U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 1U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 1U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 2U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 2U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 3U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 3U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 4U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 4U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 5U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 5U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 6U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 6U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 7U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 7U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 8U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 8U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 9U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 9U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 10U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 10U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 11U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 11U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 12U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 12U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 13U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 13U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 14U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 14U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 15U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 15U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 16U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 16U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 17U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 17U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 18U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 18U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 19U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 19U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 20U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 20U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 21U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 21U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 22U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 22U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 23U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 23U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 24U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 24U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 25U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 25U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 26U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 26U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 27U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 27U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 28U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 28U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 29U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 29U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 30U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 30U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 31U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 31U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 32U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 32U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 33U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 33U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 34U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 34U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 35U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 35U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 36U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 36U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 37U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 37U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 38U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 38U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 39U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 39U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 40U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 40U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 41U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 41U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 42U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 42U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 43U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 43U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 44U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 44U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 45U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 45U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 46U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 46U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 47U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 47U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 48U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 48U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 49U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 49U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 50U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 50U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 51U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 51U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 52U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 52U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 53U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 53U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 54U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 54U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 55U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 55U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 56U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 56U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 57U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 57U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 58U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 58U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 59U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 59U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 60U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 60U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 61U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 61U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 62U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 62U).value<int64_t>()));
-      CHECK_EQUAL_HEX((value >> 63U) & mask, (generate_shift_right_bitset<64, int64_t>(value, 63U).value<int64_t>()));
-      CHECK_EQUAL_HEX(0ULL, (generate_shift_right_bitset<64, int64_t>(value, 64U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 0U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 0U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 1U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 1U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 2U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 2U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 3U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 3U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 4U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 4U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 5U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 5U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 6U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 6U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 7U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 7U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 8U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 8U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 9U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 9U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 10U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 10U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 11U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 11U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 12U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 12U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 13U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 13U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 14U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 14U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 15U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 15U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 16U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 16U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 17U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 17U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 18U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 18U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 19U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 19U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 20U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 20U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 21U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 21U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 22U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 22U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 23U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 23U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 24U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 24U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 25U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 25U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 26U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 26U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 27U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 27U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 28U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 28U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 29U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 29U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 30U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 30U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 31U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 31U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 32U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 32U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 33U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 33U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 34U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 34U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 35U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 35U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 36U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 36U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 37U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 37U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 38U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 38U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 39U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 39U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 40U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 40U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 41U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 41U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 42U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 42U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 43U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 43U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 44U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 44U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 45U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 45U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 46U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 46U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 47U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 47U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 48U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 48U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 49U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 49U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 50U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 50U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 51U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 51U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 52U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 52U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 53U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 53U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 54U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 54U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 55U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 55U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 56U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 56U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 57U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 57U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 58U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 58U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 59U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 59U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 60U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 60U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 61U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 61U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 62U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 62U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 63U) & mask, (generate_shift_right_bitset<64, uint64_t>(value, 63U).value<int64_t>()));
+      CHECK_EQUAL_HEX(0ULL, (generate_shift_right_bitset<64, uint64_t>(value, 64U).value<int64_t>()));
     }
 
     //*************************************************************************
     TEST(test_and_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data1(0x12345678UL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data2(0x23456789UL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data4(0x12345678UL & 0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(0x12345678UL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data4(0x12345678UL & 0x23456789UL);
 
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data3 = data1 & data2;
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data3 = data1 & data2;
       CHECK(data3 == data4);
     }
 
     //*************************************************************************
-    ETL_CONSTEXPR14 etl::bitset<64, int64_t> test_and_equals_operator_helper(etl::bitset<64, int64_t> data1, const etl::bitset<64, int64_t>& data2)
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_and_equals_operator_helper(etl::bitset<64, uint64_t> data1, const etl::bitset<64, uint64_t>& data2)
     {
       data1 &= data2;
 
@@ -1477,10 +1597,10 @@ namespace
     
     TEST(test_and_equals_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data1(0x12345678UL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data2(0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(0x12345678UL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(0x23456789UL);
       
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data3(test_and_equals_operator_helper(data1, data2));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data3(test_and_equals_operator_helper(data1, data2));
 
       CHECK((data1 & data2) == data3);
     }
@@ -1488,16 +1608,16 @@ namespace
     //*************************************************************************
     TEST(test_or_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data1(0x12345678UL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data2(0x23456789UL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data4(0x12345678UL | 0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(0x12345678UL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data4(0x12345678UL | 0x23456789UL);
 
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data3 = data1 | data2;
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data3 = data1 | data2;
       CHECK(data3 == data4);
     }
 
     //*************************************************************************
-    ETL_CONSTEXPR14 etl::bitset<64, int64_t> test_or_equals_operator_helper(etl::bitset<64, int64_t> data1, const etl::bitset<64, int64_t>& data2)
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_or_equals_operator_helper(etl::bitset<64, uint64_t> data1, const etl::bitset<64, uint64_t>& data2)
     {
       data1 |= data2;
 
@@ -1506,10 +1626,10 @@ namespace
 
     TEST(test_or_equals_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data1(0x12345678UL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data2(0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(0x12345678UL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(0x23456789UL);
 
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data3(test_or_equals_operator_helper(data1, data2));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data3(test_or_equals_operator_helper(data1, data2));
 
       CHECK((data1 | data2) == data3);
     }
@@ -1517,16 +1637,16 @@ namespace
     //*************************************************************************
     TEST(test_xor_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data1(0x12345678UL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data2(0x23456789UL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data4(0x12345678UL ^ 0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(0x12345678UL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data4(0x12345678UL ^ 0x23456789UL);
 
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data3 = data1 ^ data2;
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data3 = data1 ^ data2;
       CHECK(data3 == data4);
     }
 
     //*************************************************************************
-    ETL_CONSTEXPR14 etl::bitset<64, int64_t> test_xor_equals_operator_helper(etl::bitset<64, int64_t> data1, const etl::bitset<64, int64_t>& data2)
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_xor_equals_operator_helper(etl::bitset<64, uint64_t> data1, const etl::bitset<64, uint64_t>& data2)
     {
       data1 ^= data2;
 
@@ -1535,10 +1655,10 @@ namespace
 
     TEST(test_xor_equals_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data1(0x12345678UL);
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data2(0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(0x12345678UL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(0x23456789UL);
 
-      ETL_CONSTEXPR14 etl::bitset<64, int64_t> data3(test_xor_equals_operator_helper(data1, data2));
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data3(test_xor_equals_operator_helper(data1, data2));
 
       CHECK((data1 ^ data2) == data3);
     }
@@ -1546,102 +1666,102 @@ namespace
     //*************************************************************************
     TEST(test_find_first)
     {
-      ETL_CONSTEXPR14 etl::bitset<8, int8_t> bs1(ull(0x00));
-      ETL_CONSTEXPR14 size_t bs1fff = bs1.find_first(false);
-      ETL_CONSTEXPR14 size_t bs1fft = bs1.find_first(true);
-      CHECK_EQUAL(0U, bs1fff);
-      CHECK_EQUAL(etl::bitset<>::npos, bs1fft);
+      ETL_CONSTEXPR14 etl::bitset<8, uint8_t> bs1(ull(0x00));
+      ETL_CONSTEXPR14 size_t bs1find_first_false = bs1.find_first(false);
+      ETL_CONSTEXPR14 size_t bs1find_first_true  = bs1.find_first(true);
+      CHECK_EQUAL(0U, bs1find_first_false);
+      CHECK_EQUAL(etl::bitset<>::npos, bs1find_first_true);
 
-      ETL_CONSTEXPR14 etl::bitset<8, int8_t> bs2(ull(0xFF));
-      ETL_CONSTEXPR14 size_t bs2fff = bs2.find_first(false);
-      ETL_CONSTEXPR14 size_t bs2fft = bs2.find_first(true);
-      CHECK_EQUAL(etl::bitset<>::npos, bs2fff);
-      CHECK_EQUAL(0U, bs2fft);
+      ETL_CONSTEXPR14 etl::bitset<8, uint8_t> bs2(ull(0xFF));
+      ETL_CONSTEXPR14 size_t bs2find_first_false = bs2.find_first(false);
+      ETL_CONSTEXPR14 size_t bs2find_first_true  = bs2.find_first(true);
+      CHECK_EQUAL(etl::bitset<>::npos, bs2find_first_false);
+      CHECK_EQUAL(0U, bs2find_first_true);
 
-      ETL_CONSTEXPR14 etl::bitset<8, int8_t> bs3(ull(0x01));
-      ETL_CONSTEXPR14 size_t bs3fff = bs3.find_first(false);
-      ETL_CONSTEXPR14 size_t bs3fft = bs3.find_first(true);
-      CHECK_EQUAL(1U, bs3fff);
-      CHECK_EQUAL(0U, bs3fft);
+      ETL_CONSTEXPR14 etl::bitset<8, uint8_t> bs3(ull(0x01));
+      ETL_CONSTEXPR14 size_t bs3find_first_false = bs3.find_first(false);
+      ETL_CONSTEXPR14 size_t bs3find_first_true  = bs3.find_first(true);
+      CHECK_EQUAL(1U, bs3find_first_false);
+      CHECK_EQUAL(0U, bs3find_first_true);
 
-      ETL_CONSTEXPR14 etl::bitset<8, int8_t> bs4(ull(0x20));
-      ETL_CONSTEXPR14 size_t bs4fff = bs4.find_first(false);
-      ETL_CONSTEXPR14 size_t bs4fft = bs4.find_first(true);
-      CHECK_EQUAL(0U, bs4fff);
-      CHECK_EQUAL(5U, bs4fft);
+      ETL_CONSTEXPR14 etl::bitset<8, uint8_t> bs4(ull(0x20));
+      ETL_CONSTEXPR14 size_t bs4find_first_false = bs4.find_first(false);
+      ETL_CONSTEXPR14 size_t bs4find_first_true  = bs4.find_first(true);
+      CHECK_EQUAL(0U, bs4find_first_false);
+      CHECK_EQUAL(5U, bs4find_first_true);
 
-      ETL_CONSTEXPR14 etl::bitset<8, int8_t> bs5(ull(0x21));
-      ETL_CONSTEXPR14 size_t bs5fff = bs5.find_first(false);
-      ETL_CONSTEXPR14 size_t bs5fft = bs5.find_first(true);
-      CHECK_EQUAL(1U, bs5fff);
-      CHECK_EQUAL(0U, bs5fft);
+      ETL_CONSTEXPR14 etl::bitset<8, uint8_t> bs5(ull(0x21));
+      ETL_CONSTEXPR14 size_t bs5find_first_false = bs5.find_first(false);
+      ETL_CONSTEXPR14 size_t bs5find_first_true  = bs5.find_first(true);
+      CHECK_EQUAL(1U, bs5find_first_false);
+      CHECK_EQUAL(0U, bs5find_first_true);
 
-      ETL_CONSTEXPR14 etl::bitset<8, int8_t> bs6(ull(0x0E));
-      ETL_CONSTEXPR14 size_t bs6fff = bs6.find_first(false);
-      ETL_CONSTEXPR14 size_t bs6fft = bs6.find_first(true);
-      CHECK_EQUAL(0U, bs6fff);
-      CHECK_EQUAL(1U, bs6fft);
+      ETL_CONSTEXPR14 etl::bitset<8, uint8_t> bs6(ull(0x0E));
+      ETL_CONSTEXPR14 size_t bs6find_first_false = bs6.find_first(false);
+      ETL_CONSTEXPR14 size_t bs6find_first_true  = bs6.find_first(true);
+      CHECK_EQUAL(0U, bs6find_first_false);
+      CHECK_EQUAL(1U, bs6find_first_true);
 
-      ETL_CONSTEXPR14 etl::bitset<8, int8_t> bs7(ull(0x31));
-      ETL_CONSTEXPR14 size_t bs7fff = bs7.find_first(false);
-      ETL_CONSTEXPR14 size_t bs7fft = bs7.find_first(true);
-      CHECK_EQUAL(1U, bs7fff);
-      CHECK_EQUAL(0U, bs7fft);
+      ETL_CONSTEXPR14 etl::bitset<8, uint8_t> bs7(ull(0x31));
+      ETL_CONSTEXPR14 size_t bs7find_first_false = bs7.find_first(false);
+      ETL_CONSTEXPR14 size_t bs7find_first_true  = bs7.find_first(true);
+      CHECK_EQUAL(1U, bs7find_first_false);
+      CHECK_EQUAL(0U, bs7find_first_true);
     }
 
     //*************************************************************************
     TEST(test_find_next)
     {
-      ETL_CONSTEXPR14 etl::bitset<8, int8_t> bs1(ull(0x00));
-      ETL_CONSTEXPR14 size_t bs1fnf0 = bs1.find_next(false, 0);
-      ETL_CONSTEXPR14 size_t bs1fnf1 = bs1.find_next(false, 1);
-      ETL_CONSTEXPR14 size_t bs1fnt2 = bs1.find_next(true, 2);
-      CHECK_EQUAL(0U, bs1fnf0);
-      CHECK_EQUAL(1U, bs1fnf1);
-      CHECK_EQUAL(etl::bitset<>::npos, bs1fnt2);
+      ETL_CONSTEXPR14 etl::bitset<8, uint8_t> bs1(ull(0x00));
+      ETL_CONSTEXPR14 size_t bs1find_next_false0 = bs1.find_next(false, 0);
+      ETL_CONSTEXPR14 size_t bs1find_next_false1 = bs1.find_next(false, 1);
+      ETL_CONSTEXPR14 size_t bs1find_next_true2 = bs1.find_next(true, 2);
+      CHECK_EQUAL(0U, bs1find_next_false0);
+      CHECK_EQUAL(1U, bs1find_next_false1);
+      CHECK_EQUAL(etl::bitset<>::npos, bs1find_next_true2);
 
-      ETL_CONSTEXPR14 etl::bitset<8, int8_t> bs2(ull(0xFF));
-      ETL_CONSTEXPR14 size_t bs2fnt0 = bs2.find_next(true, 0);
-      ETL_CONSTEXPR14 size_t bs2fnt1 = bs2.find_next(true, 1);
-      ETL_CONSTEXPR14 size_t bs2fnf2 = bs2.find_next(false, 2);
-      CHECK_EQUAL(0U, bs2fnt0);
-      CHECK_EQUAL(1U, bs2fnt1);
-      CHECK_EQUAL(etl::bitset<>::npos, bs2fnf2);
+      ETL_CONSTEXPR14 etl::bitset<8, uint8_t> bs2(ull(0xFF));
+      ETL_CONSTEXPR14 size_t bs2find_next_true0 = bs2.find_next(true, 0);
+      ETL_CONSTEXPR14 size_t bs2find_next_true1 = bs2.find_next(true, 1);
+      ETL_CONSTEXPR14 size_t bs2find_next_false2 = bs2.find_next(false, 2);
+      CHECK_EQUAL(0U, bs2find_next_true0);
+      CHECK_EQUAL(1U, bs2find_next_true1);
+      CHECK_EQUAL(etl::bitset<>::npos, bs2find_next_false2);
 
-      ETL_CONSTEXPR14 etl::bitset<8, int8_t> bs3(ull(0x0E));
-      ETL_CONSTEXPR14 size_t bs3fnf0 = bs3.find_next(false, 0);
-      ETL_CONSTEXPR14 size_t bs3fnt1 = bs3.find_next(true, 1);
-      ETL_CONSTEXPR14 size_t bs3fnf2 = bs3.find_next(false, 2);
-      CHECK_EQUAL(0U, bs3fnf0);
-      CHECK_EQUAL(1U, bs3fnt1);
-      CHECK_EQUAL(4U, bs3fnf2);
+      ETL_CONSTEXPR14 etl::bitset<8, uint8_t> bs3(ull(0x0E));
+      ETL_CONSTEXPR14 size_t bs3find_next_false0 = bs3.find_next(false, 0);
+      ETL_CONSTEXPR14 size_t bs3find_next_true1 = bs3.find_next(true, 1);
+      ETL_CONSTEXPR14 size_t bs3find_next_false2 = bs3.find_next(false, 2);
+      CHECK_EQUAL(0U, bs3find_next_false0);
+      CHECK_EQUAL(1U, bs3find_next_true1);
+      CHECK_EQUAL(4U, bs3find_next_false2);
 
-      ETL_CONSTEXPR14 etl::bitset<8, int8_t> bs4(ull(0x31));
-      ETL_CONSTEXPR14 size_t bs4fnt0 = bs4.find_next(true, 0);
-      ETL_CONSTEXPR14 size_t bs4fnf0 = bs4.find_next(false, 0);
-      ETL_CONSTEXPR14 size_t bs4fnt1 = bs4.find_next(true, 1);
-      CHECK_EQUAL(0U, bs4fnt0);
-      CHECK_EQUAL(1U, bs4fnf0);
-      CHECK_EQUAL(4U, bs4fnt1);
+      ETL_CONSTEXPR14 etl::bitset<8, uint8_t> bs4(ull(0x31));
+      ETL_CONSTEXPR14 size_t bs4find_next_true0 = bs4.find_next(true, 0);
+      ETL_CONSTEXPR14 size_t bs4find_next_false0 = bs4.find_next(false, 0);
+      ETL_CONSTEXPR14 size_t bs4find_next_true1 = bs4.find_next(true, 1);
+      CHECK_EQUAL(0U, bs4find_next_true0);
+      CHECK_EQUAL(1U, bs4find_next_false0);
+      CHECK_EQUAL(4U, bs4find_next_true1);
     }
 
     //*************************************************************************
-    ETL_CONSTEXPR14 std::pair<etl::bitset<8, int8_t>, etl::bitset<8, int8_t>> test_swap_helper()
+    ETL_CONSTEXPR14 std::pair<etl::bitset<8, uint8_t>, etl::bitset<8, uint8_t>> test_swap_helper()
     {
-      etl::bitset<8, int8_t> data1(ull(0x2A));
-      etl::bitset<8, int8_t> data2(ull(0x15));
+      etl::bitset<8, uint8_t> data1(ull(0x2A));
+      etl::bitset<8, uint8_t> data2(ull(0x15));
 
       swap(data1, data2);
 
-      return std::pair<etl::bitset<8, int8_t>, etl::bitset<8, int8_t>>(data1, data2);
+      return std::pair<etl::bitset<8, uint8_t>, etl::bitset<8, uint8_t>>(data1, data2);
     }
 
     TEST(test_swap)
     {
-      ETL_CONSTEXPR14 etl::bitset<8, int8_t> compare1(0x2A);
-      ETL_CONSTEXPR14 etl::bitset<8, int8_t> compare2(0x15);
+      ETL_CONSTEXPR14 etl::bitset<8, uint8_t> compare1(0x2A);
+      ETL_CONSTEXPR14 etl::bitset<8, uint8_t> compare2(0x15);
 
-      ETL_CONSTEXPR14 std::pair<etl::bitset<8, int8_t>, etl::bitset<8, int8_t>> swapped = test_swap_helper();
+      ETL_CONSTEXPR14 std::pair<etl::bitset<8, uint8_t>, etl::bitset<8, uint8_t>> swapped = test_swap_helper();
 
       CHECK(swapped.first == compare2);
       CHECK(swapped.second == compare1);
@@ -1661,9 +1781,9 @@ namespace
     //*************************************************************************
     TEST(test_const_span)
     {
-      using span_t = etl::bitset<32, int32_t>::const_span_type;
+      using span_t = etl::bitset<32, uint32_t>::const_span_type;
 
-      const etl::bitset<32, int32_t> b(0x12345678UL);
+      const etl::bitset<32, uint32_t> b(0x12345678UL);
 
       span_t s = b.span();
       CHECK_EQUAL(0x12345678UL, s[0]);
@@ -1672,7 +1792,7 @@ namespace
     //*************************************************************************
     TEST(test_to_string)
     {
-      using bs32 = etl::bitset<32, int32_t>;
+      using bs32 = etl::bitset<32, uint32_t>;
 
       ETL_CONSTEXPR14 bs32 b(0x12345678UL);
 
@@ -1687,7 +1807,7 @@ namespace
     //*************************************************************************
     TEST(test_to_wstring)
     {
-      using bs32 = etl::bitset<32, int32_t>;
+      using bs32 = etl::bitset<32, uint32_t>;
 
       ETL_CONSTEXPR14 bs32 b(0x12345678UL);
 
@@ -1701,7 +1821,7 @@ namespace
     //*************************************************************************
     TEST(test_to_u16string)
     {
-      using bs32 = etl::bitset<32, int32_t>;
+      using bs32 = etl::bitset<32, uint32_t>;
 
       ETL_CONSTEXPR14 bs32 b(0x12345678UL);
 
@@ -1715,7 +1835,7 @@ namespace
     //*************************************************************************
     TEST(test_to_u32string)
     {
-      using bs32 = etl::bitset<32, int32_t>;
+      using bs32 = etl::bitset<32, uint32_t>;
 
       ETL_CONSTEXPR14 bs32 b(0x12345678UL);
 
@@ -1726,7 +1846,7 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
 
-    //*************************************************************************
+    ////*************************************************************************
     TEST(test_extract_6_bit_uint8_t_with_run_time_parameters)
     {
       ETL_CONSTEXPR14 etl::bitset<32, uint32_t> b(0x12345678UL);

From 78d2ccf55ee5d3b1560a9ce4f337a1d8a43a182a Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Fri, 29 Dec 2023 16:00:10 +0000
Subject: [PATCH 024/131] Work in progress

Finished updating explicit single element tests for bitset_ext
---
 include/etl/private/bitset_new.h              | 240 ++---
 ...itset_new_explicit_single_element_type.cpp |  32 +
 ...t_new_ext_explicit_single_element_type.cpp | 977 +++++++++++-------
 3 files changed, 688 insertions(+), 561 deletions(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 7a766f64..7a4a7fa1 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -45,11 +45,16 @@ SOFTWARE.
 #include "../error_handler.h"
 #include "../span.h"
 #include "../string.h"
+#include "../enum_type.h"
 
 #include <string.h>
 #include <stddef.h>
 #include <stdint.h>
 
+#if ETL_USING_STL
+#include <algorithm>
+#endif
+
 #include "minmax_push.h"
 
 #if defined(ETL_COMPILER_KEIL)
@@ -76,71 +81,6 @@ SOFTWARE.
 
 namespace etl
 {
-  //namespace private_bitset
-  //{
-  //  //***************************************************************************
-  //  /// Common definitions for etl::bitset_impl
-  //  ///\ingroup bitset
-  //  //***************************************************************************
-  //  template <typename TElement>
-  //  struct bitset_impl_common
-  //  {
-  //    typedef TElement            element_type;
-  //    typedef element_type* pointer;
-  //    typedef const element_type* const_pointer;
-
-  //    static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
-
-  //    static ETL_CONSTANT size_t       Bits_Per_Element  = etl::integral_limits<element_type>::bits;
-  //    static ETL_CONSTANT element_type All_Set_Element   = etl::integral_limits<element_type>::max;
-  //    static ETL_CONSTANT element_type All_Clear_Element = element_type(0);
-  //  };
-
-  //  template <typename TElement>
-  //  ETL_CONSTANT size_t bitset_impl_common<TElement>::npos;
-
-  //  template <typename TElement>
-  //  ETL_CONSTANT size_t bitset_impl_common<TElement>::Bits_Per_Element;
-
-  //  template <typename TElement>
-  //  ETL_CONSTANT TElement bitset_impl_common<TElement>::All_Set_Element;
-
-  //  template <typename TElement>
-  //  ETL_CONSTANT TElement bitset_impl_common<TElement>::All_Clear_Element;
-
-  //  //***************************************************************************
-  //  /// Common definitions for etl::bitset
-  //  ///\ingroup bitset
-  //  //***************************************************************************
-  //  template <size_t Active_Bits, typename TElement>
-  //  struct bitset_common : public bitset_impl_common<TElement>
-  //  {
-  //    typedef TElement element_type;
-
-  //    static ETL_CONSTANT size_t       Number_Of_Elements = (Active_Bits % Bits_Per_Element == 0) ? Active_Bits / Bits_Per_Element : Active_Bits / Bits_Per_Element + 1;
-  //    static ETL_CONSTANT size_t       Allocated_Bits     = Number_Of_Elements * Bits_Per_Element;
-  //    static ETL_CONSTANT size_t       Top_Mask_Shift     = ((Bits_Per_Element - (Allocated_Bits - Active_Bits)) % Bits_Per_Element);
-  //    static ETL_CONSTANT element_type Top_Mask           = element_type(Top_Mask_Shift == 0 ? All_Set_Element : ~(All_Set_Element << Top_Mask_Shift));
-
-  //    static ETL_CONSTANT size_t ALLOCATED_BITS = Allocated_Bits; ///< For backward compatibility.
-
-  //    typedef etl::span<element_type, Number_Of_Elements>       span_type;
-  //    typedef etl::span<const element_type, Number_Of_Elements> const_span_type;
-  //  };
-
-  //  template <size_t Active_Bits, typename TElement>
-  //  ETL_CONSTANT size_t bitset_common<Active_Bits, TElement>::Number_Of_Elements;
-
-  //  template <size_t Active_Bits, typename TElement>
-  //  ETL_CONSTANT size_t bitset_common<Active_Bits, TElement>::Allocated_Bits;
-
-  //  template <size_t Active_Bits, typename TElement>
-  //  ETL_CONSTANT size_t bitset_common<Active_Bits, TElement>::Top_Mask_Shift;
-
-  //  template <size_t Active_Bits, typename TElement>
-  //  ETL_CONSTANT typename bitset_common<Active_Bits, TElement>::element_type private_bitset::bitset_common<Active_Bits, TElement>::Top_Mask;
-  //}
-
   //***************************************************************************
   /// Flags to indicate whether the bitset is contained in a single element
   /// or spread over an array of elements.
@@ -148,8 +88,9 @@ namespace etl
   //***************************************************************************
   struct bitset_layout
   {
-    static ETL_CONSTANT bool Single = true;
-    static ETL_CONSTANT bool Multi  = false;
+    static ETL_CONSTANT char Undefined = 0;
+    static ETL_CONSTANT char Single    = 1;
+    static ETL_CONSTANT char Multi     = 2;
   };
 
   //***************************************************************************
@@ -212,7 +153,7 @@ namespace etl
   /// Bitset implementation declaration.
   ///\ingroup bitset
   //*************************************************************************
-  template <typename TElement, bool Bitset_Layout>
+  template <typename TElement, char Bitset_Layout>
   class bitset_impl;
 
   //*************************************************************************
@@ -224,16 +165,14 @@ namespace etl
   {
   public:
 
-    //static ETL_CONSTANT bool Element_Layout = etl::bitset_layout::Single;
-
     typedef TElement            element_type;
     typedef element_type*       pointer;
     typedef const element_type* const_pointer;
 
     static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
 
-    static ETL_CONSTANT size_t       Bits_Per_Element = etl::integral_limits<element_type>::bits;
-    static ETL_CONSTANT element_type All_Set_Element = etl::integral_limits<element_type>::max;
+    static ETL_CONSTANT size_t       Bits_Per_Element  = etl::integral_limits<element_type>::bits;
+    static ETL_CONSTANT element_type All_Set_Element   = etl::integral_limits<element_type>::max;
     static ETL_CONSTANT element_type All_Clear_Element = element_type(0);
 
     //*************************************************************************
@@ -241,10 +180,11 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 
     static 
-    void set(pointer pbuffer, 
-             size_t  /*number_of_elements*/) ETL_NOEXCEPT
+    void set(pointer      pbuffer,
+             size_t       /*number_of_elements*/,
+             element_type top_mask) ETL_NOEXCEPT
     {
-      *pbuffer = All_Set_Element;
+      *pbuffer = All_Set_Element & top_mask;
     }
 
     //*************************************************************************
@@ -303,11 +243,9 @@ namespace etl
                      size_t      active_bits, 
                      const char* text) ETL_NOEXCEPT
     {
-      if (text == ETL_NULLPTR)
-      {
-        reset(pbuffer, 1U);
-      }
-      else
+      reset(pbuffer, 1U);
+
+      if (text != ETL_NULLPTR)
       {
         size_t string_length = etl::strlen(text);
 
@@ -322,10 +260,6 @@ namespace etl
           {
             *pbuffer |= mask;
           }
-          else
-          {
-            *pbuffer &= ~mask;
-          }
 
           mask >>= 1U;
         }
@@ -342,11 +276,9 @@ namespace etl
                      size_t         active_bits, 
                      const wchar_t* text) ETL_NOEXCEPT
     {
-      if (text == ETL_NULLPTR)
-      {
-        reset(pbuffer, 1U);
-      }
-      else
+      reset(pbuffer, 1U);
+
+      if (text != ETL_NULLPTR)
       {
         size_t string_length = etl::strlen(text);
 
@@ -361,10 +293,6 @@ namespace etl
           {
             *pbuffer |= mask;
           }
-          else
-          {
-            *pbuffer &= ~mask;
-          }
 
           mask >>= 1U;
         }
@@ -381,11 +309,9 @@ namespace etl
                      size_t          active_bits, 
                      const char16_t* text) ETL_NOEXCEPT
     {
-      if (text == ETL_NULLPTR)
-      {
-        reset(pbuffer, 1U);
-      }
-      else
+      reset(pbuffer, 1U);
+
+      if (text != ETL_NULLPTR)
       {
         size_t string_length = etl::strlen(text);
 
@@ -400,10 +326,6 @@ namespace etl
           {
             *pbuffer |= mask;
           }
-          else
-          {
-            *pbuffer &= ~mask;
-          }
 
           mask >>= 1U;
         }
@@ -420,11 +342,9 @@ namespace etl
                      size_t          active_bits, 
                      const char32_t* text) ETL_NOEXCEPT
     {
-      if (text == ETL_NULLPTR)
-      {
-        reset(pbuffer, 1U);
-      }
-      else
+      reset(pbuffer, 1U);
+
+      if (text != ETL_NULLPTR)
       {
         size_t string_length = etl::strlen(text);
 
@@ -439,10 +359,6 @@ namespace etl
           {
             *pbuffer |= mask;
           }
-          else
-          {
-            *pbuffer &= ~mask;
-          }
 
           mask >>= 1U;
         }
@@ -725,6 +641,7 @@ namespace etl
 
     //*************************************************************************
     /// operator assignment
+    /// Assigns rhs to lhs
     //*************************************************************************
     ETL_CONSTEXPR14 
     static 
@@ -737,6 +654,7 @@ namespace etl
 
     //*************************************************************************
     /// operator and
+    /// AND lhs and rhs and put the result in lhs
     //*************************************************************************
     ETL_CONSTEXPR14 
     static 
@@ -749,6 +667,7 @@ namespace etl
 
     //*************************************************************************
     /// operator or
+    /// OR lhs and rhs and put the result in lhs
     //*************************************************************************
     ETL_CONSTEXPR14 
     static 
@@ -761,6 +680,7 @@ namespace etl
 
     //*************************************************************************
     /// operator xor
+    /// XOR lhs and rhs and put the result in lhs
     //*************************************************************************
     ETL_CONSTEXPR14 
     static 
@@ -773,6 +693,7 @@ namespace etl
 
     //*************************************************************************
     /// operator ~
+    /// NOT the value in the buffer
     //*************************************************************************
     ETL_CONSTEXPR14 
     static 
@@ -855,15 +776,12 @@ namespace etl
               pointer rhs_pbuffer, 
               size_t  /*number_of_elements*/) ETL_NOEXCEPT
     {
-      using ETL_OR_STD::iter_swap;
-
-      iter_swap(lhs_pbuffer, rhs_pbuffer);
+      element_type temp = *lhs_pbuffer;
+      *lhs_pbuffer = *rhs_pbuffer;
+      *rhs_pbuffer = temp;
     }
   };
 
-  //template <typename TElement>
-  //ETL_CONSTANT bool etl::bitset_impl<TElement, etl::bitset_layout::Single>::Element_Layout;
-
   //*************************************************************************
   /// The implementation class for multi element etl::bitset
   ///\ingroup bitset
@@ -883,8 +801,6 @@ namespace etl
     static ETL_CONSTANT element_type All_Set_Element = etl::integral_limits<element_type>::max;
     static ETL_CONSTANT element_type All_Clear_Element = element_type(0);
 
-    //static ETL_CONSTANT bool Element_Layout = etl::bitset_layout::Multi;
-
     //*************************************************************************
     /// Check to see if the requested extract is contained within one element.
     //*************************************************************************
@@ -1756,9 +1672,6 @@ namespace etl
     }
   };
 
-  //template <typename TElement>
-  //ETL_CONSTANT bool etl::bitset_impl<TElement, etl::bitset_layout::Multi>::Element_Layout;
-
   //***************************************************************************
   /// Bitset forward declaration
   //***************************************************************************
@@ -1784,8 +1697,7 @@ namespace etl
     static ETL_CONSTANT size_t       Allocated_Bits     = 0U;
     static ETL_CONSTANT element_type All_Set_Element    = 0U;
     static ETL_CONSTANT element_type All_Clear_Element  = 0U;
-    static ETL_CONSTANT size_t       Top_Mask_Shift     = 0U;
-    static ETL_CONSTANT element_type Top_Mask           = 0U;
+    static ETL_CONSTANT char         Element_Layout     = etl::bitset_layout::Undefined;
 
     static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
   };
@@ -1806,15 +1718,19 @@ namespace etl
 
     static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
 
-    //static ETL_CONSTANT bool Element_Layout = implementation::Element_Layout;
-
     static ETL_CONSTANT size_t       Bits_Per_Element   = etl::integral_limits<element_type>::bits;
     static ETL_CONSTANT element_type All_Set_Element    = etl::integral_limits<element_type>::max;
     static ETL_CONSTANT element_type All_Clear_Element  = element_type(0);
     static ETL_CONSTANT size_t       Number_Of_Elements = (Active_Bits % Bits_Per_Element == 0) ? Active_Bits / Bits_Per_Element : Active_Bits / Bits_Per_Element + 1;
     static ETL_CONSTANT size_t       Allocated_Bits     = Number_Of_Elements * Bits_Per_Element;
-    static ETL_CONSTANT size_t       Top_Mask_Shift     = ((Bits_Per_Element - (Allocated_Bits - Active_Bits)) % Bits_Per_Element);
-    static ETL_CONSTANT element_type Top_Mask           = element_type(Top_Mask_Shift == 0 ? All_Set_Element : ~(All_Set_Element << Top_Mask_Shift));
+    static ETL_CONSTANT char         Element_Layout     = (Number_Of_Elements == 1U) ? etl::bitset_layout::Single : etl::bitset_layout::Multi;
+
+  private:
+    
+    static ETL_CONSTANT size_t       Top_Mask_Shift = ((Bits_Per_Element - (Allocated_Bits - Active_Bits)) % Bits_Per_Element);
+    static ETL_CONSTANT element_type Top_Mask       = element_type(Top_Mask_Shift == 0 ? All_Set_Element : ~(All_Set_Element << Top_Mask_Shift));
+
+  public:
 
     static ETL_CONSTANT size_t ALLOCATED_BITS = Allocated_Bits; ///< For backward compatibility.
 
@@ -1910,6 +1826,7 @@ namespace etl
     /// Default constructor.
     //*************************************************************************
     ETL_CONSTEXPR14 bitset() ETL_NOEXCEPT
+      : buffer()
     {
       implementation::reset(buffer, Number_Of_Elements);
     }
@@ -1973,7 +1890,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bitset& operator =(const bitset<Active_Bits, TElement>& other) ETL_NOEXCEPT
     {
-      etl::copy_n(other.buffer, Number_Of_Elements, buffer);
+      implementation::operator_assignment(buffer, other.buffer, Number_Of_Elements);
 
       return *this;
     }
@@ -1983,7 +1900,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& set() ETL_NOEXCEPT
     {
-      implementation::set(buffer, Number_Of_Elements);
+      implementation::set(buffer, Number_Of_Elements, Top_Mask);
 
       return *this;
     }
@@ -2454,9 +2371,7 @@ namespace etl
     //*************************************************************************
     friend ETL_CONSTEXPR14 bool operator ==(const bitset<Active_Bits, TElement>& lhs, const bitset<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
     {
-      return etl::equal(lhs.buffer, 
-                        lhs.buffer + lhs.Number_Of_Elements,
-                        rhs.buffer);
+      return implementation::operator_equality(lhs.buffer, rhs.buffer, lhs.Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -2586,8 +2501,7 @@ namespace etl
     static ETL_CONSTANT size_t       Allocated_Bits     = 0U;
     static ETL_CONSTANT element_type All_Set_Element    = 0U;
     static ETL_CONSTANT element_type All_Clear_Element  = 0U;
-    static ETL_CONSTANT size_t       Top_Mask_Shift     = 0U;
-    static ETL_CONSTANT element_type Top_Mask           = 0U;
+    static ETL_CONSTANT char         Element_Layout     = etl::bitset_layout::Undefined;
 
     static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
   };
@@ -2596,7 +2510,7 @@ namespace etl
   /// The specialisation that uses an array of the default element type.
   //*************************************************************************
   template <size_t Active_Bits, typename TElement>
-  class bitset_ext// : public etl::private_bitset::bitset_common<Active_Bits, TEelement>
+  class bitset_ext
   {
   public:
 
@@ -2608,15 +2522,19 @@ namespace etl
 
     static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
 
-    //static ETL_CONSTANT bool Element_Layout = implementation::Element_Layout;
-
     static ETL_CONSTANT size_t       Bits_Per_Element   = etl::integral_limits<element_type>::bits;
     static ETL_CONSTANT element_type All_Set_Element    = etl::integral_limits<element_type>::max;
     static ETL_CONSTANT element_type All_Clear_Element  = element_type(0);
     static ETL_CONSTANT size_t       Number_Of_Elements = (Active_Bits % Bits_Per_Element == 0) ? Active_Bits / Bits_Per_Element : Active_Bits / Bits_Per_Element + 1;
     static ETL_CONSTANT size_t       Allocated_Bits     = Number_Of_Elements * Bits_Per_Element;
-    static ETL_CONSTANT size_t       Top_Mask_Shift     = ((Bits_Per_Element - (Allocated_Bits - Active_Bits)) % Bits_Per_Element);
-    static ETL_CONSTANT element_type Top_Mask           = element_type(Top_Mask_Shift == 0 ? All_Set_Element : ~(All_Set_Element << Top_Mask_Shift));
+    static ETL_CONSTANT char         Element_Layout     = (Number_Of_Elements == 1U) ? etl::bitset_layout::Single : etl::bitset_layout::Multi;
+
+  private:
+
+    static ETL_CONSTANT size_t       Top_Mask_Shift = ((Bits_Per_Element - (Allocated_Bits - Active_Bits)) % Bits_Per_Element);
+    static ETL_CONSTANT element_type Top_Mask = element_type(Top_Mask_Shift == 0 ? All_Set_Element : ~(All_Set_Element << Top_Mask_Shift));
+
+  public:
 
     static ETL_CONSTANT size_t ALLOCATED_BITS = Allocated_Bits; ///< For backward compatibility.
 
@@ -2716,7 +2634,7 @@ namespace etl
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      reset();
+      implementation::reset(pbuffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -2726,7 +2644,7 @@ namespace etl
       : pbuffer(buffer.data())
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      reset();
+      implementation::reset(pbuffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -2736,7 +2654,7 @@ namespace etl
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      etl::copy_n(other.pbuffer, Number_Of_Elements, pbuffer);
+      implementation::operator_assignment(pbuffer, other.pbuffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -2745,7 +2663,7 @@ namespace etl
     ETL_CONSTEXPR14 bitset_ext(const bitset_ext<Active_Bits, TElement>& other, buffer_type& buffer) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
-      etl::copy_n(other.pbuffer, Number_Of_Elements, pbuffer);
+      implementation::operator_assignment(pbuffer, other.pbuffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -2779,7 +2697,7 @@ namespace etl
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -2788,7 +2706,7 @@ namespace etl
     ETL_CONSTEXPR14 bitset_ext(const char* text, buffer_type& buffer) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
-      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -2798,7 +2716,7 @@ namespace etl
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -2807,7 +2725,7 @@ namespace etl
     ETL_CONSTEXPR14 bitset_ext(const wchar_t* text, buffer_type& buffer) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
-      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -2817,7 +2735,7 @@ namespace etl
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -2826,7 +2744,7 @@ namespace etl
     ETL_CONSTEXPR14 bitset_ext(const char16_t* text, buffer_type& buffer) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
-      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -2836,7 +2754,7 @@ namespace etl
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -2845,7 +2763,7 @@ namespace etl
     ETL_CONSTEXPR14 bitset_ext(const char32_t* text, buffer_type& buffer) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
-      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
     }
 
     //*************************************************************************
@@ -2863,7 +2781,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set() ETL_NOEXCEPT
     {
-      implementation::set(pbuffer, Number_Of_Elements, All_Set_Element);
+      implementation::set(pbuffer, Number_Of_Elements, Top_Mask);
 
       return *this;
     }
@@ -2885,7 +2803,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set(const char* text) ETL_NOEXCEPT
     {
-      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -2895,7 +2813,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set(const wchar_t* text) ETL_NOEXCEPT
     {
-      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -2905,7 +2823,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set(const char16_t* text) ETL_NOEXCEPT
     {
-      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -2915,7 +2833,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set(const char32_t* text) ETL_NOEXCEPT
     {
-      implementation::set(pbuffer, Number_Of_Elements, Active_Bits, text);
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
 
       return *this;
     }
@@ -3108,7 +3026,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool any() const ETL_NOEXCEPT
     {
-      return implementation::any(pbuffer, Number_Of_Elements, Top_Mask);
+      return implementation::any(pbuffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -3116,7 +3034,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool any(element_type mask) const ETL_NOEXCEPT
     {
-      return implementation::any(pbuffer, Number_Of_Elements, Top_Mask, mask);
+      return implementation::any(pbuffer, Number_Of_Elements, mask);
     }
 
     //*************************************************************************
@@ -3217,7 +3135,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& operator ^=(const bitset_ext<Active_Bits, TElement>& other) ETL_NOEXCEPT
     {
-      implementation::xoperator_or(&pbuffer[0], &other.pbuffer[0], Number_Of_Elements);
+      implementation::operator_xor(&pbuffer[0], &other.pbuffer[0], Number_Of_Elements);
 
       return *this;
     }
@@ -3247,7 +3165,7 @@ namespace etl
     //*************************************************************************
     friend ETL_CONSTEXPR14 bool operator ==(const bitset_ext<Active_Bits, TElement>& lhs, const bitset_ext<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
     {
-      return etl::equal(lhs.pbuffer, lhs.pbuffer + lhs.Number_Of_Elements, rhs.pbuffer);
+      return implementation::operator_equality(lhs.pbuffer, rhs.pbuffer, lhs.Number_Of_Elements);
     }
 
     //*************************************************************************
diff --git a/test/test_bitset_new_explicit_single_element_type.cpp b/test/test_bitset_new_explicit_single_element_type.cpp
index 291c6836..18d19157 100644
--- a/test/test_bitset_new_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_explicit_single_element_type.cpp
@@ -146,6 +146,11 @@ namespace
       CHECK_EQUAL(1U, data16.Number_Of_Elements);
       CHECK_EQUAL(1U, data32.Number_Of_Elements);
       CHECK_EQUAL(1U, data64.Number_Of_Elements);
+
+      CHECK_EQUAL(etl::bitset_layout::Single, data8.Element_Layout);
+      CHECK_EQUAL(etl::bitset_layout::Single, data16.Element_Layout);
+      CHECK_EQUAL(etl::bitset_layout::Single, data32.Element_Layout);
+      CHECK_EQUAL(etl::bitset_layout::Single, data64.Element_Layout);
     }
 
     //*************************************************************************
@@ -353,6 +358,33 @@ namespace
       }
     }
 
+    //*************************************************************************
+    TEST(test_set_less_than_full_size)
+    {
+      std::bitset<60> compare;
+      etl::bitset<60, uint64_t> data;
+
+      compare.set();
+      data.set();
+
+      auto size  = data.size();
+      auto count = data.count();
+      auto none  = data.none();
+      auto any   = data.any();
+      auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
     //*************************************************************************
     TEST(test_set_with_char_string)
     {
diff --git a/test/test_bitset_new_ext_explicit_single_element_type.cpp b/test/test_bitset_new_ext_explicit_single_element_type.cpp
index 4b3d3948..cbba1ed4 100644
--- a/test/test_bitset_new_ext_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_ext_explicit_single_element_type.cpp
@@ -47,7 +47,7 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_nullptr_buffer)
     {
-      using BsExt = etl::bitset_ext<64, int64_t>;
+      using BsExt = etl::bitset_ext<64, uint64_t>;
 
       BsExt::buffer_type buffer;
       BsExt bs2a(buffer);
@@ -64,9 +64,9 @@ namespace
     //*************************************************************************
     TEST(test_default_constructor_from_array)
     {
-      etl::bitset_ext<64, int64_t>::element_type buffer[etl::bitset_ext<64, int64_t>::Number_Of_Elements];
+      etl::bitset_ext<64, uint64_t>::element_type buffer[etl::bitset_ext<64, uint64_t>::Number_Of_Elements];
       std::bitset<64> compare;
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -80,9 +80,9 @@ namespace
     //*************************************************************************
     TEST(test_default_constructor_from_buffer_type)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare;
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -96,28 +96,33 @@ namespace
     //*************************************************************************
     TEST(test_default_constructor_single_element)
     {
-      etl::bitset_ext<8,  int8_t>::buffer_type  buffer8;
-      etl::bitset_ext<16, int16_t>::buffer_type buffer16;
-      etl::bitset_ext<32, int32_t>::buffer_type buffer32;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer64;
+      etl::bitset_ext<8,  uint8_t>::buffer_type  buffer8;
+      etl::bitset_ext<16, uint16_t>::buffer_type buffer16;
+      etl::bitset_ext<32, uint32_t>::buffer_type buffer32;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer64;
 
-      etl::bitset_ext<8,  int8_t>  data8(buffer8);
-      etl::bitset_ext<16, int16_t> data16(buffer16);
-      etl::bitset_ext<32, int32_t> data32(buffer32);
-      etl::bitset_ext<64, int64_t> data64(buffer64);
+      etl::bitset_ext<8,  uint8_t>  data8(buffer8);
+      etl::bitset_ext<16, uint16_t> data16(buffer16);
+      etl::bitset_ext<32, uint32_t> data32(buffer32);
+      etl::bitset_ext<64, uint64_t> data64(buffer64);
 
       CHECK_EQUAL(1U, data8.Number_Of_Elements);
       CHECK_EQUAL(1U, data16.Number_Of_Elements);
       CHECK_EQUAL(1U, data32.Number_Of_Elements);
       CHECK_EQUAL(1U, data64.Number_Of_Elements);
+
+      CHECK_EQUAL(etl::bitset_layout::Single, data8.Element_Layout);
+      CHECK_EQUAL(etl::bitset_layout::Single, data16.Element_Layout);
+      CHECK_EQUAL(etl::bitset_layout::Single, data32.Element_Layout);
+      CHECK_EQUAL(etl::bitset_layout::Single, data64.Element_Layout);
     }
 
     //*************************************************************************
     TEST(test_construct_from_value)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
       std::bitset<64> compare(0x123456731234567ULL);
-      etl::bitset_ext<64, int64_t> data(0x123456731234567ULL, buffer1);
+      etl::bitset_ext<64, uint64_t> data(0x123456731234567ULL, buffer1);
 
       CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -132,11 +137,11 @@ namespace
     //*************************************************************************
     TEST(test_copy_construct)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer2;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer2;
       std::bitset<64> compare(0x123456731234567ULL);
-      etl::bitset_ext<64, int64_t> data(0x123456731234567ULL, buffer1);
-      etl::bitset_ext<64, int64_t> data_copy(data, buffer2);
+      etl::bitset_ext<64, uint64_t> data(0x123456731234567ULL, buffer1);
+      etl::bitset_ext<64, uint64_t> data_copy(data, buffer2);
 
       CHECK_EQUAL(compare.size(), data_copy.size());
       CHECK_EQUAL(compare.count(), data_copy.count());
@@ -150,9 +155,9 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_excess_value)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare(0x8765432187654321ULL);
-      etl::bitset_ext<64, int64_t> data(0x8765432187654321ULL, buffer);
+      etl::bitset_ext<64, uint64_t> data(0x8765432187654321ULL, buffer);
 
       CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -166,9 +171,9 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_char_string)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<64, int64_t> data("110001001000110100010101100111001100010010001101000101011001", buffer);
+      etl::bitset_ext<64, uint64_t> data("110001001000110100010101100111001100010010001101000101011001", buffer);
 
       CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -182,9 +187,9 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_wchar_t_string)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare(L"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<64, int64_t> data(L"110001001000110100010101100111001100010010001101000101011001", buffer);
+      etl::bitset_ext<64, uint64_t> data(L"110001001000110100010101100111001100010010001101000101011001", buffer);
 
       CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -198,9 +203,9 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_char16_t_string)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare(u"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<64, int64_t> data(u"110001001000110100010101100111001100010010001101000101011001", buffer);
+      etl::bitset_ext<64, uint64_t> data(u"110001001000110100010101100111001100010010001101000101011001", buffer);
 
       CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -214,9 +219,9 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_char32_t_string)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare(U"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<64, int64_t> data(U"110001001000110100010101100111001100010010001101000101011001", buffer);
+      etl::bitset_ext<64, uint64_t> data(U"110001001000110100010101100111001100010010001101000101011001", buffer);
 
       CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -232,8 +237,8 @@ namespace
     {
       const char* s = nullptr;
 
-      etl::bitset_ext<60, int64_t>::buffer_type buffer;
-      etl::bitset_ext<60, int64_t> data(s, buffer);
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<60, uint64_t> data(s, buffer);
 
       CHECK_EQUAL(60, data.size());
       CHECK_EQUAL(0, data.count());
@@ -244,8 +249,8 @@ namespace
     {
       const wchar_t* s = nullptr;
 
-      etl::bitset_ext<60, int64_t>::buffer_type buffer;
-      etl::bitset_ext<60, int64_t> data(s, buffer);
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<60, uint64_t> data(s, buffer);
 
       CHECK_EQUAL(60, data.size());
       CHECK_EQUAL(0, data.count());
@@ -256,8 +261,8 @@ namespace
     {
       const char16_t* s = nullptr;
 
-      etl::bitset_ext<60, int64_t>::buffer_type buffer;
-      etl::bitset_ext<60, int64_t> data(s, buffer);
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<60, uint64_t> data(s, buffer);
 
       CHECK_EQUAL(60, data.size());
       CHECK_EQUAL(0, data.count());
@@ -268,8 +273,8 @@ namespace
     {
       const char32_t* s = nullptr;
 
-      etl::bitset_ext<60, int64_t>::buffer_type buffer;
-      etl::bitset_ext<60, int64_t> data(s, buffer);
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<60, uint64_t> data(s, buffer);
 
       CHECK_EQUAL(60, data.size());
       CHECK_EQUAL(0, data.count());
@@ -278,9 +283,9 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_excess_string)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001111100001");
-      etl::bitset_ext<64, int64_t> data("110001001000110100010101100111001100010010001101000101011001111100001", buffer);
+      etl::bitset_ext<64, uint64_t> data("110001001000110100010101100111001100010010001101000101011001111100001", buffer);
 
       CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -299,9 +304,9 @@ namespace
     //*************************************************************************
     TEST(test_set)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare;
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       compare.set();
       data.set();
@@ -324,12 +329,40 @@ namespace
       }
     }
 
+    //*************************************************************************
+    TEST(test_set_less_than_full_size)
+    {
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer;
+      std::bitset<60> compare;
+      etl::bitset_ext<60, uint64_t> data(buffer);
+
+      compare.set();
+      data.set();
+
+      auto size = data.size();
+      auto count = data.count();
+      auto none = data.none();
+      auto any = data.any();
+      auto all = data.all();
+
+      CHECK_EQUAL(compare.size(), size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(), none);
+      CHECK_EQUAL(compare.any(), any);
+      CHECK_EQUAL(compare.all(), all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
     //*************************************************************************
     TEST(test_set_with_char_string)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       data.set("110001001000110100010101100111001100010010001101000101011001");
 
@@ -348,9 +381,9 @@ namespace
     //*************************************************************************
     TEST(test_set_with_wchar_t_string)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare(L"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       data.set(L"110001001000110100010101100111001100010010001101000101011001");
 
@@ -369,9 +402,9 @@ namespace
     //*************************************************************************
     TEST(test_set_with_char16_t_string)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare(u"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       data.set(u"110001001000110100010101100111001100010010001101000101011001");
 
@@ -390,9 +423,9 @@ namespace
     //*************************************************************************
     TEST(test_set_with_char32_t_string)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare(U"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       data.set(U"110001001000110100010101100111001100010010001101000101011001");
 
@@ -413,8 +446,8 @@ namespace
     {
       const char* s = nullptr;
 
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t> data(buffer);
       data.set(s);
 
       CHECK_EQUAL(64, data.size());
@@ -426,8 +459,8 @@ namespace
     {
       const wchar_t* s = nullptr;
 
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t> data(buffer);
       data.set(s);
 
       CHECK_EQUAL(64, data.size());
@@ -439,8 +472,8 @@ namespace
     {
       const char16_t* s = nullptr;
 
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t> data(buffer);
       data.set(s);
 
       CHECK_EQUAL(64, data.size());
@@ -452,8 +485,8 @@ namespace
     {
       const char32_t* s = nullptr;
 
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t> data(buffer);
       data.set(s);
 
       CHECK_EQUAL(64, data.size());
@@ -463,9 +496,9 @@ namespace
     //*************************************************************************
     TEST(test_from_string_with_char)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       data.from_string("110001001000110100010101100111001100010010001101000101011001");
 
@@ -484,9 +517,9 @@ namespace
     //*************************************************************************
     TEST(test_from_string_with_wchar_t)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       data.from_string(L"110001001000110100010101100111001100010010001101000101011001");
 
@@ -505,9 +538,9 @@ namespace
     //*************************************************************************
     TEST(test_from_string_with_char16_t)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       data.from_string(u"110001001000110100010101100111001100010010001101000101011001");
 
@@ -526,9 +559,9 @@ namespace
     //*************************************************************************
     TEST(test_from_string_with_char32_t)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       data.from_string(U"110001001000110100010101100111001100010010001101000101011001");
 
@@ -549,8 +582,8 @@ namespace
     {
       const char* s = nullptr;
 
-      etl::bitset_ext<60, int64_t>::buffer_type buffer;
-      etl::bitset_ext<60, int64_t> data(buffer);
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<60, uint64_t> data(buffer);
       data.from_string(s);
 
       CHECK_EQUAL(60, data.size());
@@ -562,8 +595,8 @@ namespace
     {
       const wchar_t* s = nullptr;
 
-      etl::bitset_ext<60, int64_t>::buffer_type buffer;
-      etl::bitset_ext<60, int64_t> data(buffer);
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<60, uint64_t> data(buffer);
       data.from_string(s);
 
       CHECK_EQUAL(60, data.size());
@@ -575,8 +608,8 @@ namespace
     {
       const char16_t* s = nullptr;
 
-      etl::bitset_ext<60, int64_t>::buffer_type buffer;
-      etl::bitset_ext<60, int64_t> data(buffer);
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<60, uint64_t> data(buffer);
       data.from_string(s);
 
       CHECK_EQUAL(60, data.size());
@@ -588,8 +621,8 @@ namespace
     {
       const char16_t* s = nullptr;
 
-      etl::bitset_ext<60, int64_t>::buffer_type buffer;
-      etl::bitset_ext<60, int64_t> data(buffer);
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<60, uint64_t> data(buffer);
       data.from_string(s);
 
       CHECK_EQUAL(60, data.size());
@@ -599,8 +632,8 @@ namespace
     //*************************************************************************
     TEST(test_value_u8_min)
     {
-      etl::bitset_ext<8, int8_t>::buffer_type buffer;
-      etl::bitset_ext<8, int8_t> data((unsigned long long)etl::integral_limits<uint8_t>::min, buffer);
+      etl::bitset_ext<8, uint8_t>::buffer_type buffer;
+      etl::bitset_ext<8, uint8_t> data((unsigned long long)etl::integral_limits<uint8_t>::min, buffer);
       uint8_t value = data.value<uint8_t>();
 
       CHECK_EQUAL(std::numeric_limits<uint8_t>::min(), value);
@@ -609,8 +642,8 @@ namespace
     //*************************************************************************
     TEST(test_value_u8_max)
     {
-      etl::bitset_ext<8, int8_t>::buffer_type buffer;
-      etl::bitset_ext<8, int8_t> data((unsigned long long)etl::integral_limits<uint8_t>::max, buffer);
+      etl::bitset_ext<8, uint8_t>::buffer_type buffer;
+      etl::bitset_ext<8, uint8_t> data((unsigned long long)etl::integral_limits<uint8_t>::max, buffer);
       uint8_t value = data.value<uint8_t>();
 
       CHECK_EQUAL(std::numeric_limits<uint8_t>::max(), value);
@@ -619,28 +652,28 @@ namespace
     //*************************************************************************
     TEST(test_value_s8_min)
     {
-      etl::bitset_ext<8, int8_t>::buffer_type buffer;
-      etl::bitset_ext<8, int8_t> data((unsigned long long)etl::integral_limits<int8_t>::min, buffer);
-      int8_t value = data.value<int8_t>();
+      etl::bitset_ext<8, uint8_t>::buffer_type buffer;
+      etl::bitset_ext<8, uint8_t> data((unsigned long long)etl::integral_limits<uint8_t>::min, buffer);
+      uint8_t value = data.value<uint8_t>();
 
-      CHECK_EQUAL(std::numeric_limits<int8_t>::min(), value);
+      CHECK_EQUAL(std::numeric_limits<uint8_t>::min(), value);
     }
 
     //*************************************************************************
     TEST(test_value_s8_max)
     {
-      etl::bitset_ext<8, int8_t>::buffer_type buffer;
-      etl::bitset_ext<8, int8_t> data((unsigned long long)etl::integral_limits<int8_t>::max, buffer);
-      int8_t value = data.value<int8_t>();
+      etl::bitset_ext<8, uint8_t>::buffer_type buffer;
+      etl::bitset_ext<8, uint8_t> data((unsigned long long)etl::integral_limits<uint8_t>::max, buffer);
+      uint8_t value = data.value<uint8_t>();
 
-      CHECK_EQUAL(std::numeric_limits<int8_t>::max(), value);
+      CHECK_EQUAL(std::numeric_limits<uint8_t>::max(), value);
     }
 
     //*************************************************************************
     TEST(test_value_u16_min)
     {
-      etl::bitset_ext<16, int16_t>::buffer_type buffer;
-      etl::bitset_ext<16, int16_t> data((unsigned long long)etl::integral_limits<uint16_t>::min, buffer);
+      etl::bitset_ext<16, uint16_t>::buffer_type buffer;
+      etl::bitset_ext<16, uint16_t> data((unsigned long long)etl::integral_limits<uint16_t>::min, buffer);
       uint16_t value = data.value<uint16_t>();
 
       CHECK_EQUAL(std::numeric_limits<uint16_t>::min(), value);
@@ -649,8 +682,8 @@ namespace
     //*************************************************************************
     TEST(test_value_u16_max)
     {
-      etl::bitset_ext<16, int16_t>::buffer_type buffer;
-      etl::bitset_ext<16, int16_t> data((unsigned long long)etl::integral_limits<uint16_t>::max, buffer);
+      etl::bitset_ext<16, uint16_t>::buffer_type buffer;
+      etl::bitset_ext<16, uint16_t> data((unsigned long long)etl::integral_limits<uint16_t>::max, buffer);
       uint16_t value = data.value<uint16_t>();
 
       CHECK_EQUAL(std::numeric_limits<uint16_t>::max(), value);
@@ -659,109 +692,109 @@ namespace
     //*************************************************************************
     TEST(test_value_s16_min)
     {
-      etl::bitset_ext<16, int16_t>::buffer_type buffer;
-      etl::bitset_ext<16, int16_t> data((unsigned long long)etl::integral_limits<int16_t>::min, buffer);
-      int16_t value = data.value<int16_t>();
+      etl::bitset_ext<16, uint16_t>::buffer_type buffer;
+      etl::bitset_ext<16, uint16_t> data((unsigned long long)etl::integral_limits<uint16_t>::min, buffer);
+      uint16_t value = data.value<uint16_t>();
 
-      CHECK_EQUAL(std::numeric_limits<int16_t>::min(), value);
+      CHECK_EQUAL(std::numeric_limits<uint16_t>::min(), value);
     }
 
     //*************************************************************************
     TEST(test_value_s16_max)
     {
-      etl::bitset_ext<16, int16_t>::buffer_type buffer;
-      etl::bitset_ext<16, int16_t> data((unsigned long long)etl::integral_limits<int16_t>::max, buffer);
-      int16_t value = data.value<int16_t>();
+      etl::bitset_ext<16, uint16_t>::buffer_type buffer;
+      etl::bitset_ext<16, uint16_t> data((unsigned long long)etl::integral_limits<uint16_t>::max, buffer);
+      uint16_t value = data.value<uint16_t>();
 
-      CHECK_EQUAL(std::numeric_limits<int16_t>::max(), value);
+      CHECK_EQUAL(std::numeric_limits<uint16_t>::max(), value);
     }
 
     //*************************************************************************
     TEST(test_value_u32_min)
     {
-      etl::bitset_ext<32, int32_t>::buffer_type buffer;
-      etl::bitset_ext<32, int32_t> data((unsigned long long)etl::integral_limits<int32_t>::min, buffer);
-      int32_t value = data.value<int32_t>();
+      etl::bitset_ext<32, uint32_t>::buffer_type buffer;
+      etl::bitset_ext<32, uint32_t> data((unsigned long long)etl::integral_limits<uint32_t>::min, buffer);
+      uint32_t value = data.value<uint32_t>();
 
-      CHECK_EQUAL(std::numeric_limits<int32_t>::min(), value);
+      CHECK_EQUAL(std::numeric_limits<uint32_t>::min(), value);
     }
 
     //*************************************************************************
     TEST(test_value_u32_max)
     {
-      etl::bitset_ext<32, int32_t>::buffer_type buffer;
-      etl::bitset_ext<32, int32_t> data((unsigned long long)etl::integral_limits<int32_t>::max, buffer);
-      int32_t value = data.value<int32_t>();
+      etl::bitset_ext<32, uint32_t>::buffer_type buffer;
+      etl::bitset_ext<32, uint32_t> data((unsigned long long)etl::integral_limits<uint32_t>::max, buffer);
+      uint32_t value = data.value<uint32_t>();
 
-      CHECK_EQUAL(std::numeric_limits<int32_t>::max(), value);
+      CHECK_EQUAL(std::numeric_limits<uint32_t>::max(), value);
     }
 
     //*************************************************************************
     TEST(test_value_s32_min)
     {
-      etl::bitset_ext<32, int32_t>::buffer_type buffer;
-      etl::bitset_ext<32, int32_t> data((unsigned long long)etl::integral_limits<int32_t>::min, buffer);
-      int32_t value = data.value<int32_t>();
+      etl::bitset_ext<32, uint32_t>::buffer_type buffer;
+      etl::bitset_ext<32, uint32_t> data((unsigned long long)etl::integral_limits<uint32_t>::min, buffer);
+      uint32_t value = data.value<uint32_t>();
 
-      CHECK_EQUAL(std::numeric_limits<int32_t>::min(), value);
+      CHECK_EQUAL(std::numeric_limits<uint32_t>::min(), value);
     }
 
     //*************************************************************************
     TEST(test_value_s32_max)
     {
-      etl::bitset_ext<32, int32_t>::buffer_type buffer;
-      etl::bitset_ext<32, int32_t> data((unsigned long long)etl::integral_limits<int32_t>::max, buffer);
-      int32_t value = data.value<int32_t>();
+      etl::bitset_ext<32, uint32_t>::buffer_type buffer;
+      etl::bitset_ext<32, uint32_t> data((unsigned long long)etl::integral_limits<uint32_t>::max, buffer);
+      uint32_t value = data.value<uint32_t>();
 
-      CHECK_EQUAL(std::numeric_limits<int32_t>::max(), value);
+      CHECK_EQUAL(std::numeric_limits<uint32_t>::max(), value);
     }
 
     //*************************************************************************
     TEST(test_value_u64_min)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
-      etl::bitset_ext<64, int64_t> data((unsigned long long)etl::integral_limits<int64_t>::min, buffer);
-      int64_t value = data.value<int64_t>();
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t> data((unsigned long long)etl::integral_limits<uint64_t>::min, buffer);
+      uint64_t value = data.value<uint64_t>();
 
-      CHECK_EQUAL(std::numeric_limits<int64_t>::min(), value);
+      CHECK_EQUAL(std::numeric_limits<uint64_t>::min(), value);
     }
 
     //*************************************************************************
     TEST(test_value_u64_max)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
-      etl::bitset_ext<64, int64_t> data((unsigned long long)etl::integral_limits<int64_t>::max, buffer);
-      int64_t value = data.value<int64_t>();
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t> data((unsigned long long)etl::integral_limits<uint64_t>::max, buffer);
+      uint64_t value = data.value<uint64_t>();
 
-      CHECK_EQUAL(std::numeric_limits<int64_t>::max(), value);
+      CHECK_EQUAL(std::numeric_limits<uint64_t>::max(), value);
     }
 
     //*************************************************************************
     TEST(test_value_s64_min)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
-      etl::bitset_ext<64, int64_t> data((unsigned long long)etl::integral_limits<int64_t>::min, buffer);
-      int64_t value = data.value<int64_t>();
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t> data((unsigned long long)etl::integral_limits<uint64_t>::min, buffer);
+      uint64_t value = data.value<uint64_t>();
 
-      CHECK_EQUAL(std::numeric_limits<int64_t>::min(), value);
+      CHECK_EQUAL(std::numeric_limits<uint64_t>::min(), value);
     }
 
     //*************************************************************************
     TEST(test_value_s64_max)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
-      etl::bitset_ext<64, int64_t> data((unsigned long long)etl::integral_limits<int64_t>::max, buffer);
-      int64_t value = data.value<int64_t>();
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t> data((unsigned long long)etl::integral_limits<uint64_t>::max, buffer);
+      uint64_t value = data.value<uint64_t>();
 
-      CHECK_EQUAL(std::numeric_limits<int64_t>::max(), value);
+      CHECK_EQUAL(std::numeric_limits<uint64_t>::max(), value);
     }
 
     //*************************************************************************
     TEST(test_position_set)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare;
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -793,9 +826,9 @@ namespace
     //*************************************************************************
     TEST(test_reset)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare(0xFFFFFFFFFFFFFFFULL);
-      etl::bitset_ext<64, int64_t> data(0xFFFFFFFFFFFFFFFULL, buffer);
+      etl::bitset_ext<64, uint64_t> data(0xFFFFFFFFFFFFFFFULL, buffer);
 
       compare.reset();
       data.reset();
@@ -815,9 +848,9 @@ namespace
     //*************************************************************************
     TEST(test_position_reset)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare(0xFFFFFFFFFFFFFFFULL);
-      etl::bitset_ext<64, int64_t> data(0xFFFFFFFFFFFFFFFULL, buffer);
+      etl::bitset_ext<64, uint64_t> data(0xFFFFFFFFFFFFFFFULL, buffer);
 
       compare.reset(1);
       compare.reset(3);
@@ -871,9 +904,9 @@ namespace
     //*************************************************************************
     TEST(test_index_operator_read)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare(0x3123456731234567ULL);
-      etl::bitset_ext<64, int64_t> data(0x3123456731234567ULL, buffer);
+      etl::bitset_ext<64, uint64_t> data(0x3123456731234567ULL, buffer);
 
       bool bc0 = compare[1U];
       bool bd0 = data[1U];
@@ -895,8 +928,8 @@ namespace
     //*************************************************************************
     TEST(test_index_operator_write)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       data[1U]  = true;
       data[3U]  = true;
@@ -912,14 +945,14 @@ namespace
     //*************************************************************************
     TEST(test_any)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer2;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer3;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer4;
-      etl::bitset_ext<64, int64_t> data1(ull(0x0000000000000000), buffer1);
-      etl::bitset_ext<64, int64_t> data2(ull(0x0000010000000000), buffer2);
-      etl::bitset_ext<64, int64_t> data3(ull(0x1000010001000100), buffer3);
-      etl::bitset_ext<64, int64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer4;
+      etl::bitset_ext<64, uint64_t> data1(ull(0x0000000000000000), buffer1);
+      etl::bitset_ext<64, uint64_t> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<64, uint64_t> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<64, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
 
       bool bd1 = data1.any();
       bool bd2 = data2.any();
@@ -935,14 +968,14 @@ namespace
     //*************************************************************************
     TEST(test_any_with_mask)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer2;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer3;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer4;
-      etl::bitset_ext<64, int64_t> data1(ull(0xF000000000000000), buffer1);
-      etl::bitset_ext<64, int64_t> data2(ull(0x0000010000000000), buffer2);
-      etl::bitset_ext<64, int64_t> data3(ull(0x1000010001000100), buffer3);
-      etl::bitset_ext<64, int64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer4;
+      etl::bitset_ext<64, uint64_t> data1(ull(0xF000000000000000), buffer1);
+      etl::bitset_ext<64, uint64_t> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<64, uint64_t> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<64, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
 
       ull mask = ull(0x0FFFFFFFFFFFFFFF);
 
@@ -960,14 +993,14 @@ namespace
     //*************************************************************************
     TEST(test_none)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer2;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer3;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer4;
-      etl::bitset_ext<64, int64_t> data1(ull(0x0000000000000000), buffer1);
-      etl::bitset_ext<64, int64_t> data2(ull(0x0000010000000000), buffer2);
-      etl::bitset_ext<64, int64_t> data3(ull(0x1000010001000100), buffer3);
-      etl::bitset_ext<64, int64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer4;
+      etl::bitset_ext<64, uint64_t> data1(ull(0x0000000000000000), buffer1);
+      etl::bitset_ext<64, uint64_t> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<64, uint64_t> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<64, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
 
       bool bd1 = data1.none();
       bool bd2 = data2.none();
@@ -983,14 +1016,14 @@ namespace
     //*************************************************************************
     TEST(test_none_with_mask)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer2;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer3;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer4;
-      etl::bitset_ext<64, int64_t> data1(ull(0xF000000000000000), buffer1);
-      etl::bitset_ext<64, int64_t> data2(ull(0x0000010000000000), buffer2);
-      etl::bitset_ext<64, int64_t> data3(ull(0x1000010001000100), buffer3);
-      etl::bitset_ext<64, int64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer4;
+      etl::bitset_ext<64, uint64_t> data1(ull(0xF000000000000000), buffer1);
+      etl::bitset_ext<64, uint64_t> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<64, uint64_t> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<64, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
 
       ull mask = ull(0x0FFFFFFFFFFFFFFF);
 
@@ -1008,14 +1041,14 @@ namespace
     //*************************************************************************
     TEST(test_all)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer2;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer3;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer4;
-      etl::bitset_ext<64, int64_t> data1(ull(0x0000000000000000), buffer1);
-      etl::bitset_ext<64, int64_t> data2(ull(0x0000010000000000), buffer2);
-      etl::bitset_ext<64, int64_t> data3(ull(0x1000010001000100), buffer3);
-      etl::bitset_ext<64, int64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer4;
+      etl::bitset_ext<64, uint64_t> data1(ull(0x0000000000000000), buffer1);
+      etl::bitset_ext<64, uint64_t> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<64, uint64_t> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<64, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
 
       bool bd1 = data1.all();
       bool bd2 = data2.all();
@@ -1031,14 +1064,14 @@ namespace
     //*************************************************************************
     TEST(test_all_with_mask)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer2;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer3;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer4;
-      etl::bitset_ext<64, int64_t> data1(ull(0x0000000000000000), buffer1);
-      etl::bitset_ext<64, int64_t> data2(ull(0x0000010000000000), buffer2);
-      etl::bitset_ext<64, int64_t> data3(ull(0x1000010001000100), buffer3);
-      etl::bitset_ext<64, int64_t> data4(ull(0x0FFFFFFFFFFFFFFF), buffer4);
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer4;
+      etl::bitset_ext<64, uint64_t> data1(ull(0x0000000000000000), buffer1);
+      etl::bitset_ext<64, uint64_t> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<64, uint64_t> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<64, uint64_t> data4(ull(0x0FFFFFFFFFFFFFFF), buffer4);
 
       ull mask = ull(0x0FFFFFFFFFFFFFFF);
 
@@ -1053,12 +1086,156 @@ namespace
       CHECK_TRUE(bd4);
     }
 
+    //*************************************************************************
+    TEST(test_any_with_reduced_active_bits)
+    {
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer4;
+      etl::bitset_ext<60, uint64_t> data1(ull(0x0000000000000000), buffer1);
+      etl::bitset_ext<60, uint64_t> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<60, uint64_t> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<60, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
+
+      bool bd1 = data1.any();
+      bool bd2 = data2.any();
+      bool bd3 = data3.any();
+      bool bd4 = data4.any();
+
+      CHECK_FALSE(bd1);
+      CHECK_TRUE(bd2);
+      CHECK_TRUE(bd3);
+      CHECK_TRUE(bd4);
+    }
+
+    //*************************************************************************
+    TEST(test_any_with_mask_with_reduced_active_bits)
+    {
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer4;
+      etl::bitset_ext<60, uint64_t> data1(ull(0x0000000000000000), buffer1);
+      etl::bitset_ext<60, uint64_t> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<60, uint64_t> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<60, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
+
+      ull mask = ull(0x0FFFFFFFFFFFFFFF);
+
+      bool bd1 = data1.any(mask);
+      bool bd2 = data2.any(mask);
+      bool bd3 = data3.any(mask);
+      bool bd4 = data4.any(mask);
+
+      CHECK_FALSE(bd1);
+      CHECK_TRUE(bd2);
+      CHECK_TRUE(bd3);
+      CHECK_TRUE(bd4);
+    }
+
+    //*************************************************************************
+    TEST(test_none_with_reduced_active_bits)
+    {
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer4;
+      etl::bitset_ext<60, uint64_t> data1(ull(0x0000000000000000), buffer1);
+      etl::bitset_ext<60, uint64_t> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<60, uint64_t> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<60, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
+
+      bool bd1 = data1.none();
+      bool bd2 = data2.none();
+      bool bd3 = data3.none();
+      bool bd4 = data4.none();
+
+      CHECK_TRUE(bd1);
+      CHECK_FALSE(bd2);
+      CHECK_FALSE(bd3);
+      CHECK_FALSE(bd4);
+    }
+
+    //*************************************************************************
+    TEST(test_none_with_mask_with_reduced_active_bits)
+    {
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer4;
+      etl::bitset_ext<60, uint64_t> data1(ull(0x0000000000000000), buffer1);
+      etl::bitset_ext<60, uint64_t> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<60, uint64_t> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<60, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
+
+      ull mask = ull(0x0FFFFFFFFFFFFFFF);
+
+      bool bd1 = data1.none(mask);
+      bool bd2 = data2.none(mask);
+      bool bd3 = data3.none(mask);
+      bool bd4 = data4.none(mask);
+
+      CHECK_TRUE(bd1);
+      CHECK_FALSE(bd2);
+      CHECK_FALSE(bd3);
+      CHECK_FALSE(bd4);
+    }
+
+    //*************************************************************************
+    TEST(test_all_with_reduced_active_bits)
+    {
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer4;
+      etl::bitset_ext<60, uint64_t> data1(ull(0x0000000000000000), buffer1);
+      etl::bitset_ext<60, uint64_t> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<60, uint64_t> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<60, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
+
+      bool bd1 = data1.all();
+      bool bd2 = data2.all();
+      bool bd3 = data3.all();
+      bool bd4 = data4.all();
+
+      CHECK_FALSE(bd1);
+      CHECK_FALSE(bd2);
+      CHECK_FALSE(bd3);
+      CHECK_TRUE(bd4);
+    }
+
+    //*************************************************************************
+    TEST(test_all_with_mask_with_reduced_active_bits)
+    {
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<60, uint64_t>::buffer_type buffer4;
+      etl::bitset_ext<60, uint64_t> data1(ull(0x0000000000000000), buffer1);
+      etl::bitset_ext<60, uint64_t> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<60, uint64_t> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<60, uint64_t> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
+
+      ull mask = ull(0x00FFFFFFFFFFFFFF);
+
+      bool bd1 = data1.all(mask);
+      bool bd2 = data2.all(mask);
+      bool bd3 = data3.all(mask);
+      bool bd4 = data4.all(mask);
+
+      CHECK_FALSE(bd1);
+      CHECK_FALSE(bd2);
+      CHECK_FALSE(bd3);
+      CHECK_TRUE(bd4);
+    }
+
     //*************************************************************************
     TEST(test_flip)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare;
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       compare.flip();
       data.flip();
@@ -1072,9 +1249,9 @@ namespace
     //*************************************************************************
     TEST(test_flip_position)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare;
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       compare.flip(1);
       compare.flip(3);
@@ -1095,9 +1272,9 @@ namespace
     //*************************************************************************
     TEST(test_flip_reference)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare;
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       compare[1].flip();
       compare[3].flip();
@@ -1118,9 +1295,9 @@ namespace
     //*************************************************************************
     TEST(test_invert_reference)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
       std::bitset<64> compare;
-      etl::bitset_ext<64, int64_t> data(buffer);
+      etl::bitset_ext<64, uint64_t> data(buffer);
 
       bool bc = ~compare[3];
       bool bd = ~data[3];
@@ -1128,18 +1305,18 @@ namespace
     }
 
     //*************************************************************************
-    void test_assignment_operator_helper(etl::bitset_ext<64, int64_t>& from, etl::bitset_ext<64, int64_t>& to)
+    void test_assignment_operator_helper(etl::bitset_ext<64, uint64_t>& from, etl::bitset_ext<64, uint64_t>& to)
     {
       to = from;
     }
 
     TEST(test_assignment_operator)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer2;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer2;
       std::bitset<64> compare(0xFFFFFFFFFFFFFFFULL);
-      etl::bitset_ext<64, int64_t> data1(0xFFFFFFFFFFFFFFFULL, buffer1);
-      etl::bitset_ext<64, int64_t> data2(buffer2);
+      etl::bitset_ext<64, uint64_t> data1(0xFFFFFFFFFFFFFFFULL, buffer1);
+      etl::bitset_ext<64, uint64_t> data2(buffer2);
 
       test_assignment_operator_helper(data1, data2);
 
@@ -1152,12 +1329,12 @@ namespace
     //*************************************************************************
     TEST(test_equality_operator)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer2;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer3;
-      etl::bitset_ext<64, int64_t> data1(0x123456781234567ULL, buffer1);
-      etl::bitset_ext<64, int64_t> data2(0x123456781234567ULL, buffer2);
-      etl::bitset_ext<64, int64_t> data3(buffer3);
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<64, uint64_t> data1(0x123456781234567ULL, buffer1);
+      etl::bitset_ext<64, uint64_t> data2(0x123456781234567ULL, buffer2);
+      etl::bitset_ext<64, uint64_t> data3(buffer3);
 
       bool equal     =  (data1 == data2);
       bool not_equal = !(data1 == data3);
@@ -1169,12 +1346,12 @@ namespace
     //*************************************************************************
     TEST(test_inequality_operator)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer2;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer3;
-      etl::bitset_ext<64, int64_t> data1(0x123456781234567ULL, buffer1);
-      etl::bitset_ext<64, int64_t> data2(0x123456781234567ULL, buffer2);
-      etl::bitset_ext<64, int64_t> data3(buffer3);
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<64, uint64_t> data1(0x123456781234567ULL, buffer1);
+      etl::bitset_ext<64, uint64_t> data2(0x123456781234567ULL, buffer2);
+      etl::bitset_ext<64, uint64_t> data3(buffer3);
 
       bool equal     = !(data1 != data2);
       bool not_equal = (data1 != data3);
@@ -1186,71 +1363,71 @@ namespace
     //*************************************************************************
     TEST(test_shift_left_operator)
     {
-      int64_t value = 0x0123456789ABCDEFULL;
+      uint64_t value = 0x0123456789ABCDEFULL;
       uint64_t mask = 0xFFFFFFFFFFFFFFFFULL;
 
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer2;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer2;
 
-      etl::bitset_ext<64, int64_t> original(0x0123456789ABCDEFULL, buffer1);
+      etl::bitset_ext<64, uint64_t> original(0x0123456789ABCDEFULL, buffer1);
 
       for (ull shift = 0U; shift < 64U; ++shift)
       {
-        etl::bitset_ext<64, int64_t> data(original, buffer2);
-        CHECK_EQUAL_HEX(((value & mask) << shift), (data <<= shift).value<int64_t>());
+        etl::bitset_ext<64, uint64_t> data(original, buffer2);
+        CHECK_EQUAL_HEX(((value & mask) << shift), (data <<= shift).value<uint64_t>());
         mask >>= 1;
       }
 
-      etl::bitset_ext<64, int64_t> data(original, buffer2);
-      CHECK_EQUAL_HEX(0ULL, (data <<= 64U).value<int64_t>());
+      etl::bitset_ext<64, uint64_t> data(original, buffer2);
+      CHECK_EQUAL_HEX(0ULL, (data <<= 64U).value<uint64_t>());
     }
 
     //*************************************************************************
     TEST(test_shift_left_operator_overflow)
     {
-      etl::bitset_ext<32, int32_t>::buffer_type buffer1;
-      etl::bitset_ext<32, int32_t>::buffer_type buffer2;
+      etl::bitset_ext<32, uint32_t>::buffer_type buffer1;
+      etl::bitset_ext<32, uint32_t>::buffer_type buffer2;
 
-      etl::bitset_ext<32, int32_t> data(0xFFFFFFFFULL, buffer1);
+      etl::bitset_ext<32, uint32_t> data(0xFFFFFFFFULL, buffer1);
       data <<= 1U;
-      etl::bitset_ext<32, int32_t> shifted(0xFFFFFFFEUL, buffer2);
+      etl::bitset_ext<32, uint32_t> shifted(0xFFFFFFFEUL, buffer2);
 
-      CHECK_EQUAL_HEX(shifted.value<int32_t>(), data.value<int32_t>());
+      CHECK_EQUAL_HEX(shifted.value<uint32_t>(), data.value<uint32_t>());
     }
 
     //*************************************************************************
     TEST(test_shift_right_operator)
     {
-      int64_t value = 0x0123456789ABCDEFULL;
+      uint64_t value = 0x0123456789ABCDEFULL;
 
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer2;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer2;
 
-      etl::bitset_ext<64, int64_t> original(0x0123456789ABCDEFULL, buffer1);
+      etl::bitset_ext<64, uint64_t> original(0x0123456789ABCDEFULL, buffer1);
       
       for (ull shift = 0U; shift < 64U; ++shift)
       {
-        etl::bitset_ext<64, int64_t> data(original, buffer2);
-        CHECK_EQUAL_HEX((value >> shift), (data >>= shift).value<int64_t>());
+        etl::bitset_ext<64, uint64_t> data(original, buffer2);
+        CHECK_EQUAL_HEX((value >> shift), (data >>= shift).value<uint64_t>());
       }
 
-      etl::bitset_ext<64, int64_t> data(original, buffer2);
-      CHECK_EQUAL_HEX(0ULL, (data >>= 64U).value<int64_t>());
+      etl::bitset_ext<64, uint64_t> data(original, buffer2);
+      CHECK_EQUAL_HEX(0ULL, (data >>= 64U).value<uint64_t>());
     }
 
     //*************************************************************************
     TEST(test_and_equals_operator)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer2;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer3;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer4;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer4;
 
-      etl::bitset_ext<64, int64_t> data1(0x12345678UL, buffer1);
-      etl::bitset_ext<64, int64_t> data2(0x23456789UL, buffer2);
-      etl::bitset_ext<64, int64_t> data3(0x12345678UL & 0x23456789UL, buffer3);
+      etl::bitset_ext<64, uint64_t> data1(0x12345678UL, buffer1);
+      etl::bitset_ext<64, uint64_t> data2(0x23456789UL, buffer2);
+      etl::bitset_ext<64, uint64_t> data3(0x12345678UL & 0x23456789UL, buffer3);
 
-      etl::bitset_ext<64, int64_t> data4(data1, buffer4);
+      etl::bitset_ext<64, uint64_t> data4(data1, buffer4);
       data4 &= data2;
       CHECK(data3 == data4);
     }
@@ -1258,16 +1435,16 @@ namespace
     //*************************************************************************
     TEST(test_or_equals_operator)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer2;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer3;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer4;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer4;
 
-      etl::bitset_ext<64, int64_t> data1(0x12345678UL, buffer1);
-      etl::bitset_ext<64, int64_t> data2(0x23456789UL, buffer2);
-      etl::bitset_ext<64, int64_t> data3(0x12345678UL | 0x23456789UL, buffer3);
+      etl::bitset_ext<64, uint64_t> data1(0x12345678UL, buffer1);
+      etl::bitset_ext<64, uint64_t> data2(0x23456789UL, buffer2);
+      etl::bitset_ext<64, uint64_t> data3(0x12345678UL | 0x23456789UL, buffer3);
 
-      etl::bitset_ext<64, int64_t> data4(data1, buffer4);
+      etl::bitset_ext<64, uint64_t> data4(data1, buffer4);
       data4 |= data2;
       CHECK(data3 == data4);
     }
@@ -1275,16 +1452,16 @@ namespace
     //*************************************************************************
     TEST(test_xor_equals_operator)
     {
-      etl::bitset_ext<64, int64_t>::buffer_type buffer1;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer2;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer3;
-      etl::bitset_ext<64, int64_t>::buffer_type buffer4;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer1;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer2;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer4;
 
-      etl::bitset_ext<64, int64_t> data1(0x12345678UL, buffer1);
-      etl::bitset_ext<64, int64_t> data2(0x23456789UL, buffer2);
-      etl::bitset_ext<64, int64_t> data3(0x12345678UL ^ 0x23456789UL, buffer3);
+      etl::bitset_ext<64, uint64_t> data1(0x12345678UL, buffer1);
+      etl::bitset_ext<64, uint64_t> data2(0x23456789UL, buffer2);
+      etl::bitset_ext<64, uint64_t> data3(0x12345678UL ^ 0x23456789UL, buffer3);
 
-      etl::bitset_ext<64, int64_t> data4(data1, buffer4);
+      etl::bitset_ext<64, uint64_t> data4(data1, buffer4);
       data4 ^= data2;
       CHECK(data3 == data4);
     }
@@ -1292,45 +1469,45 @@ namespace
     //*************************************************************************
     TEST(test_find_first)
     {
-      etl::bitset_ext<8, int8_t>::buffer_type buffer;
+      etl::bitset_ext<8, uint8_t>::buffer_type buffer;
 
-      etl::bitset_ext<8, int8_t> bs1(ull(0x00), buffer);
+      etl::bitset_ext<8, uint8_t> bs1(ull(0x00), buffer);
       size_t bs1fff = bs1.find_first(false);
       size_t bs1fft = bs1.find_first(true);
       CHECK_EQUAL(0U, bs1fff);
       CHECK_EQUAL(etl::bitset_ext<>::npos, bs1fft);
 
-      etl::bitset_ext<8, int8_t> bs2(ull(0xFF), buffer);
+      etl::bitset_ext<8, uint8_t> bs2(ull(0xFF), buffer);
       size_t bs2fff = bs2.find_first(false);
       size_t bs2fft = bs2.find_first(true);
       CHECK_EQUAL(etl::bitset_ext<>::npos, bs2fff);
       CHECK_EQUAL(0U, bs2fft);
 
-      etl::bitset_ext<8, int8_t> bs3(ull(0x01), buffer);
+      etl::bitset_ext<8, uint8_t> bs3(ull(0x01), buffer);
       size_t bs3fff = bs3.find_first(false);
       size_t bs3fft = bs3.find_first(true);
       CHECK_EQUAL(1U, bs3fff);
       CHECK_EQUAL(0U, bs3fft);
 
-      etl::bitset_ext<8, int8_t> bs4(ull(0x20), buffer);
+      etl::bitset_ext<8, uint8_t> bs4(ull(0x20), buffer);
       size_t bs4fff = bs4.find_first(false);
       size_t bs4fft = bs4.find_first(true);
       CHECK_EQUAL(0U, bs4fff);
       CHECK_EQUAL(5U, bs4fft);
 
-      etl::bitset_ext<8, int8_t> bs5(ull(0x21), buffer);
+      etl::bitset_ext<8, uint8_t> bs5(ull(0x21), buffer);
       size_t bs5fff = bs5.find_first(false);
       size_t bs5fft = bs5.find_first(true);
       CHECK_EQUAL(1U, bs5fff);
       CHECK_EQUAL(0U, bs5fft);
 
-      etl::bitset_ext<8, int8_t> bs6(ull(0x0E), buffer);
+      etl::bitset_ext<8, uint8_t> bs6(ull(0x0E), buffer);
       size_t bs6fff = bs6.find_first(false);
       size_t bs6fft = bs6.find_first(true);
       CHECK_EQUAL(0U, bs6fff);
       CHECK_EQUAL(1U, bs6fft);
 
-      etl::bitset_ext<8, int8_t> bs7(ull(0x31), buffer);
+      etl::bitset_ext<8, uint8_t> bs7(ull(0x31), buffer);
       size_t bs7fff = bs7.find_first(false);
       size_t bs7fft = bs7.find_first(true);
       CHECK_EQUAL(1U, bs7fff);
@@ -1340,9 +1517,9 @@ namespace
     //*************************************************************************
     TEST(test_find_next)
     {
-      etl::bitset_ext<8, int8_t>::buffer_type buffer;
+      etl::bitset_ext<8, uint8_t>::buffer_type buffer;
 
-      etl::bitset_ext<8, int8_t> bs1(ull(0x00), buffer);
+      etl::bitset_ext<8, uint8_t> bs1(ull(0x00), buffer);
       size_t bs1fnf0 = bs1.find_next(false, 0);
       size_t bs1fnf1 = bs1.find_next(false, 1);
       size_t bs1fnt2 = bs1.find_next(true, 2);
@@ -1350,7 +1527,7 @@ namespace
       CHECK_EQUAL(1U, bs1fnf1);
       CHECK_EQUAL(etl::bitset_ext<>::npos, bs1fnt2);
 
-      etl::bitset_ext<8, int8_t> bs2(ull(0xFF), buffer);
+      etl::bitset_ext<8, uint8_t> bs2(ull(0xFF), buffer);
       size_t bs2fnt0 = bs2.find_next(true, 0);
       size_t bs2fnt1 = bs2.find_next(true, 1);
       size_t bs2fnf2 = bs2.find_next(false, 2);
@@ -1358,7 +1535,7 @@ namespace
       CHECK_EQUAL(1U, bs2fnt1);
       CHECK_EQUAL(etl::bitset_ext<>::npos, bs2fnf2);
 
-      etl::bitset_ext<8, int8_t> bs3(ull(0x0E), buffer);
+      etl::bitset_ext<8, uint8_t> bs3(ull(0x0E), buffer);
       size_t bs3fnf0 = bs3.find_next(false, 0);
       size_t bs3fnt1 = bs3.find_next(true, 1);
       size_t bs3fnf2 = bs3.find_next(false, 2);
@@ -1366,7 +1543,7 @@ namespace
       CHECK_EQUAL(1U, bs3fnt1);
       CHECK_EQUAL(4U, bs3fnf2);
 
-      etl::bitset_ext<8, int8_t> bs4(ull(0x31), buffer);
+      etl::bitset_ext<8, uint8_t> bs4(ull(0x31), buffer);
       size_t bs4fnt0 = bs4.find_next(true, 0);
       size_t bs4fnf0 = bs4.find_next(false, 0);
       size_t bs4fnt1 = bs4.find_next(true, 1);
@@ -1378,15 +1555,15 @@ namespace
     //*************************************************************************
     TEST(test_swap)
     {
-      etl::bitset_ext<16, int16_t>::buffer_type buffer1;
-      etl::bitset_ext<16, int16_t>::buffer_type buffer2;
-      etl::bitset_ext<16, int16_t>::buffer_type buffer3;
-      etl::bitset_ext<16, int16_t>::buffer_type buffer4;
+      etl::bitset_ext<16, uint16_t>::buffer_type buffer1;
+      etl::bitset_ext<16, uint16_t>::buffer_type buffer2;
+      etl::bitset_ext<16, uint16_t>::buffer_type buffer3;
+      etl::bitset_ext<16, uint16_t>::buffer_type buffer4;
 
-      etl::bitset_ext<16, int16_t> compare1(0x2A, buffer1);
-      etl::bitset_ext<16, int16_t> compare2(0x15, buffer2);
-      etl::bitset_ext<16, int16_t> compare1a(0x2A, buffer3);
-      etl::bitset_ext<16, int16_t> compare2a(0x15, buffer4);
+      etl::bitset_ext<16, uint16_t> compare1(0x2A, buffer1);
+      etl::bitset_ext<16, uint16_t> compare2(0x15, buffer2);
+      etl::bitset_ext<16, uint16_t> compare1a(0x2A, buffer3);
+      etl::bitset_ext<16, uint16_t> compare2a(0x15, buffer4);
 
       swap(compare1a, compare2a);
 
@@ -1397,7 +1574,7 @@ namespace
     //*************************************************************************
     TEST(test_span)
     {
-      etl::bitset_ext<32, int32_t>::buffer_type buffer; 
+      etl::bitset_ext<32, uint32_t>::buffer_type buffer; 
       etl::bitset_ext<32, uint32_t> data(0x12345678UL, buffer);
 
       using span_t = etl::bitset_ext<32, uint32_t>::span_type;
@@ -1409,7 +1586,7 @@ namespace
     //*************************************************************************
     TEST(test_const_span)
     {
-      etl::bitset_ext<32, int32_t>::buffer_type buffer;
+      etl::bitset_ext<32, uint32_t>::buffer_type buffer;
       const etl::bitset_ext<32, uint32_t> data(0x12345678UL, buffer);
 
       using span_t = const etl::bitset_ext<32, uint32_t>::const_span_type;
@@ -1421,7 +1598,7 @@ namespace
     //*************************************************************************
     TEST(test_to_string)
     {
-      using bs32 = etl::bitset_ext<32, int32_t>;
+      using bs32 = etl::bitset_ext<32, uint32_t>;
 
       bs32::buffer_type buffer;
       bs32 data(0x12345678UL, buffer);
@@ -1437,7 +1614,7 @@ namespace
     //*************************************************************************
     TEST(test_to_wstring)
     {
-      using bs32 = etl::bitset_ext<32, int32_t>;
+      using bs32 = etl::bitset_ext<32, uint32_t>;
 
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
@@ -1452,7 +1629,7 @@ namespace
     //*************************************************************************
     TEST(test_to_u16string)
     {
-      using bs32 = etl::bitset_ext<32, int32_t>;
+      using bs32 = etl::bitset_ext<32, uint32_t>;
 
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
@@ -1467,7 +1644,7 @@ namespace
     //*************************************************************************
     TEST(test_to_u32string)
     {
-      using bs32 = etl::bitset_ext<32, int32_t>;
+      using bs32 = etl::bitset_ext<32, uint32_t>;
 
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
@@ -1568,16 +1745,16 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>( 0, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>( 1, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>( 2, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>( 3, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>( 4, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>( 5, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>( 6, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>( 7, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>( 8, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>(0, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>(1, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>(2, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>(3, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>(4, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>(5, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>(6, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>(7, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>(8, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>(9, 6)));
       CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t>(10, 6)));
       CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t>(11, 6)));
       CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t>(12, 6)));
@@ -1596,8 +1773,8 @@ namespace
       CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t>(25, 6)));
       CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t>(26, 6)));
 
-      CHECK_THROW(b.extract<int8_t>(26, 7), etl::bitset_overflow);
-      CHECK_THROW(b.extract<int8_t>(27, 6), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(27, 6), etl::bitset_overflow);
     }
 
     //*************************************************************************
@@ -1608,16 +1785,16 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t,  0, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t,  1, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t,  2, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t,  3, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t,  4, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t,  5, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t,  6, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t,  7, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t,  8, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t, 0, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t, 1, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t, 2, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t, 3, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t, 4, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t, 5, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t, 6, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t, 7, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t, 8, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t, 9, 6>()));
       CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 6>()));
       CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t, 11, 6>()));
       CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t, 12, 6>()));
@@ -1637,8 +1814,8 @@ namespace
       CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t, 26, 6>()));
 
       // The lines below should static assert.
-      //int8_t v1 = b.extract<int8_t, 26, 7>();
-      //int8_t v1 = b.extract<int8_t, 27, 6>();
+      //uint8_t v1 = b.extract<uint8_t, 26, 7>();
+      //uint8_t v1 = b.extract<uint8_t, 27, 6>();
     }
 
     //*************************************************************************
@@ -1726,34 +1903,34 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(int8_t(0x78), b.extract<int8_t>( 0, 8));
-      CHECK_EQUAL_HEX(int8_t(0x3C), b.extract<int8_t>( 1, 8));
-      CHECK_EQUAL_HEX(int8_t(0x9E), b.extract<int8_t>( 2, 8));
-      CHECK_EQUAL_HEX(int8_t(0xCF), b.extract<int8_t>( 3, 8));
-      CHECK_EQUAL_HEX(int8_t(0x67), b.extract<int8_t>( 4, 8));
-      CHECK_EQUAL_HEX(int8_t(0xB3), b.extract<int8_t>( 5, 8));
-      CHECK_EQUAL_HEX(int8_t(0x59), b.extract<int8_t>( 6, 8));
-      CHECK_EQUAL_HEX(int8_t(0xAC), b.extract<int8_t>( 7, 8));
-      CHECK_EQUAL_HEX(int8_t(0x56), b.extract<int8_t>( 8, 8));
-      CHECK_EQUAL_HEX(int8_t(0x2B), b.extract<int8_t>( 9, 8));
-      CHECK_EQUAL_HEX(int8_t(0x15), b.extract<int8_t>(10, 8));
-      CHECK_EQUAL_HEX(int8_t(0x8A), b.extract<int8_t>(11, 8));
-      CHECK_EQUAL_HEX(int8_t(0x45), b.extract<int8_t>(12, 8));
-      CHECK_EQUAL_HEX(int8_t(0xA2), b.extract<int8_t>(13, 8));
-      CHECK_EQUAL_HEX(int8_t(0xD1), b.extract<int8_t>(14, 8));
-      CHECK_EQUAL_HEX(int8_t(0x68), b.extract<int8_t>(15, 8));
-      CHECK_EQUAL_HEX(int8_t(0x34), b.extract<int8_t>(16, 8));
-      CHECK_EQUAL_HEX(int8_t(0x1A), b.extract<int8_t>(17, 8));
-      CHECK_EQUAL_HEX(int8_t(0x8D), b.extract<int8_t>(18, 8));
-      CHECK_EQUAL_HEX(int8_t(0x46), b.extract<int8_t>(19, 8));
-      CHECK_EQUAL_HEX(int8_t(0x23), b.extract<int8_t>(20, 8));
-      CHECK_EQUAL_HEX(int8_t(0x91), b.extract<int8_t>(21, 8));
-      CHECK_EQUAL_HEX(int8_t(0x48), b.extract<int8_t>(22, 8));
-      CHECK_EQUAL_HEX(int8_t(0x24), b.extract<int8_t>(23, 8));
-      CHECK_EQUAL_HEX(int8_t(0x12), b.extract<int8_t>(24, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x78), b.extract<uint8_t>( 0, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), b.extract<uint8_t>( 1, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), b.extract<uint8_t>( 2, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), b.extract<uint8_t>( 3, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x67), b.extract<uint8_t>( 4, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), b.extract<uint8_t>( 5, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x59), b.extract<uint8_t>( 6, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), b.extract<uint8_t>( 7, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x56), b.extract<uint8_t>( 8, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), b.extract<uint8_t>( 9, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x15), b.extract<uint8_t>(10, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), b.extract<uint8_t>(11, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x45), b.extract<uint8_t>(12, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), b.extract<uint8_t>(13, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), b.extract<uint8_t>(14, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x68), b.extract<uint8_t>(15, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x34), b.extract<uint8_t>(16, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), b.extract<uint8_t>(17, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), b.extract<uint8_t>(18, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x46), b.extract<uint8_t>(19, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x23), b.extract<uint8_t>(20, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x91), b.extract<uint8_t>(21, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x48), b.extract<uint8_t>(22, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
 
-      CHECK_THROW(b.extract<int8_t>(24, 9), etl::bitset_overflow);
-      CHECK_THROW(b.extract<int8_t>(25, 8), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(24, 9), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(25, 8), etl::bitset_overflow);
     }
 
     //*************************************************************************
@@ -1764,35 +1941,35 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(int8_t(0x78), (b.extract<int8_t,  0, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x3C), (b.extract<int8_t,  1, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x9E), (b.extract<int8_t,  2, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0xCF), (b.extract<int8_t,  3, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x67), (b.extract<int8_t,  4, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0xB3), (b.extract<int8_t,  5, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x59), (b.extract<int8_t,  6, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0xAC), (b.extract<int8_t,  7, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x56), (b.extract<int8_t,  8, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x2B), (b.extract<int8_t,  9, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x8A), (b.extract<int8_t, 11, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x45), (b.extract<int8_t, 12, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0xA2), (b.extract<int8_t, 13, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0xD1), (b.extract<int8_t, 14, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x68), (b.extract<int8_t, 15, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x34), (b.extract<int8_t, 16, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x8D), (b.extract<int8_t, 18, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x46), (b.extract<int8_t, 19, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x23), (b.extract<int8_t, 20, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x91), (b.extract<int8_t, 21, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x48), (b.extract<int8_t, 22, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x24), (b.extract<int8_t, 23, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x78), (b.extract<uint8_t,  0, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), (b.extract<uint8_t,  2, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), (b.extract<uint8_t,  3, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x67), (b.extract<uint8_t,  4, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), (b.extract<uint8_t,  5, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x59), (b.extract<uint8_t,  6, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), (b.extract<uint8_t,  7, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x56), (b.extract<uint8_t,  8, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), (b.extract<uint8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x45), (b.extract<uint8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), (b.extract<uint8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), (b.extract<uint8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x68), (b.extract<uint8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), (b.extract<uint8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x46), (b.extract<uint8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x91), (b.extract<uint8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x48), (b.extract<uint8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
 
       // The lines below should static assert.
-      //int8_t v1 = b.extract<int8_t, 24, 9>();
-      //int8_t v2 = b.extract<int8_t, 25, 8>();
+      //uint8_t v1 = b.extract<uint8_t, 24, 9>();
+      //uint8_t v2 = b.extract<uint8_t, 25, 8>();
     }
 
     //*************************************************************************
@@ -1931,26 +2108,26 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>( 0, 16));
-      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>( 1, 16));
-      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>( 2, 16));
-      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>( 3, 16));
-      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>( 4, 16));
-      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>( 5, 16));
-      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>( 6, 16));
-      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>( 7, 16));
-      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>( 8, 16));
-      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>( 9, 16));
-      CHECK_EQUAL_HEX(int16_t(0x8D15), b.extract<int16_t>(10, 16));
-      CHECK_EQUAL_HEX(int16_t(0x468A), b.extract<int16_t>(11, 16));
-      CHECK_EQUAL_HEX(int16_t(0x2345), b.extract<int16_t>(12, 16));
-      CHECK_EQUAL_HEX(int16_t(0x91A2), b.extract<int16_t>(13, 16));
-      CHECK_EQUAL_HEX(int16_t(0x48D1), b.extract<int16_t>(14, 16));
-      CHECK_EQUAL_HEX(int16_t(0x2468), b.extract<int16_t>(15, 16));
-      CHECK_EQUAL_HEX(int16_t(0x1234), b.extract<int16_t>(16, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x5678), b.extract<uint16_t>( 0, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), b.extract<uint16_t>( 1, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), b.extract<uint16_t>( 3, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), b.extract<uint16_t>( 4, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), b.extract<uint16_t>( 5, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), b.extract<uint16_t>( 6, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), b.extract<uint16_t>( 7, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), b.extract<uint16_t>( 8, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), b.extract<uint16_t>(10, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), b.extract<uint16_t>(11, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), b.extract<uint16_t>(12, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), b.extract<uint16_t>(13, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), b.extract<uint16_t>(14, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), b.extract<uint16_t>(15, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 16));
 
-      CHECK_THROW(b.extract<int16_t>(16, 17), etl::bitset_overflow);
-      CHECK_THROW(b.extract<int16_t>(17, 16), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(17, 16), etl::bitset_overflow);
     }
 
     //*************************************************************************
@@ -1961,27 +2138,27 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t,  0, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t,  1, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t,  2, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t,  3, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t,  4, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t,  5, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t,  6, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t,  7, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t,  8, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t,  9, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x8D15), (b.extract<int16_t, 10, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x468A), (b.extract<int16_t, 11, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x2345), (b.extract<int16_t, 12, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x91A2), (b.extract<int16_t, 13, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x48D1), (b.extract<int16_t, 14, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x2468), (b.extract<int16_t, 15, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x1234), (b.extract<int16_t, 16, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x5678), (b.extract<uint16_t,  0, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), (b.extract<uint16_t,  1, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), (b.extract<uint16_t,  3, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), (b.extract<uint16_t,  4, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), (b.extract<uint16_t,  5, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), (b.extract<uint16_t,  6, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), (b.extract<uint16_t,  7, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), (b.extract<uint16_t,  8, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), (b.extract<uint16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), (b.extract<uint16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), (b.extract<uint16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), (b.extract<uint16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), (b.extract<uint16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), (b.extract<uint16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 16>()));
 
       // The lines below should static assert.
-      //int16_t v1 = b.extract<int16_t, 16, 17>());
-      //int16_t v2 = b.extract<int16_t, 17, 16>());
+      //uint16_t v1 = b.extract<uint16_t, 16, 17>());
+      //uint16_t v2 = b.extract<uint16_t, 17, 16>());
     }
   };
 }

From a7271e470a2ccaaedd6150b76f76e10b849e167d Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Thu, 4 Jan 2024 00:03:20 +0000
Subject: [PATCH 025/131] Work in progress

Comprehensive bitset type comparisons
---
 include/etl/private/bitset_new.h              | 1089 +++++---
 test/test_bitset_new_comparisons.cpp          |  239 ++
 test/test_bitset_new_default_element_type.cpp | 2243 +++++++----------
 ...itset_new_explicit_single_element_type.cpp |   20 +-
 ...st_bitset_new_ext_default_element_type.cpp | 1981 +++++----------
 ...t_new_ext_explicit_single_element_type.cpp |   16 +-
 test/vs2022/etl.vcxproj                       |    1 +
 test/vs2022/etl.vcxproj.filters               |    9 +-
 8 files changed, 2552 insertions(+), 3046 deletions(-)
 create mode 100644 test/test_bitset_new_comparisons.cpp

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 7a4a7fa1..1f76a448 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -46,6 +46,8 @@ SOFTWARE.
 #include "../span.h"
 #include "../string.h"
 #include "../enum_type.h"
+#include "../largest.h"
+#include "../smallest.h"
 
 #include <string.h>
 #include <stddef.h>
@@ -86,7 +88,7 @@ namespace etl
   /// or spread over an array of elements.
   ///\ingroup bitset
   //***************************************************************************
-  struct bitset_layout
+  struct bitset_storage_model
   {
     static ETL_CONSTANT char Undefined = 0;
     static ETL_CONSTANT char Single    = 1;
@@ -161,7 +163,7 @@ namespace etl
   ///\ingroup bitset
   //*************************************************************************
   template <typename TElement>
-  class bitset_impl<TElement, etl::bitset_layout::Single>
+  class bitset_impl<TElement, etl::bitset_storage_model::Single>
   {
   public:
 
@@ -180,9 +182,9 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 
     static 
-    void set(pointer      pbuffer,
-             size_t       /*number_of_elements*/,
-             element_type top_mask) ETL_NOEXCEPT
+    void set_all(pointer      pbuffer,
+                 size_t       /*number_of_elements*/,
+                 element_type top_mask) ETL_NOEXCEPT
     {
       *pbuffer = All_Set_Element & top_mask;
     }
@@ -192,10 +194,9 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14
     static
-    void set(pointer pbuffer, 
-             size_t  /*number_of_elements*/, 
-             size_t  position, 
-             bool    value = true)
+    void set_position(pointer pbuffer, 
+                      size_t  position, 
+                      bool    value = true)
     {
       const element_type mask = element_type(element_type(1) << position);
 
@@ -214,8 +215,8 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14
     static
-    void reset(pointer pbuffer, 
-               size_t  /*number_of_elements*/) ETL_NOEXCEPT
+    void reset_all(pointer pbuffer, 
+                   size_t  /*number_of_elements*/) ETL_NOEXCEPT
     {
       *pbuffer = All_Clear_Element;
     }
@@ -225,9 +226,8 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14
     static
-    void reset(pointer pbuffer, 
-               size_t  /*number_of_elements*/, 
-               size_t  position)
+    void reset_position(pointer pbuffer, 
+                        size_t  position)
     {
       const element_type mask = element_type(element_type(1) << position);
       *pbuffer &= ~mask;
@@ -243,7 +243,7 @@ namespace etl
                      size_t      active_bits, 
                      const char* text) ETL_NOEXCEPT
     {
-      reset(pbuffer, 1U);
+      reset_all(pbuffer, 1U);
 
       if (text != ETL_NULLPTR)
       {
@@ -276,7 +276,7 @@ namespace etl
                      size_t         active_bits, 
                      const wchar_t* text) ETL_NOEXCEPT
     {
-      reset(pbuffer, 1U);
+      reset_all(pbuffer, 1U);
 
       if (text != ETL_NULLPTR)
       {
@@ -309,7 +309,7 @@ namespace etl
                      size_t          active_bits, 
                      const char16_t* text) ETL_NOEXCEPT
     {
-      reset(pbuffer, 1U);
+      reset_all(pbuffer, 1U);
 
       if (text != ETL_NULLPTR)
       {
@@ -342,7 +342,7 @@ namespace etl
                      size_t          active_bits, 
                      const char32_t* text) ETL_NOEXCEPT
     {
-      reset(pbuffer, 1U);
+      reset_all(pbuffer, 1U);
 
       if (text != ETL_NULLPTR)
       {
@@ -402,6 +402,29 @@ namespace etl
       return static_cast<T>(value);
     }
 
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
+    ETL_CONSTEXPR14
+      static
+      T extract(const_pointer pbuffer)
+    {
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      const unsigned_t Mask = etl::make_lsb_mask<unsigned_t>(Length);
+      const unsigned_t Shift = Position % Bits_Per_Element;
+
+      unsigned_t value = static_cast<unsigned_t>(*pbuffer >> Shift) & Mask;
+
+      if ((Length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T>(value, Length);
+      }
+
+      return static_cast<T>(value);
+    }
+
     //*************************************************************************
     /// Tests a bit at a position.
     /// Positions greater than the number of configured bits will return <b>false</b>.
@@ -409,7 +432,6 @@ namespace etl
     ETL_CONSTEXPR14 
     static 
     bool test(const_pointer pbuffer, 
-              size_t        /*number_of_elements*/, 
               size_t        position)
     {
       const element_type mask = element_type(element_type(1) << position);
@@ -503,8 +525,8 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 
     static 
-    void flip(pointer pbuffer, 
-              size_t  /*number_of_elements*/) ETL_NOEXCEPT
+    void flip_all(pointer pbuffer, 
+                     size_t  /*number_of_elements*/) ETL_NOEXCEPT
     {
       *pbuffer = ~*pbuffer;
     }
@@ -515,7 +537,6 @@ namespace etl
     ETL_CONSTEXPR14 
     static 
     void flip_bits(pointer      pbuffer, 
-                   size_t       /*number_of_elements*/, 
                    element_type mask = etl::integral_limits<element_type>::max) ETL_NOEXCEPT
     {
       *pbuffer ^= mask;
@@ -526,57 +547,20 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 
     static 
-    void flip(pointer pbuffer, 
-              size_t  /*number_of_elements*/, 
-              size_t  position)
+    void flip_position(pointer pbuffer, 
+                       size_t  position)
     {
       const element_type mask = element_type(element_type(1) << position);
       *pbuffer ^= mask;
     }
 
-    //*************************************************************************
-    /// Read [] operator.
-    //*************************************************************************
-    ETL_CONSTEXPR14 
-    static 
-    bool read_bit(const_pointer pbuffer, 
-                  size_t        active_bits, 
-                  size_t        /*number_of_elements*/, 
-                  size_t        position) ETL_NOEXCEPT
-    {
-      if (position < active_bits)
-      {
-        const element_type mask = element_type(element_type(1) << position);
-        return (*pbuffer & mask) != 0U;
-      }
-
-      return false;
-    }
-
-    //*************************************************************************
-    /// Write [] operator.
-    //*************************************************************************
-    ETL_CONSTEXPR14 
-    static 
-    void write_bit(pointer pbuffer, 
-                   size_t  /*number_of_elements*/, 
-                   size_t  position) ETL_NOEXCEPT
-    {
-      return bit_reference(*this, position);
-    }
-
     //*************************************************************************
     /// Returns a string representing the bitset.
     //*************************************************************************
-#if ETL_USING_CPP11
-    template <typename TString = etl::string<Active_Bits>>
-#else
     template <typename TString>
-#endif
     ETL_CONSTEXPR14 
     static 
     TString to_string(const_pointer pbuffer,
-                      size_t /*number_of_elements*/,
                       size_t active_bits,
                       typename TString::value_type zero = typename TString::value_type('0'),
                       typename TString::value_type one  = typename TString::value_type('1'))
@@ -590,7 +574,7 @@ namespace etl
 
       for (size_t i = active_bits; i > 0; --i)
       {
-        result[active_bits - i] = test(pbuffer, 0, i - 1) ? one : zero;
+        result[active_bits - i] = test(pbuffer, i - 1) ? one : zero;
       }
 
       return result;
@@ -715,7 +699,7 @@ namespace etl
     {
       if (shift >= active_bits)
       {
-        reset(pbuffer, 1U);
+        reset_all(pbuffer, 1U);
       }
       else
       {
@@ -735,7 +719,7 @@ namespace etl
     {
       if (shift >= active_bits)
       {
-        reset(pbuffer, 1U);
+        reset_all(pbuffer, 1U);
       }
       else
       {
@@ -787,7 +771,7 @@ namespace etl
   ///\ingroup bitset
   //*************************************************************************
   template <typename TElement>
-  class bitset_impl<TElement, etl::bitset_layout::Multi>
+  class bitset_impl<TElement, etl::bitset_storage_model::Multi>
   {
   public:
 
@@ -810,79 +794,135 @@ namespace etl
       static ETL_CONSTANT bool value = ((Position + Length - 1) >> etl::log2<Bits_Per_Element>::value) == (Position >> etl::log2<Bits_Per_Element>::value);
     };
 
-    //*************************************************************************
-    /// Count the number of bits set.
-    //*************************************************************************
-    ETL_CONSTEXPR14 
-    static 
-    size_t count(const_pointer pbuffer, 
-                 size_t        number_of_elements) ETL_NOEXCEPT
-    {
-      size_t n = 0UL;
-
-      for (size_t i = 0UL; i < number_of_elements; ++i)
-      {
-        n += etl::count_bits(pbuffer[i]);
-      }
-
-      return n;
-    }
-
     //*************************************************************************
     /// Tests a bit at a position.
     /// Positions greater than the number of configured bits will return <b>false</b>.
     //*************************************************************************
     ETL_CONSTEXPR14 
     static
-    bool test(const_pointer pbuffer, 
-              size_t        number_of_elements, 
+    bool test(const_pointer pbuffer,
               size_t        position) ETL_NOEXCEPT
     {
-      size_t       index = 0U;
-      element_type mask  = element_type(0);
-
-      if (number_of_elements == 1U)
-      {
-        index = 0;
-        mask = element_type(1) << position;
-      }
-      else
-      {
-        index = position >> etl::log2<Bits_Per_Element>::value;
-        mask = element_type(1) << (position & (Bits_Per_Element - 1));
-      }
+      size_t index      = position >> etl::log2<Bits_Per_Element>::value;
+      element_type mask = element_type(1) << (position & (Bits_Per_Element - 1));
 
       return (pbuffer[index] & mask) != 0;
     }
 
+    //*************************************************************************
+    /// Count the number of bits set.
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    size_t count(const_pointer pbuffer,
+                 size_t        number_of_elements) ETL_NOEXCEPT
+    {
+      size_t count = 0;
+
+      while (number_of_elements-- != 0)
+      {
+        count += etl::count_bits(*pbuffer++);
+      }
+
+      return count;
+    }
+
+    //*************************************************************************
+    // Are all the bits sets?
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    bool all(const_pointer pbuffer,
+             size_t        number_of_elements,
+             element_type  top_mask) ETL_NOEXCEPT
+    {
+      // All but the last.
+      while (number_of_elements-- != 1U)
+      {
+        if (*pbuffer++ != All_Set_Element)
+        {
+          return false;
+        }
+      }
+
+      // The last.
+      if ((*pbuffer & top_mask) != top_mask)
+      {
+        return false;
+      }
+
+      return true;
+    }
+
+    //*************************************************************************
+    /// Are none of the bits set?
+    //*************************************************************************
+    ETL_CONSTEXPR14
+      static
+      bool none(const_pointer pbuffer,
+                size_t        number_of_elements) ETL_NOEXCEPT
+    {
+      while (number_of_elements-- != 0)
+      {
+        if (*pbuffer++ != 0)
+        {
+          return false;
+        }
+      }
+
+      return true;
+    }
+
+    //*************************************************************************
+    /// Are any of the bits set?
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    bool any(const_pointer pbuffer,
+             size_t        number_of_elements) ETL_NOEXCEPT
+    {
+      bool any_set = false;
+
+      while (number_of_elements-- != 0)
+      {
+        if (*pbuffer++ != All_Clear_Element)
+        {
+          any_set = true;
+          break;
+        }
+      }
+
+      return any_set;
+    }
+
+    //*************************************************************************
+    /// Set all bits
+    //*************************************************************************
+    ETL_CONSTEXPR14
+    static
+    void set_all(pointer      pbuffer,
+                 size_t       number_of_elements,
+                 element_type top_mask) ETL_NOEXCEPT
+    {
+      while (number_of_elements-- != 1U)
+      {
+        *pbuffer++ = All_Set_Element;
+      }
+
+      *pbuffer = (All_Set_Element & top_mask);
+    }
 
     //*************************************************************************
     /// Set the bit at the position.
     //*************************************************************************
     ETL_CONSTEXPR14
     static
-    void set(pointer pbuffer, 
-             size_t  number_of_elements, 
-             size_t  position, 
-             bool    value = true) ETL_NOEXCEPT
+    void set_position(pointer pbuffer, 
+                      size_t  position, 
+                      bool    value = true) ETL_NOEXCEPT
     {
-      size_t    index = 0;
-      element_type bit = 0;
-
-      if (number_of_elements == 0) ETL_UNLIKELY
-      {
-        return;
-      }
-      else if (number_of_elements == 1U)
-      {
-        index = 0;
-        bit = element_type(1) << position;
-      }
-      else
-      {
-        index = position >> etl::log2<Bits_Per_Element>::value;
-        bit = element_type(1) << (position & (Bits_Per_Element - 1));
-      }
+      size_t       index = position >> etl::log2<Bits_Per_Element>::value;
+      element_type bit   = element_type(1) << (position & (Bits_Per_Element - 1));
 
       if (value)
       {
@@ -924,7 +964,7 @@ namespace etl
 
         while (i > 0)
         {
-          set(pbuffer, number_of_elements, --i, *text++ == ETL_STR('1'));
+          set_position(pbuffer, --i, *text++ == ETL_STR('1'));
         }
       }
     }
@@ -959,7 +999,7 @@ namespace etl
 
         while (i > 0)
         {
-          set(pbuffer, number_of_elements, --i, *text++ == ETL_STRL('1'));
+          set_position(pbuffer, --i, *text++ == ETL_STRL('1'));
         }
       }
     }
@@ -994,7 +1034,7 @@ namespace etl
 
         while (i > 0)
         {
-          set(pbuffer, number_of_elements, --i, *text++ == ETL_STRu('1'));
+          set_position(pbuffer, --i, *text++ == ETL_STRu('1'));
         }
       }
     }
@@ -1029,70 +1069,18 @@ namespace etl
 
         while (i > 0)
         {
-          set(pbuffer, number_of_elements, --i, *text++ == ETL_STRU('1'));
+          set_position(pbuffer, --i, *text++ == ETL_STRU('1'));
         }
       }
     }
 
-    //*************************************************************************
-    /// Set from a string.
-    //*************************************************************************
-    ETL_CONSTEXPR14 
-    static 
-    void set(pointer     pbuffer, 
-             size_t      number_of_elements, 
-             size_t      total_bits, 
-             const char* text) ETL_NOEXCEPT
-    {
-      from_string(pbuffer, number_of_elements, total_bits, text);
-    }
-
-    //*************************************************************************
-    /// Set from a wstring.
-    //*************************************************************************
-    ETL_CONSTEXPR14
-    static
-    void set(pointer        pbuffer, 
-             size_t         number_of_elements, 
-             size_t         total_bits, 
-             const wchar_t* text) ETL_NOEXCEPT
-    {
-      from_string(pbuffer, number_of_elements, total_bits, text);
-    }
-
-    //*************************************************************************
-    /// Set from a u16string.
-    //*************************************************************************
-    ETL_CONSTEXPR14
-    static
-    void set(pointer         pbuffer, 
-             size_t          number_of_elements, 
-             size_t          total_bits, 
-             const char16_t* text) ETL_NOEXCEPT
-    {
-      from_string(pbuffer, number_of_elements, total_bits, text);
-    }
-
-    //*************************************************************************
-    /// Set from a u32string.
-    //*************************************************************************
-    ETL_CONSTEXPR14
-    static
-    void set(pointer         pbuffer, 
-             size_t          number_of_elements, 
-             size_t          total_bits, 
-             const char32_t* text) ETL_NOEXCEPT
-    {
-      from_string(pbuffer, number_of_elements, total_bits, text);
-    }
-
     //*************************************************************************
     /// Reset all of the bits.
     //*************************************************************************
     ETL_CONSTEXPR14
     static
-    void reset(pointer pbuffer, 
-               size_t  number_of_elements) ETL_NOEXCEPT
+    void reset_all(pointer pbuffer,
+                   size_t  number_of_elements) ETL_NOEXCEPT
     {
       while (number_of_elements-- != 0U)
       {
@@ -1105,9 +1093,8 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14
     static
-    void reset(pointer pbuffer, 
-               size_t  number_of_elements, 
-               size_t  position) ETL_NOEXCEPT
+    void reset_position(pointer pbuffer, 
+                        size_t  position) ETL_NOEXCEPT
     {
       const size_t       index = position >> etl::log2<Bits_Per_Element>::value;;
       const element_type bit = element_type(1) << (position & (Bits_Per_Element - 1));
@@ -1195,6 +1182,7 @@ namespace etl
 
     //*************************************************************************
     /// Extract an integral value from an arbitary position and length.
+    /// Run time position and length.
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
@@ -1234,6 +1222,7 @@ namespace etl
 
     //*************************************************************************
     /// Extract an integral value when the value fits in one element.
+    /// Compile time position and length.
     //*************************************************************************
     template <typename T, size_t Position, size_t Length>
     ETL_CONSTEXPR14
@@ -1252,6 +1241,7 @@ namespace etl
 
     //*************************************************************************
     /// Extract an integral value when the value spans more than one element.
+    /// Compile time position and length.
     //*************************************************************************
     template <typename T, size_t Position, size_t Length>
     ETL_CONSTEXPR14
@@ -1259,18 +1249,55 @@ namespace etl
     typename etl::enable_if<!value_is_in_one_element<Position, Length, Bits_Per_Element>::value, typename etl::make_unsigned<T>::type>::type
       extract_from_buffer(const_pointer pbuffer)
     {      
+      // Start with index of the element containing the msb.
       const int Msb_Element_Index = (Position + Length - 1) >> etl::log2<Bits_Per_Element>::value;
 
-      // Start with index of the element containing the msb.
-      int element_index = Msb_Element_Index;
-
-      // The value is spread over multiple elements.       
-      size_t length = Length;
-
       // Get the number of active bits in the first element 
-      size_t active_bits_in_msb = ((Position + Length - 1) % Bits_Per_Element) + 1;
+      const size_t Active_Bits_In_Msb = ((Position + Length - 1) % Bits_Per_Element) + 1;
 
-      return extract_from_multiple_elements<T>(pbuffer, element_index, active_bits_in_msb, length);
+      return extract_from_multiple_elements<T>(pbuffer, Msb_Element_Index, Active_Bits_In_Msb, Length);
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T>
+    ETL_CONSTEXPR14
+    static
+    T extract(const_pointer pbuffer,
+              size_t        position,
+              size_t        length = etl::integral_limits<T>::bits)
+    {
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value = extract_from_buffer<unsigned_t>(pbuffer, position, length);
+
+      if ((length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T>(value, length);
+      }
+
+      return static_cast<T>(value);
+    }
+
+    //*************************************************************************
+    /// Extract an integral value from an arbitary position and length.
+    //*************************************************************************
+    template <typename T, size_t Position, size_t Length>
+    ETL_CONSTEXPR14
+    static
+    T extract(const_pointer pbuffer)
+    {
+      typedef typename etl::make_unsigned<T>::type unsigned_t;
+
+      unsigned_t value = extract_from_buffer<unsigned_t, Position, Length>(pbuffer);
+
+      if ((Length != etl::integral_limits<T>::bits) && etl::integral_limits<T>::is_signed)
+      {
+        value = etl::sign_extend<T>(value, Length);
+      }
+
+      return static_cast<T>(value);
     }
 
     //*************************************************************************
@@ -1278,8 +1305,8 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14
     static
-    void flip(pointer pbuffer, 
-              size_t  number_of_elements) ETL_NOEXCEPT
+    void flip_all(pointer pbuffer, 
+                     size_t  number_of_elements) ETL_NOEXCEPT
     {
       operator_not(pbuffer, number_of_elements);
     }
@@ -1289,9 +1316,8 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14
     static
-    void flip(pointer pbuffer, 
-              size_t  number_of_elements, 
-              size_t  position) ETL_NOEXCEPT
+    void flip_position(pointer pbuffer, 
+                       size_t  position) ETL_NOEXCEPT
     {
       const size_t       index = position >> etl::log2<Bits_Per_Element>::value;;
       const element_type bit   = element_type(1) << (position & (Bits_Per_Element - 1));
@@ -1299,52 +1325,6 @@ namespace etl
       pbuffer[index] ^= bit;
     }
 
-    //*************************************************************************
-    // Are all the bits sets?
-    //*************************************************************************
-    ETL_CONSTEXPR14
-    static
-    bool all(const_pointer pbuffer, 
-             size_t        number_of_elements, 
-             element_type  top_mask) ETL_NOEXCEPT
-    {
-      // All but the last.
-      for (size_t i = 0UL; i < (number_of_elements - 1U); ++i)
-      {
-        if (pbuffer[i] != All_Set_Element)
-        {
-          return false;
-        }
-      }
-
-      // The last.
-      if (pbuffer[number_of_elements - 1U] != (All_Set_Element & top_mask))
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    //*************************************************************************
-    /// Are none of the bits set?
-    //*************************************************************************
-    ETL_CONSTEXPR14
-    static
-    bool none(const_pointer pbuffer, 
-              size_t        number_of_elements) ETL_NOEXCEPT
-    {
-      for (size_t i = 0UL; i < number_of_elements; ++i)
-      {
-        if (pbuffer[i] != 0)
-        {
-          return false;
-        }
-      }
-
-      return true;
-    }
-
     //*************************************************************************
     /// Finds the next bit in the specified state.
     ///\param state    The state to search for.
@@ -1411,7 +1391,6 @@ namespace etl
     ETL_CONSTEXPR14
     static
     TString to_string(const_pointer                pbuffer,
-                      size_t                       number_of_elements, 
                       size_t                       active_bits, 
                       typename TString::value_type zero, 
                       typename TString::value_type one)
@@ -1425,7 +1404,7 @@ namespace etl
 
       for (size_t i = active_bits; i > 0; --i)
       {
-        result[active_bits - i] = test(pbuffer, number_of_elements, i - 1) ? one : zero;
+        result[active_bits - i] = test(pbuffer, i - 1) ? one : zero;
       }
 
       return result;
@@ -1440,9 +1419,11 @@ namespace etl
                              const_pointer rhs_pbuffer, 
                              size_t        number_of_elements) ETL_NOEXCEPT
     {
-      while (number_of_elements != 0)
+      while (number_of_elements-- != 0)
       {
-        *lhs_pbuffer++ = *rhs_pbuffer++;
+        *lhs_pbuffer = *rhs_pbuffer;
+        ++lhs_pbuffer;
+        ++rhs_pbuffer;
       }
     }
 
@@ -1457,7 +1438,9 @@ namespace etl
     {
       while (number_of_elements-- != 0)
       {
-        *lhs_pbuffer++ &= *rhs_pbuffer++;
+        *lhs_pbuffer &= *rhs_pbuffer;
+        ++lhs_pbuffer;
+        ++rhs_pbuffer;
       }
     }
 
@@ -1472,7 +1455,9 @@ namespace etl
     {
       while (number_of_elements-- != 0)
       {
-        *lhs_pbuffer++ != *rhs_pbuffer++;
+        *lhs_pbuffer |= *rhs_pbuffer;
+        ++lhs_pbuffer;
+        ++rhs_pbuffer;
       }
     }
 
@@ -1487,7 +1472,9 @@ namespace etl
     {
       while (number_of_elements-- != 0)
       {
-        *lhs_pbuffer++ ^= *rhs_pbuffer++;
+        *lhs_pbuffer ^= *rhs_pbuffer;
+        ++lhs_pbuffer;
+        ++rhs_pbuffer;
       }
     }
 
@@ -1501,7 +1488,8 @@ namespace etl
     {
       while (number_of_elements-- != 0)
       {
-        *pbuffer++ = ~*pbuffer++;
+        *pbuffer = ~*pbuffer;
+        ++pbuffer;
       }
     }
 
@@ -1515,50 +1503,57 @@ namespace etl
                              size_t  active_bits, 
                              size_t  shift) ETL_NOEXCEPT
     {
-      // The place where the elements are split when shifting.
-      const size_t split_position = Bits_Per_Element - (shift % Bits_Per_Element);
-
-      // Where we are shifting from.
-      int src_index = int(number_of_elements - (shift / Bits_Per_Element) - 1U);
-
-      // Where we are shifting to.
-      int dst_index = int(number_of_elements - 1U);
-
-      // Shift control constants.
-      const size_t lsb_shift = Bits_Per_Element - split_position;
-      const size_t msb_shift = split_position;
-
-      const element_type lsb_mask = element_type(etl::integral_limits<element_type>::max >> (Bits_Per_Element - split_position));
-      const element_type msb_mask = etl::integral_limits<element_type>::max - lsb_mask;
-      const element_type lsb_shifted_mask = element_type(lsb_mask << lsb_shift);
-
-      // First lsb.
-      element_type lsb = element_type((pbuffer[src_index] & lsb_mask) << lsb_shift);
-      pbuffer[dst_index] = lsb;
-      --src_index;
-
-      // Now do the shifting.
-      while (src_index >= 0)
+      if (shift >= active_bits)
       {
-        // Shift msb.
-        element_type msb = element_type((pbuffer[src_index] & msb_mask) >> msb_shift);
-        pbuffer[dst_index] = pbuffer[dst_index] | msb;
-        --dst_index;
+        reset_all(pbuffer, number_of_elements);
+      }
+      else
+      {
+        // The place where the elements are split when shifting.
+        const size_t split_position = Bits_Per_Element - (shift % Bits_Per_Element);
 
-        // Shift lsb.
+        // Where we are shifting from.
+        int src_index = int(number_of_elements - (shift / Bits_Per_Element) - 1U);
+
+        // Where we are shifting to.
+        int dst_index = int(number_of_elements - 1U);
+
+        // Shift control constants.
+        const size_t lsb_shift = Bits_Per_Element - split_position;
+        const size_t msb_shift = split_position;
+
+        const element_type lsb_mask = element_type(etl::integral_limits<element_type>::max >> (Bits_Per_Element - split_position));
+        const element_type msb_mask = etl::integral_limits<element_type>::max - lsb_mask;
+        const element_type lsb_shifted_mask = element_type(lsb_mask << lsb_shift);
+
+        // First lsb.
         element_type lsb = element_type((pbuffer[src_index] & lsb_mask) << lsb_shift);
         pbuffer[dst_index] = lsb;
         --src_index;
-      }
 
-      // Clear the remaining bits.
-      // First lsb.
-      pbuffer[dst_index] &= lsb_shifted_mask;
+        // Now do the shifting.
+        while (src_index >= 0)
+        {
+          // Shift msb.
+          element_type msb = element_type((pbuffer[src_index] & msb_mask) >> msb_shift);
+          pbuffer[dst_index] = pbuffer[dst_index] | msb;
+          --dst_index;
 
-      // The other remaining bytes on the right.
-      for (int i = 0; i < dst_index; ++i)
-      {
-        pbuffer[i] = 0;
+          // Shift lsb.
+          element_type lsb = element_type((pbuffer[src_index] & lsb_mask) << lsb_shift);
+          pbuffer[dst_index] = lsb;
+          --src_index;
+        }
+
+        // Clear the remaining bits.
+        // First lsb.
+        pbuffer[dst_index] &= lsb_shifted_mask;
+
+        // The other remaining bytes on the right.
+        for (int i = 0; i < dst_index; ++i)
+        {
+          pbuffer[i] = 0;
+        }
       }
     }
 
@@ -1572,52 +1567,59 @@ namespace etl
                               size_t  active_bits, 
                               size_t  shift) ETL_NOEXCEPT
     {
-      // The place where the elements are split when shifting.
-      const size_t split_position = shift % Bits_Per_Element;
-
-      // Where we are shifting from.
-      int src_index = int(shift / Bits_Per_Element);
-
-      // Where we are shifting to.
-      int dst_index = 0;
-
-      // Shift control constants.
-      const size_t lsb_shift = Bits_Per_Element - split_position;
-      const size_t msb_shift = split_position;
-
-      const element_type lsb_mask = element_type(etl::integral_limits<element_type>::max >> (Bits_Per_Element - split_position));
-      const element_type msb_mask = etl::integral_limits<element_type>::max - lsb_mask;
-      const element_type msb_shifted_mask = element_type(msb_mask >> msb_shift);
-
-      // Now do the shifting.
-      while (src_index < int(number_of_elements - 1))
+      if (shift >= active_bits)
       {
-        // Shift msb.
-        element_type msb = element_type((pbuffer[src_index] & msb_mask) >> msb_shift);
-        ++src_index;
-
-        // Shift lsb.
-        element_type lsb = element_type((pbuffer[src_index] & lsb_mask) << lsb_shift);
-
-        // Combine them.
-        pbuffer[dst_index] = lsb | msb;
-        ++dst_index;
+        reset_all(pbuffer, number_of_elements);
       }
-
-      // Final msb.
-      element_type msb = element_type((pbuffer[src_index] & msb_mask) >> msb_shift);
-      pbuffer[dst_index] = msb;
-
-      // Clear the remaining bits.
-      // First msb.
-      pbuffer[dst_index] &= msb_shifted_mask;
-      ++dst_index;
-
-      // The other remaining bytes.
-      while (dst_index < int(number_of_elements))
+      else
       {
-        pbuffer[dst_index] = 0;
+        // The place where the elements are split when shifting.
+        const size_t split_position = shift % Bits_Per_Element;
+
+        // Where we are shifting from.
+        int src_index = int(shift / Bits_Per_Element);
+
+        // Where we are shifting to.
+        int dst_index = 0;
+
+        // Shift control constants.
+        const size_t lsb_shift = Bits_Per_Element - split_position;
+        const size_t msb_shift = split_position;
+
+        const element_type lsb_mask = element_type(etl::integral_limits<element_type>::max >> (Bits_Per_Element - split_position));
+        const element_type msb_mask = etl::integral_limits<element_type>::max - lsb_mask;
+        const element_type msb_shifted_mask = element_type(msb_mask >> msb_shift);
+
+        // Now do the shifting.
+        while (src_index < int(number_of_elements - 1))
+        {
+          // Shift msb.
+          element_type msb = element_type((pbuffer[src_index] & msb_mask) >> msb_shift);
+          ++src_index;
+
+          // Shift lsb.
+          element_type lsb = element_type((pbuffer[src_index] & lsb_mask) << lsb_shift);
+
+          // Combine them.
+          pbuffer[dst_index] = lsb | msb;
+          ++dst_index;
+        }
+
+        // Final msb.
+        element_type msb = element_type((pbuffer[src_index] & msb_mask) >> msb_shift);
+        pbuffer[dst_index] = msb;
+
+        // Clear the remaining bits.
+        // First msb.
+        pbuffer[dst_index] &= msb_shifted_mask;
         ++dst_index;
+
+        // The other remaining bytes.
+        while (dst_index < int(number_of_elements))
+        {
+          pbuffer[dst_index] = 0;
+          ++dst_index;
+        }
       }
     }
 
@@ -1697,7 +1699,8 @@ namespace etl
     static ETL_CONSTANT size_t       Allocated_Bits     = 0U;
     static ETL_CONSTANT element_type All_Set_Element    = 0U;
     static ETL_CONSTANT element_type All_Clear_Element  = 0U;
-    static ETL_CONSTANT char         Element_Layout     = etl::bitset_layout::Undefined;
+    static ETL_CONSTANT size_t       Size               = 0U;
+    static ETL_CONSTANT char         Storage_Model      = etl::bitset_storage_model::Undefined;
 
     static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
   };
@@ -1723,7 +1726,8 @@ namespace etl
     static ETL_CONSTANT element_type All_Clear_Element  = element_type(0);
     static ETL_CONSTANT size_t       Number_Of_Elements = (Active_Bits % Bits_Per_Element == 0) ? Active_Bits / Bits_Per_Element : Active_Bits / Bits_Per_Element + 1;
     static ETL_CONSTANT size_t       Allocated_Bits     = Number_Of_Elements * Bits_Per_Element;
-    static ETL_CONSTANT char         Element_Layout     = (Number_Of_Elements == 1U) ? etl::bitset_layout::Single : etl::bitset_layout::Multi;
+    static ETL_CONSTANT size_t       Size               = Active_Bits;
+    static ETL_CONSTANT char         Storage_Model      = (Number_Of_Elements == 1U) ? etl::bitset_storage_model::Single : etl::bitset_storage_model::Multi;
 
   private:
     
@@ -1828,7 +1832,7 @@ namespace etl
     ETL_CONSTEXPR14 bitset() ETL_NOEXCEPT
       : buffer()
     {
-      implementation::reset(buffer, Number_Of_Elements);
+      implementation::reset_all(buffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -1900,7 +1904,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& set() ETL_NOEXCEPT
     {
-      implementation::set(buffer, Number_Of_Elements, Top_Mask);
+      implementation::set_all(buffer, Number_Of_Elements, Top_Mask);
 
       return *this;
     }
@@ -1912,7 +1916,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
 
-      implementation::set(buffer, Number_Of_Elements, position, value);
+      implementation::set_position(buffer, position, value);
       
       return *this;
     }
@@ -2013,6 +2017,7 @@ namespace etl
 
     //*************************************************************************
     /// Extract an integral value from an arbitary position and length.
+    /// Run time position and length.
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
@@ -2023,11 +2028,12 @@ namespace etl
       ETL_ASSERT_OR_RETURN_VALUE(length <= etl::integral_limits<T>::bits, ETL_ERROR(bitset_overflow), 0);
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits,      ETL_ERROR(bitset_overflow), 0);
 
-      return implementation::extract<T>(buffer, position, length);
+      return implementation::template extract<T>(buffer, position, length);
     }
 
     //*************************************************************************
     /// Extract an integral value from an arbitary position and length.
+    /// Compile time position and length.
     //*************************************************************************
     template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
     ETL_CONSTEXPR14
@@ -2037,7 +2043,7 @@ namespace etl
       ETL_STATIC_ASSERT(Length <= etl::integral_limits<T>::bits, "Length is larger that the required type");
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits,      "Position/Length overflows bitset");
 
-      return implementation::extract<T>(buffer, Position, Length);
+      return implementation::template extract<T, Position, Length>(buffer);
     }
 
     //*************************************************************************
@@ -2065,7 +2071,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& reset() ETL_NOEXCEPT
     {
-      implementation::reset(buffer, Number_Of_Elements);
+      implementation::reset_all(buffer, Number_Of_Elements);
 
       return *this;
     }
@@ -2077,7 +2083,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
 
-      implementation::reset(buffer, Number_Of_Elements, position);
+      implementation::reset_position(buffer, position);
 
       return *this;
     }
@@ -2090,7 +2096,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), false);
 
-      return implementation::test(buffer, Number_Of_Elements, position);
+      return implementation::test(buffer, position);
     }
  
     //*************************************************************************
@@ -2122,6 +2128,8 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool all(element_type mask) const ETL_NOEXCEPT
     {
+      ETL_STATIC_ASSERT(Storage_Model == etl::bitset_storage_model::Single, "Not supported for 'Multi' bitset storage model");
+
       return implementation::all(buffer, Number_Of_Elements, Top_Mask, mask);
     }
 
@@ -2138,6 +2146,8 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool none(element_type mask) const ETL_NOEXCEPT
     {
+      ETL_STATIC_ASSERT(Storage_Model == etl::bitset_storage_model::Single, "Not supported for 'Multi' bitset storage model");
+
       return implementation::none(buffer, Number_Of_Elements, mask);
     }
 
@@ -2154,6 +2164,8 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool any(element_type mask) const ETL_NOEXCEPT
     {
+      ETL_STATIC_ASSERT(Storage_Model == etl::bitset_storage_model::Single, "Not supported for 'Multi' bitset storage model");
+
       return implementation::any(buffer, Number_Of_Elements, mask);
     }
 
@@ -2162,7 +2174,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& flip() ETL_NOEXCEPT
     {
-      implementation::flip(buffer, Number_Of_Elements);
+      implementation::flip_all(buffer, Number_Of_Elements);
 
       return *this;
     }
@@ -2174,7 +2186,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
 
-      implementation::flip(buffer, Number_Of_Elements, position);
+      implementation::flip_position(buffer, position);
 
       return *this;
     }
@@ -2184,7 +2196,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool operator[] (size_t position) const ETL_NOEXCEPT
     {
-      return implementation::test(buffer, Number_Of_Elements, position);
+      return implementation::test(buffer, position);
     }
 
     //*************************************************************************
@@ -2206,7 +2218,7 @@ namespace etl
     ETL_CONSTEXPR14 TString to_string(typename TString::value_type zero = typename TString::value_type('0'),
                                       typename TString::value_type one  = typename TString::value_type('1')) const
     {
-      return implementation::template to_string<TString>(buffer, Number_Of_Elements, Active_Bits, zero, one);
+      return implementation::template to_string<TString>(buffer, Active_Bits, zero, one);
     }
 
     //*************************************************************************
@@ -2303,7 +2315,7 @@ namespace etl
     {
       etl::bitset<Active_Bits, TElement> temp(*this);
 
-      implementation::flip(temp.buffer, Number_Of_Elements);
+      implementation::flip_all(temp.buffer, Number_Of_Elements);
 
       return temp;
     }
@@ -2327,7 +2339,7 @@ namespace etl
     {
       if (shift >= Active_Bits)
       {
-        implementation::reset(buffer, Number_Of_Elements);
+        implementation::reset_all(buffer, Number_Of_Elements);
       }
       else
       {
@@ -2356,7 +2368,7 @@ namespace etl
     {
       if (shift >= Active_Bits)
       {
-        implementation::reset(buffer, Number_Of_Elements);
+        implementation::reset_all(buffer, Number_Of_Elements);
       }
       else
       {
@@ -2374,6 +2386,14 @@ namespace etl
       return implementation::operator_equality(lhs.buffer, rhs.buffer, lhs.Number_Of_Elements);
     }
 
+    //*************************************************************************
+    /// operator !=
+    //*************************************************************************
+    friend ETL_CONSTEXPR14 bool operator !=(const bitset<Active_Bits, TElement>& lhs, const bitset<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
+    {
+      return !(lhs == rhs);
+    }
+
     //*************************************************************************
     /// swap
     //*************************************************************************
@@ -2405,13 +2425,13 @@ namespace etl
     //*************************************************************************
     /// Correct the unused top bits after bit manipulation.
     //*************************************************************************
-    ETL_CONSTEXPR14 static void clear_unused_bits_in_msb(pointer pbuffer) ETL_NOEXCEPT
-    {
-      buffer[Number_Of_Elements - 1U] &= Top_Mask;
-    }
+    //ETL_CONSTEXPR14 static void clear_unused_bits_in_msb(pointer pbuffer) ETL_NOEXCEPT
+    //{
+    //  pbuffer[Number_Of_Elements - 1U] &= Top_Mask;
+    //}
 
     // The implementation of the bitset functionality.
-    typedef etl::bitset_impl<element_type, (Number_Of_Elements == 1U) ? etl::bitset_layout::Single : etl::bitset_layout::Multi> implementation;
+    typedef etl::bitset_impl<element_type, (Number_Of_Elements == 1U) ? etl::bitset_storage_model::Single : etl::bitset_storage_model::Multi> implementation;
 
     // The storage for the bitset.
     element_type buffer[Number_Of_Elements];
@@ -2452,16 +2472,16 @@ namespace etl
     temp ^= rhs;
     return temp;
   }
+}
 
-  //***************************************************************************
-  /// operator !=
-  ///\ingroup bitset
-  //***************************************************************************
-  template<size_t Active_Bits, typename TElement>
-  ETL_CONSTEXPR14 bool operator != (const bitset<Active_Bits, TElement>& lhs, const bitset<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
-  {
-    return !(lhs == rhs);
-  }
+//***************************************************************************
+/// operator !=
+///\ingroup bitset
+//***************************************************************************
+template<size_t Active_Bits, typename TElement>
+ETL_CONSTEXPR14 bool operator != (const etl::bitset<Active_Bits, TElement>& lhs, const etl::bitset<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
+{
+  return !(lhs == rhs);
 }
 
 //*************************************************************************
@@ -2501,7 +2521,8 @@ namespace etl
     static ETL_CONSTANT size_t       Allocated_Bits     = 0U;
     static ETL_CONSTANT element_type All_Set_Element    = 0U;
     static ETL_CONSTANT element_type All_Clear_Element  = 0U;
-    static ETL_CONSTANT char         Element_Layout     = etl::bitset_layout::Undefined;
+    static ETL_CONSTANT size_t       Size               = 0U;
+    static ETL_CONSTANT char         Storage_Model      = etl::bitset_storage_model::Undefined;
 
     static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
   };
@@ -2527,7 +2548,8 @@ namespace etl
     static ETL_CONSTANT element_type All_Clear_Element  = element_type(0);
     static ETL_CONSTANT size_t       Number_Of_Elements = (Active_Bits % Bits_Per_Element == 0) ? Active_Bits / Bits_Per_Element : Active_Bits / Bits_Per_Element + 1;
     static ETL_CONSTANT size_t       Allocated_Bits     = Number_Of_Elements * Bits_Per_Element;
-    static ETL_CONSTANT char         Element_Layout     = (Number_Of_Elements == 1U) ? etl::bitset_layout::Single : etl::bitset_layout::Multi;
+    static ETL_CONSTANT size_t       Size               = Active_Bits;
+    static ETL_CONSTANT char         Storage_Model      = (Number_Of_Elements == 1U) ? etl::bitset_storage_model::Single : etl::bitset_storage_model::Multi;
 
   private:
 
@@ -2634,7 +2656,7 @@ namespace etl
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      implementation::reset(pbuffer, Number_Of_Elements);
+      implementation::reset_all(pbuffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -2644,7 +2666,7 @@ namespace etl
       : pbuffer(buffer.data())
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      implementation::reset(pbuffer, Number_Of_Elements);
+      implementation::reset_all(pbuffer, Number_Of_Elements);
     }
 
     //*************************************************************************
@@ -2781,7 +2803,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set() ETL_NOEXCEPT
     {
-      implementation::set(pbuffer, Number_Of_Elements, Top_Mask);
+      implementation::set_all(pbuffer, Number_Of_Elements, Top_Mask);
 
       return *this;
     }
@@ -2793,7 +2815,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
       
-      implementation::set(pbuffer, Number_Of_Elements, position, value);
+      implementation::set_position(pbuffer, position, value);
 
       return *this;
     }
@@ -2893,6 +2915,7 @@ namespace etl
 
     //*************************************************************************
     /// Extract an integral value from an arbitary position and length.
+    /// Run time position and length.
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
@@ -2903,21 +2926,22 @@ namespace etl
       ETL_ASSERT_OR_RETURN_VALUE(length <= etl::integral_limits<T>::bits, ETL_ERROR(bitset_overflow), 0);
       ETL_ASSERT_OR_RETURN_VALUE((position + length) <= Active_Bits,      ETL_ERROR(bitset_overflow), 0);
 
-      return implementation::extract<T>(pbuffer, position, length);
+      return implementation::template extract<T>(pbuffer, position, length);
     }
 
     //*************************************************************************
     /// Extract an integral value from an arbitary position and length.
+    /// Compile time position and length.
     //*************************************************************************
     template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
     ETL_CONSTEXPR14
-      T extract() const
+    T extract() const
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value,              "Only integral types are supported");
       ETL_STATIC_ASSERT(Length <= etl::integral_limits<T>::bits, "Length is larger that the required type");
       ETL_STATIC_ASSERT((Position + Length) <= Active_Bits,      "Position/Length overflows bitset");
 
-      return implementation::extract<T>(pbuffer, Position, Length);
+      return implementation::template extract<T, Position, Length>(pbuffer);
     }
 
     //*************************************************************************
@@ -2945,7 +2969,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& reset() ETL_NOEXCEPT
     {
-      implementation::reset(pbuffer, Number_Of_Elements);
+      implementation::reset_all(pbuffer, Number_Of_Elements);
 
       return *this;
     }
@@ -2957,7 +2981,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
 
-      implementation::reset(pbuffer, Number_Of_Elements, position);
+      implementation::reset_position(pbuffer, position);
 
       return *this;
     }
@@ -2970,7 +2994,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), false);
       
-      return implementation::test(pbuffer, Number_Of_Elements, position);
+      return implementation::test(pbuffer, position);
     }
 
     //*************************************************************************
@@ -3002,6 +3026,8 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool all(element_type mask) const ETL_NOEXCEPT
     {
+      ETL_STATIC_ASSERT(Storage_Model == etl::bitset_storage_model::Single, "Not supported for 'Multi' bitset storage model");
+
       return implementation::all(pbuffer, Number_Of_Elements, Top_Mask, mask);
     }
 
@@ -3018,6 +3044,8 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool none(element_type mask) const ETL_NOEXCEPT
     {
+      ETL_STATIC_ASSERT(Storage_Model == etl::bitset_storage_model::Single, "Not supported for 'Multi' bitset storage model");
+
       return implementation::none(pbuffer, Number_Of_Elements, mask);
     }
 
@@ -3034,6 +3062,8 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool any(element_type mask) const ETL_NOEXCEPT
     {
+      ETL_STATIC_ASSERT(Storage_Model == etl::bitset_storage_model::Single, "Not supported for 'Multi' bitset storage model");
+
       return implementation::any(pbuffer, Number_Of_Elements, mask);
     }
 
@@ -3042,7 +3072,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& flip() ETL_NOEXCEPT
     {
-      implementation::flip(pbuffer, Number_Of_Elements);
+      implementation::flip_all(pbuffer, Number_Of_Elements);
 
       return *this;
     }
@@ -3054,7 +3084,7 @@ namespace etl
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
       
-      implementation::flip(pbuffer, Number_Of_Elements, position);
+      implementation::flip_position(pbuffer, position);
 
       return *this;
     }
@@ -3064,7 +3094,7 @@ namespace etl
     //*************************************************************************
     ETL_CONSTEXPR14 bool operator[] (size_t position) const ETL_NOEXCEPT
     {
-      return implementation::test(pbuffer, Number_Of_Elements, position);
+      return implementation::test(pbuffer, position);
     }
 
     //*************************************************************************
@@ -3084,9 +3114,9 @@ namespace etl
     template <typename TString>
 #endif
     ETL_CONSTEXPR14 TString to_string(typename TString::value_type zero = typename TString::value_type('0'),
-      typename TString::value_type one = typename TString::value_type('1')) const
+                                      typename TString::value_type one  = typename TString::value_type('1')) const
     {
-      return implementation::template to_string<TString>(pbuffer, Number_Of_Elements, Active_Bits, zero, one);
+      return implementation::template to_string<TString>(pbuffer, Active_Bits, zero, one);
     }
 
     //*************************************************************************
@@ -3168,6 +3198,14 @@ namespace etl
       return implementation::operator_equality(lhs.pbuffer, rhs.pbuffer, lhs.Number_Of_Elements);
     }
 
+    //*************************************************************************
+    /// operator !=
+    //*************************************************************************
+    friend ETL_CONSTEXPR14 bool operator !=(const bitset_ext<Active_Bits, TElement>& lhs, const bitset_ext<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
+    {
+      return !(lhs == rhs);
+    }
+
     //*************************************************************************
     /// swap
     //*************************************************************************
@@ -3196,30 +3234,30 @@ namespace etl
 
   private:
 
-    //*************************************************************************
-    /// Correct the unused top bits after bit manipulation.
-    //*************************************************************************
-    ETL_CONSTEXPR14 static void clear_unused_bits_in_msb() ETL_NOEXCEPT
-    {
-      pbuffer[Number_Of_Elements - 1U] &= Top_Mask;
-    }
+    ////*************************************************************************
+    ///// Correct the unused top bits after bit manipulation.
+    ////*************************************************************************
+    //ETL_CONSTEXPR14 static void clear_unused_bits_in_msb() ETL_NOEXCEPT
+    //{
+    //  pbuffer[Number_Of_Elements - 1U] &= Top_Mask;
+    //}
 
     // The implementation of the bitset functionality.
-    typedef etl::bitset_impl<element_type, (Number_Of_Elements == 1U) ? etl::bitset_layout::Single : etl::bitset_layout::Multi> implementation;
+    typedef etl::bitset_impl<element_type, (Number_Of_Elements == 1U) ? etl::bitset_storage_model::Single : etl::bitset_storage_model::Multi> implementation;
 
     // Pointer to the storage for the bitset.
     element_type* pbuffer;
   };
+}
 
-  //***************************************************************************
-  /// operator !=
-  ///\ingroup bitset
-  //***************************************************************************
-  template<size_t Active_Bits, typename TElement>
-  ETL_CONSTEXPR14 bool operator != (const bitset_ext<Active_Bits, TElement>& lhs, const bitset_ext<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
-  {
-    return !(lhs == rhs);
-  }
+//***************************************************************************
+/// operator !=
+///\ingroup bitset
+//***************************************************************************
+template<size_t Active_Bits, typename TElement>
+ETL_CONSTEXPR14 bool operator != (const etl::bitset_ext<Active_Bits, TElement>& lhs, const etl::bitset_ext<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
+{
+  return !(lhs == rhs);
 }
 
 //*************************************************************************
@@ -3231,6 +3269,275 @@ ETL_CONSTEXPR14 void swap(etl::bitset_ext<Active_Bits, TElement>& lhs, etl::bits
   lhs.swap(rhs);
 }
 
+namespace etl
+{
+  namespace private_bitset
+  {
+    //*************************************************************************
+    /// Compare bitset spans.
+    /// Assumes that the lhs span's element type is larger than rhs's.
+    //*************************************************************************
+    template <typename TLhsSpan, typename TRhsSpan>
+    bool compare_bitset_spans(const TLhsSpan& lhs_span, const TRhsSpan& rhs_span)
+    {
+      typedef typename TLhsSpan::value_type lhs_element_t;
+      typedef typename TRhsSpan::value_type rhs_element_t;
+
+      const int steps = static_cast<int>(sizeof(lhs_element_t) / sizeof(rhs_element_t));
+
+      typename TLhsSpan::iterator lhs_itr = lhs_span.begin();
+      typename TRhsSpan::iterator rhs_itr = rhs_span.begin();
+
+      while (lhs_itr != lhs_span.end())
+      {
+        const lhs_element_t& lhs_value = *lhs_itr;
+
+        // Build the rhs element in terms of the lhs element type.
+        lhs_element_t rhs_value = 0;
+
+        const int shift_step = etl::integral_limits<rhs_element_t>::bits;
+        int shift = 0;
+
+        for (int i = 0; i < steps; ++i)
+        {
+          rhs_value |= (static_cast<lhs_element_t>(*rhs_itr) << shift);
+          ++rhs_itr;
+          shift += shift_step;
+        }
+
+        if (lhs_value != rhs_value)
+        {
+          return false;
+        }
+
+        ++lhs_itr;
+      }
+
+      return true;
+    }
+  }
+}
+
+//***************************************************************************
+/// operator ==
+/// bitset 
+/// Different element types
+///\ingroup bitset
+//***************************************************************************
+template<size_t Active_Bits, typename TLhsElement, typename TRhsElement>
+ETL_CONSTEXPR14
+typename etl::enable_if<!etl::is_same<TLhsElement, TRhsElement>::value, bool>::type
+  operator == (const etl::bitset<Active_Bits, TLhsElement>& lhs, const etl::bitset<Active_Bits, TRhsElement>& rhs) ETL_NOEXCEPT
+{
+  // Get a span of each type.
+  typename etl::bitset<Active_Bits, TLhsElement>::const_span_type lhs_span = lhs.span();
+  typename etl::bitset<Active_Bits, TRhsElement>::const_span_type rhs_span = rhs.span();
+
+  // Put the bitset with the largest element type as the first argument.
+  if ETL_IF_CONSTEXPR(sizeof(TLhsElement) > sizeof(TRhsElement))
+  {
+    return etl::private_bitset::compare_bitset_spans(lhs_span, rhs_span);
+  }
+  else
+  {
+    return etl::private_bitset::compare_bitset_spans(rhs_span, lhs_span);
+  }
+}
+
+//***************************************************************************
+/// operator !=
+/// bitset 
+/// Different element types
+///\ingroup bitset
+//***************************************************************************
+template<size_t Active_Bits, typename TLhsElement, typename TRhsElement>
+ETL_CONSTEXPR14
+typename etl::enable_if<!etl::is_same<TLhsElement, TRhsElement>::value, bool>::type
+  operator != (const etl::bitset<Active_Bits, TLhsElement>& lhs, const etl::bitset<Active_Bits, TRhsElement>& rhs) ETL_NOEXCEPT
+{
+  return !(lhs == rhs);
+}
+
+//***************************************************************************
+/// operator ==
+/// bitset_ext
+/// Different element types
+///\ingroup bitset
+//***************************************************************************
+template<size_t Active_Bits, typename TLhsElement, typename TRhsElement>
+ETL_CONSTEXPR14
+typename etl::enable_if<!etl::is_same<TLhsElement, TRhsElement>::value, bool>::type
+  operator == (const etl::bitset_ext<Active_Bits, TLhsElement>& lhs, const etl::bitset_ext<Active_Bits, TRhsElement>& rhs) ETL_NOEXCEPT
+{
+  // Get a span of each type.
+  typename etl::bitset_ext<Active_Bits, TLhsElement>::const_span_type lhs_span = lhs.span();
+  typename etl::bitset_ext<Active_Bits, TRhsElement>::const_span_type rhs_span = rhs.span();
+
+  // Put the bitset with the largest element type as the first argument.
+  if ETL_IF_CONSTEXPR(sizeof(TLhsElement) > sizeof(TRhsElement))
+  {
+    return etl::private_bitset::compare_bitset_spans(lhs_span, rhs_span);
+  }
+  else
+  {
+    return etl::private_bitset::compare_bitset_spans(rhs_span, lhs_span);
+  }
+}
+
+//***************************************************************************
+/// operator !=
+/// bitset_ext
+/// Different element types
+///\ingroup bitset
+//***************************************************************************
+template<size_t Active_Bits, typename TLhsElement, typename TRhsElement>
+ETL_CONSTEXPR14
+typename etl::enable_if<!etl::is_same<TLhsElement, TRhsElement>::value, bool>::type
+  operator != (const etl::bitset_ext<Active_Bits, TLhsElement>& lhs, const etl::bitset_ext<Active_Bits, TRhsElement>& rhs) ETL_NOEXCEPT
+{
+  return !(lhs == rhs);
+}
+
+//***************************************************************************
+/// operator ==
+/// bitset compared with bitset_ext, same element types.
+///\ingroup bitset
+//***************************************************************************
+template<size_t Active_Bits, typename TElement>
+ETL_CONSTEXPR14
+bool operator == (const etl::bitset<Active_Bits, TElement>& lhs, const etl::bitset_ext<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
+{
+  const char   Storage_Model      = etl::bitset<Active_Bits, TElement>::Storage_Model;
+  const size_t Number_Of_Elements = etl::bitset<Active_Bits, TElement>::Number_Of_Elements;
+
+  typename etl::bitset<Active_Bits, TElement>::const_span_type     lhs_span = lhs.span();
+  typename etl::bitset_ext<Active_Bits, TElement>::const_span_type rhs_span = rhs.span();
+
+  typedef etl::bitset_impl<TElement, Storage_Model> implementation;
+
+  return implementation::operator_equality(lhs_span.begin(), rhs_span.begin(), Number_Of_Elements);
+}
+
+//***************************************************************************
+/// operator !=
+/// bitset compared with bitset_ext, same element types.
+///\ingroup bitset
+//***************************************************************************
+template<size_t Active_Bits, typename TElement>
+ETL_CONSTEXPR14
+bool operator != (const etl::bitset<Active_Bits, TElement>& lhs, const etl::bitset_ext<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
+{
+  return !(lhs == rhs);
+}
+
+//***************************************************************************
+/// operator ==
+/// bitset_ext compared with bitset, same element types.
+///\ingroup bitset
+//***************************************************************************
+template<size_t Active_Bits, typename TElement>
+ETL_CONSTEXPR14
+bool operator == (const etl::bitset_ext<Active_Bits, TElement>& lhs, const etl::bitset<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
+{
+  const char   Storage_Model      = etl::bitset<Active_Bits, TElement>::Storage_Model;
+  const size_t Number_Of_Elements = etl::bitset<Active_Bits, TElement>::Number_Of_Elements;
+
+  typename etl::bitset_ext<Active_Bits, TElement>::const_span_type lhs_span = lhs.span();
+  typename etl::bitset<Active_Bits, TElement>::const_span_type     rhs_span = rhs.span();
+
+  typedef etl::bitset_impl<TElement, Storage_Model> implementation;
+
+  return implementation::operator_equality(lhs_span.begin(), rhs_span.begin(), Number_Of_Elements);
+}
+
+//***************************************************************************
+/// operator !=
+/// bitset_ext compared with bitset, same element types.
+///\ingroup bitset
+//***************************************************************************
+template<size_t Active_Bits, typename TElement>
+ETL_CONSTEXPR14
+bool operator != (const etl::bitset_ext<Active_Bits, TElement>& lhs, const etl::bitset<Active_Bits, TElement>& rhs) ETL_NOEXCEPT
+{
+  return !(lhs == rhs);
+}
+
+//***************************************************************************
+/// operator ==
+/// bitset compared with bitset_ext, different element types. 
+///\ingroup bitset
+//***************************************************************************
+template<size_t Active_Bits, typename TLhsElement, typename TRhsElement>
+ETL_CONSTEXPR14
+typename etl::enable_if<!etl::is_same<TLhsElement, TRhsElement>::value, bool>::type
+operator == (const etl::bitset<Active_Bits, TLhsElement>& lhs, const etl::bitset_ext<Active_Bits, TRhsElement>& rhs) ETL_NOEXCEPT
+{
+  // Get a span of each type.
+  typename etl::bitset<Active_Bits, TLhsElement>::const_span_type     lhs_span = lhs.span();
+  typename etl::bitset_ext<Active_Bits, TRhsElement>::const_span_type rhs_span = rhs.span();
+
+  // Put the bitset with the largest element type as the first argument.
+  if ETL_IF_CONSTEXPR(sizeof(TLhsElement) > sizeof(TRhsElement))
+  {
+    return etl::private_bitset::compare_bitset_spans(lhs_span, rhs_span);
+  }
+  else
+  {
+    return etl::private_bitset::compare_bitset_spans(rhs_span, lhs_span);
+  }
+}
+
+//***************************************************************************
+/// operator !=
+/// bitset compared with bitset_ext, different element types. 
+///\ingroup bitset
+//***************************************************************************
+template<size_t Active_Bits, typename TLhsElement, typename TRhsElement>
+ETL_CONSTEXPR14
+typename etl::enable_if<!etl::is_same<TLhsElement, TRhsElement>::value, bool>::type
+  operator != (const etl::bitset<Active_Bits, TLhsElement>& lhs, const etl::bitset_ext<Active_Bits, TRhsElement>& rhs) ETL_NOEXCEPT
+{
+  return !(lhs == rhs);
+}
+
+//***************************************************************************
+/// operator ==
+/// bitset_ext compared with bitset, different element types. 
+///\ingroup bitset
+//***************************************************************************
+template<size_t Active_Bits, typename TLhsElement, typename TRhsElement>
+ETL_CONSTEXPR14
+typename etl::enable_if<!etl::is_same<TLhsElement, TRhsElement>::value, bool>::type
+  operator == (const etl::bitset_ext<Active_Bits, TLhsElement>& lhs, const etl::bitset<Active_Bits, TRhsElement>& rhs) ETL_NOEXCEPT
+{
+  // Get a span of each type.
+  typename etl::bitset_ext<Active_Bits, TLhsElement>::const_span_type lhs_span = lhs.span();
+  typename etl::bitset<Active_Bits, TRhsElement>::const_span_type     rhs_span = rhs.span();
+
+  // Put the bitset with the largest element type as the first argument.
+  if ETL_IF_CONSTEXPR(sizeof(TLhsElement) > sizeof(TRhsElement))
+  {
+    return etl::private_bitset::compare_bitset_spans(lhs_span, rhs_span);
+  }
+  else
+  {
+    return etl::private_bitset::compare_bitset_spans(rhs_span, lhs_span);
+  }
+}
+
+//***************************************************************************
+/// operator !=
+/// bitset_ext compared with bitset, different element types. 
+///\ingroup bitset
+//***************************************************************************
+template<size_t Active_Bits, typename TLhsElement, typename TRhsElement>
+ETL_CONSTEXPR14
+typename etl::enable_if<!etl::is_same<TLhsElement, TRhsElement>::value, bool>::type
+  operator != (const etl::bitset_ext<Active_Bits, TLhsElement>& lhs, const etl::bitset<Active_Bits, TRhsElement>& rhs) ETL_NOEXCEPT
+{
+  return !(lhs == rhs);
+}
+
 #include "minmax_pop.h"
 
 #endif
diff --git a/test/test_bitset_new_comparisons.cpp b/test/test_bitset_new_comparisons.cpp
new file mode 100644
index 00000000..4436982f
--- /dev/null
+++ b/test/test_bitset_new_comparisons.cpp
@@ -0,0 +1,239 @@
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+https://github.com/ETLCPP/etl
+https://www.etlcpp.com
+
+Copyright(c) 2022 John Wellbelove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+******************************************************************************/
+
+#include "unit_test_framework.h"
+
+#include "etl/private/bitset_new.h"
+
+namespace
+{
+  using ull = unsigned long long;
+
+  SUITE(test_bitset_new_comparisons)
+  {
+    //*************************************************************************
+    TEST(test_equality_single_storage_model)
+    {
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(0x0123456789012345ULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(0x0123456789012345ULL);
+
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer4;
+      etl::bitset_ext<64, uint64_t> data3(0x0123456789012345ULL, buffer3);
+      etl::bitset_ext<64, uint64_t> data4(0x0123456789012345ULL, buffer4);
+
+      // Double check we are using the single element storage model.
+      CHECK(etl::bitset_storage_model::Single == data1.Storage_Model);
+      CHECK(etl::bitset_storage_model::Single == data2.Storage_Model);
+      CHECK(etl::bitset_storage_model::Single == data3.Storage_Model);
+      CHECK(etl::bitset_storage_model::Single == data4.Storage_Model);
+
+      CHECK(data1 == data2); // bitset     == bitset
+      CHECK(data1 == data3); // bitset     == bitset_ext
+      CHECK(data3 == data1); // bitset_ext == bitset
+      CHECK(data3 == data4); // bitset_ext == bitset_ext
+    }
+
+    //*************************************************************************
+    TEST(test_inequality_single_storage_model)
+    {
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(0x0123456789012345ULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data2(0x0123456784012345ULL);
+
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer4;
+      etl::bitset_ext<64, uint64_t> data3(0x0123456787012345ULL, buffer3);
+      etl::bitset_ext<64, uint64_t> data4(0x0123426789012345ULL, buffer4);
+
+      // Double check we are using the single element storage model.
+      CHECK(etl::bitset_storage_model::Single == data1.Storage_Model);
+      CHECK(etl::bitset_storage_model::Single == data2.Storage_Model);
+      CHECK(etl::bitset_storage_model::Single == data3.Storage_Model);
+      CHECK(etl::bitset_storage_model::Single == data4.Storage_Model);
+
+      CHECK(data1 != data2); // bitset     != bitset
+      CHECK(data1 != data3); // bitset     != bitset_ext
+      CHECK(data3 != data1); // bitset_ext != bitset
+      CHECK(data3 != data4); // bitset_ext != bitset_ext
+    }
+
+    //*************************************************************************
+    TEST(test_equality_multi_storage_model)
+    {
+      ETL_CONSTEXPR14 etl::bitset<64> data1(0x0123456789012345ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data2(0x0123456789012345ULL);
+
+      etl::bitset_ext<64>::buffer_type buffer3;
+      etl::bitset_ext<64>::buffer_type buffer4;
+      etl::bitset_ext<64> data3(0x0123456789012345ULL, buffer3);
+      etl::bitset_ext<64> data4(0x0123456789012345ULL, buffer4);
+
+      // Double check we are using the multi element storage model.
+      CHECK(etl::bitset_storage_model::Multi == data1.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi == data2.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi == data3.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi == data4.Storage_Model);
+
+      CHECK(data1 == data2); // bitset     == bitset
+      CHECK(data1 == data3); // bitset     == bitset_ext
+      CHECK(data3 == data1); // bitset_ext == bitset
+      CHECK(data3 == data4); // bitset_ext == bitset_ext
+    }
+
+    //*************************************************************************
+    TEST(test_inequality_multi_storage_model)
+    {
+      ETL_CONSTEXPR14 etl::bitset<64> data1(0x0123456789012345ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data2(0x0123456784012345ULL);
+
+      etl::bitset_ext<64>::buffer_type buffer3;
+      etl::bitset_ext<64>::buffer_type buffer4;
+      etl::bitset_ext<64> data3(0x0123456787012345ULL, buffer3);
+      etl::bitset_ext<64> data4(0x0123426789012345ULL, buffer4);
+
+      // Double check we are using the multi element storage model.
+      CHECK(etl::bitset_storage_model::Multi == data1.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi == data2.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi == data3.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi == data4.Storage_Model);
+
+      CHECK(data1 != data2); // bitset     != bitset
+      CHECK(data1 != data3); // bitset     != bitset_ext
+      CHECK(data3 != data1); // bitset_ext != bitset
+      CHECK(data3 != data4); // bitset_ext != bitset_ext
+    }
+
+    //*************************************************************************
+    TEST(test_equality_mixed_storage_model)
+    {
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(0x0123456789012345ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data2(0x0123456789012345ULL);
+
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<64>::buffer_type buffer4;
+      etl::bitset_ext<64, uint64_t> data3(0x0123456789012345ULL, buffer3);
+      etl::bitset_ext<64> data4(0x0123456789012345ULL, buffer4);
+
+      // Double check we are using the single/multi element storage model.
+      CHECK(etl::bitset_storage_model::Single == data1.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi  == data2.Storage_Model);
+      CHECK(etl::bitset_storage_model::Single == data3.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi  == data4.Storage_Model);
+
+      CHECK(data1 == data2); // bitset     (S) == bitset     (M)
+      CHECK(data2 == data1); // bitset     (M) == bitset     (S)
+      CHECK(data3 == data4); // bitset_ext (S) == bitset_ext (M)
+      CHECK(data4 == data3); // bitset_ext (M) == bitset_ext (S)
+      CHECK(data1 == data4); // bitset     (S) == bitset_ext (M)
+      CHECK(data4 == data1); // bitset_ext (M) == bitset     (S)
+      CHECK(data2 == data3); // bitset     (M) == bitset_ext (S)
+      CHECK(data3 == data2); // bitset_ext (S) == bitset     (M)
+    }
+
+    //*************************************************************************
+    TEST(test_inequality_mixed_storage_model)
+    {
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data1(0x0123456789012345ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data2(0x0123456784012345ULL);
+
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer3;
+      etl::bitset_ext<64>::buffer_type buffer4;
+      etl::bitset_ext<64, uint64_t> data3(0x0123456787012345ULL, buffer3);
+      etl::bitset_ext<64> data4(0x0123426789012345ULL, buffer4);
+
+      // Double check we are using the single/multi element storage model.
+      CHECK(etl::bitset_storage_model::Single == data1.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi  == data2.Storage_Model);
+      CHECK(etl::bitset_storage_model::Single == data3.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi  == data4.Storage_Model);
+
+      CHECK(data1 != data2); // bitset     (S) != bitset     (M)
+      CHECK(data2 != data1); // bitset     (M) != bitset     (S)
+      CHECK(data3 != data4); // bitset_ext (S) != bitset_ext (M)
+      CHECK(data4 != data3); // bitset_ext (M) != bitset_ext (S)
+      CHECK(data1 != data4); // bitset     (S) != bitset_ext (M)
+      CHECK(data4 != data1); // bitset_ext (M) != bitset     (S)
+      CHECK(data2 != data3); // bitset     (M) != bitset_ext (S)
+      CHECK(data3 != data2); // bitset_ext (S) != bitset     (M) 
+    }
+
+    //*************************************************************************
+    TEST(test_equality_mixed_storage_model_different_element_types)
+    {
+      ETL_CONSTEXPR14 etl::bitset<64, uint32_t> data1(0x0123456789012345ULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint8_t>  data2(0x0123456789012345ULL);
+
+      etl::bitset_ext<64, uint32_t>::buffer_type buffer3;
+      etl::bitset_ext<64, uint8_t>::buffer_type  buffer4;
+      etl::bitset_ext<64, uint32_t> data3(0x0123456789012345ULL, buffer3);
+      etl::bitset_ext<64, uint8_t>  data4(0x0123456789012345ULL, buffer4);
+
+      // Double check we are using the multi element storage model.
+      CHECK(etl::bitset_storage_model::Multi == data1.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi == data2.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi == data3.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi == data4.Storage_Model);
+
+      CHECK(data1 == data2); // bitset     (S) == bitset     (M)
+      CHECK(data2 == data1); // bitset     (M) == bitset     (S)
+      CHECK(data3 == data4); // bitset_ext (S) == bitset_ext (M)
+      CHECK(data4 == data3); // bitset_ext (M) == bitset_ext (S)
+      CHECK(data1 == data4); // bitset     (S) == bitset_ext (M)
+      CHECK(data4 == data1); // bitset_ext (M) == bitset     (S)
+      CHECK(data2 == data3); // bitset     (M) == bitset_ext (S)
+      CHECK(data3 == data2); // bitset_ext (S) == bitset     (M)
+    }
+
+    //*************************************************************************
+    TEST(test_inequality_mixed_storage_model_different_element_types)
+    {
+      ETL_CONSTEXPR14 etl::bitset<64, uint32_t> data1(0x0123456789012345ULL);
+      ETL_CONSTEXPR14 etl::bitset<64, uint8_t>  data2(0x0123456784012345ULL);
+
+      etl::bitset_ext<64, uint32_t>::buffer_type buffer3;
+      etl::bitset_ext<64, uint8_t>::buffer_type  buffer4;
+      etl::bitset_ext<64, uint32_t> data3(0x0123456787012345ULL, buffer3);
+      etl::bitset_ext<64, uint8_t>  data4(0x0123426789012345ULL, buffer4);
+
+      // Double check we are using the multi element storage model.
+      CHECK(etl::bitset_storage_model::Multi == data1.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi == data2.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi == data3.Storage_Model);
+      CHECK(etl::bitset_storage_model::Multi == data4.Storage_Model);
+
+      CHECK(data1 != data2); // bitset     (S) != bitset     (M)
+      CHECK(data2 != data1); // bitset     (M) != bitset     (S)
+      CHECK(data3 != data4); // bitset_ext (S) != bitset_ext (M)
+      CHECK(data4 != data3); // bitset_ext (M) != bitset_ext (S)
+      CHECK(data1 != data4); // bitset     (S) != bitset_ext (M)
+      CHECK(data4 != data1); // bitset_ext (M) != bitset     (S)
+      CHECK(data2 != data3); // bitset     (M) != bitset_ext (S)
+      CHECK(data3 != data2); // bitset_ext (S) != bitset     (M)
+    }
+  };
+}
diff --git a/test/test_bitset_new_default_element_type.cpp b/test/test_bitset_new_default_element_type.cpp
index b22f5a44..1a38ef2b 100644
--- a/test/test_bitset_new_default_element_type.cpp
+++ b/test/test_bitset_new_default_element_type.cpp
@@ -37,6 +37,7 @@ SOFTWARE.
 #include "etl/wstring.h"
 #include "etl/u16string.h"
 #include "etl/u32string.h"
+#include "etl/endianness.h"
 
 namespace
 {
@@ -46,9 +47,22 @@ namespace
   template <size_t Active_Bits>
   ETL_CONSTEXPR14 etl::bitset<Active_Bits> generate_shift_left_bitset(ull value, size_t shift)
   {
+    ull mask = 0ULL;
+
+    if (shift < 64U)
+    {
+      mask = etl::integral_limits<ull>::max >> shift;
+    }
+
+    value &= mask;
+
     etl::bitset<Active_Bits> data(value);
 
-    if (shift != 0U)
+    if (shift >= 64U)
+    {
+      data.reset();
+    }
+    else if (shift != 0U)
     {
       data <<= shift;
     }
@@ -63,7 +77,7 @@ namespace
     etl::bitset<Active_Bits> data1(value);
     etl::bitset<Active_Bits> data2;
 
-    if (shift != 0U)
+    if ((shift != 0U) && (shift != 64U))
     {
       data2 = data1 << shift;
     }
@@ -77,7 +91,11 @@ namespace
   {
     etl::bitset<Active_Bits> data(value);
 
-    if (shift != 0U)
+    if (shift >= 64U)
+    {
+      data.reset();
+    }
+    else if (shift != 0U)
     {
       data >>= shift;
     }
@@ -105,10 +123,10 @@ namespace
     //*************************************************************************
     TEST(test_default_constructor)
     {
-      ETL_CONSTEXPR14 std::bitset<60> compare;
-      ETL_CONSTEXPR14 etl::bitset<60> data;
+      ETL_CONSTEXPR14 std::bitset<64> compare;
+      ETL_CONSTEXPR14 etl::bitset<64> data;
 
-      CHECK_EQUAL(compare.size(),  data.size());
+      CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
 
       for (size_t i = 0UL; i < data.size(); ++i)
@@ -118,715 +136,41 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_default_constructor_multi_element)
+    TEST(test_default_constructor_single_element)
     {
-      etl::bitset<14, int8_t>  data8;
-      etl::bitset<30, int16_t> data16;
-      etl::bitset<62, int32_t> data32;
+      etl::bitset<8>  data8;
+      etl::bitset<16> data16;
+      etl::bitset<32> data32;
+      etl::bitset<64> data64;
 
-      CHECK_EQUAL(2U, data8.Number_Of_Elements);
-      CHECK_EQUAL(2U, data16.Number_Of_Elements);
-      CHECK_EQUAL(2U, data32.Number_Of_Elements);
-    }
+      using element_type  = etl::bitset<8>::element_type;
+      size_t element_bits = etl::integral_limits<element_type>::bits;
 
-    //*************************************************************************
-    TEST(test_default_constructor_default_element_type_bits)
-    {
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<1>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<2>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<3>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<4>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<5>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<6>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<7>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<8>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<9>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<10>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<11>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<12>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<13>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<14>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<15>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<16>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<17>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<18>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<19>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<20>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<21>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<22>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<23>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<24>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<25>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<26>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<27>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<28>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<29>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<30>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<31>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<32>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<33>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<34>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<35>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<36>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<37>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<38>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<39>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<40>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<41>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<42>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<43>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<44>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<45>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<46>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<47>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<48>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<49>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<50>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<51>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<52>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<53>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<54>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<55>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<56>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<57>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<58>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<59>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<60>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<61>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<62>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<63>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset<64>::element_type>::bits);
-    }
-     
-    //*************************************************************************
-    TEST(test_default_constructor_default_element_type_number_of_elements)
-    {
-      CHECK_EQUAL(1U, etl::bitset<1>::Number_Of_Elements);
-      CHECK_EQUAL(1U, etl::bitset<2>::Number_Of_Elements);
-      CHECK_EQUAL(1U, etl::bitset<3>::Number_Of_Elements);
-      CHECK_EQUAL(1U, etl::bitset<4>::Number_Of_Elements);
-      CHECK_EQUAL(1U, etl::bitset<5>::Number_Of_Elements);
-      CHECK_EQUAL(1U, etl::bitset<6>::Number_Of_Elements);
-      CHECK_EQUAL(1U, etl::bitset<7>::Number_Of_Elements);
-      CHECK_EQUAL(1U, etl::bitset<8>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset<9>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset<10>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset<11>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset<12>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset<13>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset<14>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset<15>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset<16>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset<17>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset<18>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset<19>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset<20>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset<21>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset<22>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset<23>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset<24>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset<25>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset<26>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset<27>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset<28>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset<29>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset<30>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset<31>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset<32>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset<33>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset<34>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset<35>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset<36>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset<37>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset<38>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset<39>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset<40>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset<41>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset<42>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset<43>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset<44>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset<45>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset<46>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset<47>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset<48>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset<49>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset<50>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset<51>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset<52>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset<53>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset<54>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset<55>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset<56>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset<57>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset<58>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset<59>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset<60>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset<61>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset<62>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset<63>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset<64>::Number_Of_Elements);
-    }
+      CHECK_EQUAL(8,  data8.Size);
+      CHECK_EQUAL(16, data16.Size);
+      CHECK_EQUAL(32, data32.Size);
+      CHECK_EQUAL(64, data64.Size);
 
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int8_t_element_types_bits)
-    {
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<1, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<2, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<3, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<4, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<5, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<6, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<7, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<8, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<9, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<10, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<11, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<12, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<13, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<14, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<15, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<16, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<17, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<18, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<19, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<20, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<21, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<22, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<23, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<24, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<25, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<26, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<27, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<28, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<29, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<30, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<31, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<32, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<33, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<34, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<35, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<36, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<37, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<38, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<39, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<40, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<41, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<42, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<43, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<44, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<45, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<46, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<47, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<48, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<49, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<50, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<51, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<52, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<53, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<54, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<55, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<56, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<57, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<58, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<59, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<60, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<61, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<62, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<63, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset<64, int8_t>::element_type>::bits));
-    }
+      CHECK_EQUAL( 8 / element_bits, data8.Number_Of_Elements);
+      CHECK_EQUAL(16 / element_bits, data16.Number_Of_Elements);
+      CHECK_EQUAL(32 / element_bits, data32.Number_Of_Elements);
+      CHECK_EQUAL(64 / element_bits, data64.Number_Of_Elements);
 
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int8_t_element_types_number_of_elements)
-    {
-      CHECK_EQUAL(1U, (etl::bitset<1, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<2, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<3, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<4, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<5, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<6, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<7, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<8, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<9, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<10, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<11, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<12, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<13, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<14, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<15, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<16, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<17, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<18, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<19, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<20, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<21, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<22, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<23, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<24, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<25, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<26, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<27, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<28, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<29, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<30, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<31, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<32, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset<33, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset<34, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset<35, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset<36, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset<37, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset<38, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset<39, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset<40, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset<41, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset<42, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset<43, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset<44, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset<45, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset<46, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset<47, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset<48, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset<49, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset<50, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset<51, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset<52, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset<53, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset<54, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset<55, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset<56, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset<57, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset<58, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset<59, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset<60, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset<61, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset<62, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset<63, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset<64, int8_t>::Number_Of_Elements));
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int16_t_element_types_bits)
-    {
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<1, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<2, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<3, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<4, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<5, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<6, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<7, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<8, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<9, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<10, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<11, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<12, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<13, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<14, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<15, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<16, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<17, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<18, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<19, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<20, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<21, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<22, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<23, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<24, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<25, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<26, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<27, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<28, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<29, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<30, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<31, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<32, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<33, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<34, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<35, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<36, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<37, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<38, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<39, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<40, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<41, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<42, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<43, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<44, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<45, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<46, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<47, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<48, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<49, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<50, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<51, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<52, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<53, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<54, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<55, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<56, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<57, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<58, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<59, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<60, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<61, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<62, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<63, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset<64, int16_t>::element_type>::bits));
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int16_t_element_types_number_of_elements)
-    {
-      CHECK_EQUAL(1U, (etl::bitset<1, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<2, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<3, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<4, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<5, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<6, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<7, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<8, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<9, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<10, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<11, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<12, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<13, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<14, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<15, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<16, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<17, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<18, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<19, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<20, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<21, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<22, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<23, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<24, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<25, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<26, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<27, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<28, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<29, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<30, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<31, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<32, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<33, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<34, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<35, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<36, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<37, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<38, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<39, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<40, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<41, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<42, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<43, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<44, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<45, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<46, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<47, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset<48, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<49, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<50, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<51, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<52, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<53, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<54, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<55, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<56, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<57, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<58, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<59, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<60, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<61, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<62, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<63, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset<64, int16_t>::Number_Of_Elements));
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int32_t_element_types_bits)
-    {
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<1, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<2, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<3, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<4, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<5, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<6, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<7, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<8, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<9, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<10, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<11, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<12, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<13, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<14, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<15, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<16, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<17, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<18, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<19, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<20, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<21, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<22, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<23, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<24, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<25, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<26, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<27, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<28, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<29, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<30, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<31, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<32, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<33, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<34, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<35, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<36, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<37, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<38, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<39, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<40, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<41, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<42, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<43, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<44, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<45, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<46, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<47, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<48, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<49, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<50, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<51, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<52, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<53, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<54, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<55, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<56, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<57, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<58, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<59, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<60, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<61, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<62, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<63, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset<64, int32_t>::element_type>::bits));
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int32_t_element_types_number_of_elements)
-    {
-      CHECK_EQUAL(1U, (etl::bitset<1, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<2, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<3, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<4, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<5, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<6, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<7, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<8, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<9, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<10, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<11, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<12, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<13, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<14, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<15, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<16, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<17, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<18, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<19, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<20, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<21, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<22, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<23, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<24, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<25, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<26, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<27, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<28, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<29, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<30, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<31, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<32, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<33, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<34, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<35, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<36, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<37, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<38, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<39, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<40, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<41, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<42, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<43, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<44, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<45, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<46, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<47, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<48, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<49, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<50, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<51, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<52, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<53, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<54, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<55, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<56, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<57, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<58, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<59, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<60, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<61, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<62, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<63, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset<64, int32_t>::Number_Of_Elements));
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int64_t_element_types_bits)
-    {
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<1, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<2, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<3, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<4, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<5, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<6, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<7, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<8, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<9, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<10, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<11, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<12, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<13, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<14, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<15, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<16, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<17, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<18, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<19, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<20, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<21, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<22, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<23, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<24, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<25, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<26, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<27, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<28, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<29, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<30, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<31, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<32, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<33, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<34, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<35, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<36, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<37, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<38, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<39, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<40, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<41, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<42, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<43, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<44, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<45, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<46, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<47, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<48, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<49, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<50, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<51, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<52, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<53, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<54, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<55, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<56, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<57, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<58, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<59, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<60, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<61, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<62, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<63, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset<64, int64_t>::element_type>::bits));
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int64_t_element_types_number_of_elements)
-    {
-      CHECK_EQUAL(1U, (etl::bitset<1, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<2, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<3, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<4, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<5, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<6, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<7, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<8, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<9, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<10, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<11, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<12, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<13, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<14, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<15, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<16, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<17, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<18, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<19, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<20, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<21, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<22, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<23, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<24, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<25, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<26, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<27, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<28, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<29, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<30, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<31, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<32, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<33, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<34, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<35, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<36, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<37, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<38, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<39, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<40, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<41, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<42, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<43, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<44, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<45, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<46, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<47, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<48, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<49, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<50, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<51, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<52, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<53, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<54, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<55, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<56, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<57, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<58, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<59, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<60, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<61, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<62, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<63, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset<64, int64_t>::Number_Of_Elements));
+      CHECK_EQUAL(etl::bitset_storage_model::Single, data8.Storage_Model);
+      CHECK_EQUAL(etl::bitset_storage_model::Multi,  data16.Storage_Model);
+      CHECK_EQUAL(etl::bitset_storage_model::Multi,  data32.Storage_Model);
+      CHECK_EQUAL(etl::bitset_storage_model::Multi,  data64.Storage_Model);
     }
 
     //*************************************************************************
     TEST(test_construct_from_value)
     {
-      ETL_CONSTEXPR14 std::bitset<60> compare(0x123456731234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<60> data(0x123456731234567ULL);
+      ETL_CONSTEXPR14 std::bitset<64> compare(0x123456731234567ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data(0x123456731234567ULL);
 
-      CHECK_EQUAL(compare.size(),  data.size());
+      CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
+      CHECK_EQUAL_HEX(compare.to_ullong(), data.to_ullong());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -837,9 +181,9 @@ namespace
     //*************************************************************************
     TEST(test_copy_construct)
     {
-      ETL_CONSTEXPR14 std::bitset<60> compare(0x123456731234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<60> data(0x123456731234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<60> data_copy(data);
+      ETL_CONSTEXPR14 std::bitset<64> compare(0x123456731234567ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data(0x123456731234567ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data_copy(data);
 
       CHECK_EQUAL(compare.size(), data_copy.size());
       CHECK_EQUAL(compare.count(), data_copy.count());
@@ -853,10 +197,10 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_excess_value)
     {
-      ETL_CONSTEXPR14 std::bitset<60> compare(0x8765432187654321ULL);
-      ETL_CONSTEXPR14 etl::bitset<60> data(0x8765432187654321ULL);
+      ETL_CONSTEXPR14 std::bitset<64> compare(0x8765432187654321ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data(0x8765432187654321ULL);
 
-      CHECK_EQUAL(compare.size(),  data.size());
+      CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
 
       for (size_t i = 0UL; i < data.size(); ++i)
@@ -868,10 +212,10 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_char_string)
     {
-      std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<60> data("110001001000110100010101100111001100010010001101000101011001");
+      std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64> data("110001001000110100010101100111001100010010001101000101011001");
 
-      CHECK_EQUAL(compare.size(),  data.size());
+      CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
 
       for (size_t i = 0UL; i < data.size(); ++i)
@@ -883,8 +227,8 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_wchar_t_string)
     {
-      std::bitset<60> compare(L"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<60> data(L"110001001000110100010101100111001100010010001101000101011001");
+      std::bitset<64> compare(L"110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64> data(L"110001001000110100010101100111001100010010001101000101011001");
 
       CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -898,8 +242,8 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_char16_t_string)
     {
-      std::bitset<60> compare(u"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<60> data(u"110001001000110100010101100111001100010010001101000101011001");
+      std::bitset<64> compare(u"110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64> data(u"110001001000110100010101100111001100010010001101000101011001");
 
       CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -913,8 +257,8 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_char32_t_string)
     {
-      std::bitset<60> compare(U"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<60> data(U"110001001000110100010101100111001100010010001101000101011001");
+      std::bitset<64> compare(U"110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64> data(U"110001001000110100010101100111001100010010001101000101011001");
 
       CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -947,7 +291,6 @@ namespace
       CHECK_EQUAL(0, data.count());
     }
 
-
     //*************************************************************************
     TEST(test_construct_from_nullptr_char16_t_string)
     {
@@ -973,8 +316,8 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_excess_string)
     {
-      std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001111100001");
-      etl::bitset<60> data("110001001000110100010101100111001100010010001101000101011001111100001");
+      std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001111100001");
+      etl::bitset<64> data("110001001000110100010101100111001100010010001101000101011001111100001");
 
       CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -982,6 +325,8 @@ namespace
       CHECK_EQUAL(compare.any(),   data.any());
       CHECK_EQUAL(compare.all(),   data.all());
 
+      CHECK_EQUAL_HEX(compare.to_ullong(), data.to_ullong());
+
       for (size_t i = 0UL; i < data.size(); ++i)
       {
         CHECK_EQUAL(compare.test(i), data.test(i));
@@ -989,7 +334,41 @@ namespace
     }
 
     //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64> test_set_helper()
+    {
+      etl::bitset<64> data;
+      data.set();
+
+      return data;
+    }
+
     TEST(test_set)
+    {
+      std::bitset<64> compare;
+      ETL_CONSTEXPR14 etl::bitset<64> data(test_set_helper());
+
+      compare.set();
+
+      ETL_CONSTEXPR14 auto size  = data.size();
+      ETL_CONSTEXPR14 auto count = data.count();
+      ETL_CONSTEXPR14 auto none  = data.none();
+      ETL_CONSTEXPR14 auto any   = data.any();
+      ETL_CONSTEXPR14 auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    TEST(test_set_less_than_full_size)
     {
       std::bitset<60> compare;
       etl::bitset<60> data;
@@ -997,11 +376,17 @@ namespace
       compare.set();
       data.set();
 
-      CHECK_EQUAL(compare.size(), data.size());
-      CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(), data.none());
-      CHECK_EQUAL(compare.any(), data.any());
-      CHECK_EQUAL(compare.all(), data.all());
+      auto size  = data.size();
+      auto count = data.count();
+      auto none  = data.none();
+      auto any   = data.any();
+      auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -1012,8 +397,8 @@ namespace
     //*************************************************************************
     TEST(test_set_with_char_string)
     {
-      std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<60> data;
+      std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64> data;
 
       data.set("110001001000110100010101100111001100010010001101000101011001");
 
@@ -1032,16 +417,16 @@ namespace
     //*************************************************************************
     TEST(test_set_with_wchar_t_string)
     {
-      std::bitset<60> compare(L"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<60> data;
+      std::bitset<64> compare(L"110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64> data;
 
       data.set(L"110001001000110100010101100111001100010010001101000101011001");
 
-      CHECK_EQUAL(compare.size(), data.size());
+      CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(), data.none());
-      CHECK_EQUAL(compare.any(), data.any());
-      CHECK_EQUAL(compare.all(), data.all());
+      CHECK_EQUAL(compare.none(),  data.none());
+      CHECK_EQUAL(compare.any(),   data.any());
+      CHECK_EQUAL(compare.all(),   data.all());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -1052,16 +437,16 @@ namespace
     //*************************************************************************
     TEST(test_set_with_char16_t_string)
     {
-      std::bitset<60> compare(u"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<60> data;
+      std::bitset<64> compare(u"110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64> data;
 
       data.set(u"110001001000110100010101100111001100010010001101000101011001");
 
-      CHECK_EQUAL(compare.size(), data.size());
+      CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(), data.none());
-      CHECK_EQUAL(compare.any(), data.any());
-      CHECK_EQUAL(compare.all(), data.all());
+      CHECK_EQUAL(compare.none(),  data.none());
+      CHECK_EQUAL(compare.any(),   data.any());
+      CHECK_EQUAL(compare.all(),   data.all());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -1072,16 +457,16 @@ namespace
     //*************************************************************************
     TEST(test_set_with_char32_t_string)
     {
-      std::bitset<60> compare(U"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<60> data;
+      std::bitset<64> compare(U"110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64> data;
 
       data.set(U"110001001000110100010101100111001100010010001101000101011001");
 
-      CHECK_EQUAL(compare.size(), data.size());
+      CHECK_EQUAL(compare.size(),  data.size());
       CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(), data.none());
-      CHECK_EQUAL(compare.any(), data.any());
-      CHECK_EQUAL(compare.all(), data.all());
+      CHECK_EQUAL(compare.none(),  data.none());
+      CHECK_EQUAL(compare.any(),   data.any());
+      CHECK_EQUAL(compare.all(),   data.all());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -1140,8 +525,8 @@ namespace
     //*************************************************************************
     TEST(test_from_string_with_char)
     {
-      std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<60> data;
+      std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64> data;
 
       data.from_string("110001001000110100010101100111001100010010001101000101011001");
 
@@ -1160,8 +545,8 @@ namespace
     //*************************************************************************
     TEST(test_from_string_with_wchar_t)
     {
-      std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<60> data;
+      std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64> data;
 
       data.from_string(L"110001001000110100010101100111001100010010001101000101011001");
 
@@ -1178,10 +563,10 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_char16_t_6string)
+    TEST(test_from_string_with_char16_t)
     {
-      std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<60> data;
+      std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64> data;
 
       data.from_string(u"110001001000110100010101100111001100010010001101000101011001");
 
@@ -1200,8 +585,8 @@ namespace
     //*************************************************************************
     TEST(test_from_string_with_char32_t)
     {
-      std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset<60> data;
+      std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset<64> data;
 
       data.from_string(U"110001001000110100010101100111001100010010001101000101011001");
 
@@ -1265,6 +650,42 @@ namespace
       CHECK_EQUAL(0, data.count());
     }
 
+    //*************************************************************************
+    TEST(test_value_u8_min)
+    {
+      ETL_CONSTEXPR14 etl::bitset<8> data((unsigned long long)etl::integral_limits<uint8_t>::min);
+      ETL_CONSTEXPR14 uint8_t value = data.value<uint8_t>();
+
+      CHECK_EQUAL(std::numeric_limits<uint8_t>::min(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_value_u8_max)
+    {
+      ETL_CONSTEXPR14 etl::bitset<8> data((unsigned long long)etl::integral_limits<uint8_t>::max);
+      ETL_CONSTEXPR14 uint8_t value = data.value<uint8_t>();
+
+      CHECK_EQUAL(std::numeric_limits<uint8_t>::max(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_value_s8_min)
+    {
+      ETL_CONSTEXPR14 etl::bitset<8> data((unsigned long long)etl::integral_limits<int8_t>::min);
+      ETL_CONSTEXPR14 int8_t value = data.value<int8_t>();
+
+      CHECK_EQUAL(std::numeric_limits<int8_t>::min(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_value_s8_max)
+    {
+      ETL_CONSTEXPR14 etl::bitset<8> data((unsigned long long)etl::integral_limits<int8_t>::max);
+      ETL_CONSTEXPR14 int8_t value = data.value<int8_t>();
+
+      CHECK_EQUAL(std::numeric_limits<int8_t>::max(), value);
+    }
+
     //*************************************************************************
     TEST(test_value_u16_min)
     {
@@ -1304,19 +725,19 @@ namespace
     //*************************************************************************
     TEST(test_value_u32_min)
     {
-      ETL_CONSTEXPR14 etl::bitset<32> data((unsigned long long)etl::integral_limits<uint32_t>::min);
-      ETL_CONSTEXPR14 uint32_t value = data.value<uint32_t>();
+      ETL_CONSTEXPR14 etl::bitset<32> data((unsigned long long)etl::integral_limits<int32_t>::min);
+      ETL_CONSTEXPR14 int32_t value = data.value<int32_t>();
 
-      CHECK_EQUAL(std::numeric_limits<uint32_t>::min(), value);
+      CHECK_EQUAL(std::numeric_limits<int32_t>::min(), value);
     }
 
     //*************************************************************************
     TEST(test_value_u32_max)
     {
-      ETL_CONSTEXPR14 etl::bitset<32> data((unsigned long long)etl::integral_limits<uint32_t>::max);
-      ETL_CONSTEXPR14 uint32_t value = data.value<uint32_t>();
+      ETL_CONSTEXPR14 etl::bitset<32> data((unsigned long long)etl::integral_limits<int32_t>::max);
+      ETL_CONSTEXPR14 int32_t value = data.value<int32_t>();
 
-      CHECK_EQUAL(std::numeric_limits<uint32_t>::max(), value);
+      CHECK_EQUAL(std::numeric_limits<int32_t>::max(), value);
     }
 
     //*************************************************************************
@@ -1340,26 +761,26 @@ namespace
     //*************************************************************************
     TEST(test_value_u64_min)
     {
-      ETL_CONSTEXPR14 etl::bitset<64> data((unsigned long long)etl::integral_limits<uint64_t>::min);
-      ETL_CONSTEXPR14 uint64_t value = data.value<uint64_t>();
+      ETL_CONSTEXPR14 etl::bitset<64> data((unsigned long long)etl::integral_limits<int64_t>::min);
+      ETL_CONSTEXPR14 uint64_t value = data.value<int64_t>();
 
-      CHECK_EQUAL(std::numeric_limits<uint64_t>::min(), value);
+      CHECK_EQUAL(std::numeric_limits<int64_t>::min(), value);
     }
 
     //*************************************************************************
     TEST(test_value_u64_max)
     {
-      ETL_CONSTEXPR14 etl::bitset<64> data((unsigned long long)etl::integral_limits<uint64_t>::max);
-      ETL_CONSTEXPR14 uint64_t value = data.value<uint64_t>();
+      ETL_CONSTEXPR14 etl::bitset<64> data((unsigned long long)etl::integral_limits<int64_t>::max);
+      ETL_CONSTEXPR14 uint64_t value = data.value<int64_t>();
 
-      CHECK_EQUAL(std::numeric_limits<uint64_t>::max(), value);
+      CHECK_EQUAL(std::numeric_limits<int64_t>::max(), value);
     }
 
     //*************************************************************************
     TEST(test_value_s64_min)
     {
       ETL_CONSTEXPR14 etl::bitset<64> data((unsigned long long)etl::integral_limits<int64_t>::min);
-      ETL_CONSTEXPR14 int64_t value = data.value<int64_t>();
+      ETL_CONSTEXPR14 uint64_t value = data.value<int64_t>();
 
       CHECK_EQUAL(std::numeric_limits<int64_t>::min(), value);
     }
@@ -1368,7 +789,7 @@ namespace
     TEST(test_value_s64_max)
     {
       ETL_CONSTEXPR14 etl::bitset<64> data((unsigned long long)etl::integral_limits<int64_t>::max);
-      ETL_CONSTEXPR14 int64_t value = data.value<int64_t>();
+      ETL_CONSTEXPR14 uint64_t value = data.value<int64_t>();
 
       CHECK_EQUAL(std::numeric_limits<int64_t>::max(), value);
     }
@@ -1376,8 +797,8 @@ namespace
     //*************************************************************************
     TEST(test_position_set)
     {
-      std::bitset<60> compare;
-      etl::bitset<60> data;
+      std::bitset<64> compare;
+      etl::bitset<64> data;
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -1406,13 +827,20 @@ namespace
     }
 
     //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64> test_reset_helper()
+    {
+      etl::bitset<64> data(0xFFFFFFFFFFFFFFFULL);
+      data.reset();
+
+      return data;
+    }
+
     TEST(test_reset)
     {
-      std::bitset<60> compare(0xFFFFFFFFFFFFFFFULL);
-      etl::bitset<60> data(0xFFFFFFFFFFFFFFFULL);
+      std::bitset<64> compare(0xFFFFFFFFFFFFFFFULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data(test_reset_helper());
 
       compare.reset();
-      data.reset();
 
       CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -1427,21 +855,27 @@ namespace
     }
 
     //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64> test_position_reset_helper()
+    {
+      etl::bitset<64> data(0xFFFFFFFFFFFFFFFULL);
+      data.reset(1);
+      data.reset(3);
+      data.reset(7);
+      data.reset(13);
+
+      return data;
+    }
+
     TEST(test_position_reset)
     {
-      std::bitset<60> compare(0xFFFFFFFFFFFFFFFULL);
-      etl::bitset<60> data(0xFFFFFFFFFFFFFFFULL);
+      std::bitset<64> compare(0xFFFFFFFFFFFFFFFULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data(test_position_reset_helper());
 
       compare.reset(1);
       compare.reset(3);
       compare.reset(7);
       compare.reset(13);
 
-      data.reset(1);
-      data.reset(3);
-      data.reset(7);
-      data.reset(13);
-
       CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
       CHECK_EQUAL(compare.none(), data.none());
@@ -1481,8 +915,8 @@ namespace
     //*************************************************************************
     TEST(test_index_operator_read)
     {
-      ETL_CONSTEXPR14 std::bitset<60> compare(0x3123456731234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<60> data(0x3123456731234567ULL);
+      ETL_CONSTEXPR14 std::bitset<64> compare(0x3123456731234567ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data(0x3123456731234567ULL);
 
       ETL_CONSTEXPR14 bool bc0 = compare[1U];
       ETL_CONSTEXPR14 bool bd0 = data[1U];
@@ -1502,15 +936,22 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_index_operator_write)
+    ETL_CONSTEXPR14 etl::bitset<64> test_index_operator_write_helper()
     {
-      etl::bitset<60> data;
+      etl::bitset<64> data;
 
       data[1U] = true;
       data[3U] = true;
       data[7U] = true;
       data[13U] = true;
 
+      return data;
+    }
+
+    TEST(test_index_operator_write)
+    {
+      ETL_CONSTEXPR14 etl::bitset<64> data(test_index_operator_write_helper());
+
       CHECK(data[1U]);
       CHECK(data[3U]);
       CHECK(data[7U]);
@@ -1520,10 +961,10 @@ namespace
     //*************************************************************************
     TEST(test_any)
     {
-      ETL_CONSTEXPR14 etl::bitset<60> data1(ull(0x0000000000000000));
-      ETL_CONSTEXPR14 etl::bitset<60> data2(ull(0x0000010000000000));
-      ETL_CONSTEXPR14 etl::bitset<60> data3(ull(0x0000010001000100));
-      ETL_CONSTEXPR14 etl::bitset<60> data4(ull(0x0FFFFFFFFFFFFFFF));
+      ETL_CONSTEXPR14 etl::bitset<64> data1(ull(0x0000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<64> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<64> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<64> data4(ull(0xFFFFFFFFFFFFFFFF));
 
       ETL_CONSTEXPR14 bool bd1 = data1.any();
       ETL_CONSTEXPR14 bool bd2 = data2.any();
@@ -1539,10 +980,10 @@ namespace
     //*************************************************************************
     TEST(test_none)
     {
-      ETL_CONSTEXPR14 etl::bitset<60> data1(ull(0x0000000000000000));
-      ETL_CONSTEXPR14 etl::bitset<60> data2(ull(0x0000010000000000));
-      ETL_CONSTEXPR14 etl::bitset<60> data3(ull(0x0000010001000100));
-      ETL_CONSTEXPR14 etl::bitset<60> data4(ull(0x0FFFFFFFFFFFFFFF));
+      ETL_CONSTEXPR14 etl::bitset<64> data1(ull(0x0000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<64> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<64> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<64> data4(ull(0xFFFFFFFFFFFFFFFF));
 
       ETL_CONSTEXPR14 bool bd1 = data1.none();
       ETL_CONSTEXPR14 bool bd2 = data2.none();
@@ -1558,10 +999,10 @@ namespace
     //*************************************************************************
     TEST(test_all)
     {
-      ETL_CONSTEXPR14 etl::bitset<60> data1(ull(0x0000000000000000));
-      ETL_CONSTEXPR14 etl::bitset<60> data2(ull(0x0000010000000000));
-      ETL_CONSTEXPR14 etl::bitset<60> data3(ull(0x0000010001000100));
-      ETL_CONSTEXPR14 etl::bitset<60> data4(ull(0x0FFFFFFFFFFFFFFF));
+      ETL_CONSTEXPR14 etl::bitset<64> data1(ull(0x0000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<64> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<64> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<64> data4(ull(0xFFFFFFFFFFFFFFFF));
 
       ETL_CONSTEXPR14 bool bd1 = data1.all();
       ETL_CONSTEXPR14 bool bd2 = data2.all();
@@ -1575,13 +1016,77 @@ namespace
     }
 
     //*************************************************************************
+    TEST(test_any_with_reduced_active_bits)
+    {
+      ETL_CONSTEXPR14 etl::bitset<60> data1(ull(0x0000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<60> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<60> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<60> data4(ull(0xFFFFFFFFFFFFFFFF));
+
+      ETL_CONSTEXPR14 bool bd1 = data1.any();
+      ETL_CONSTEXPR14 bool bd2 = data2.any();
+      ETL_CONSTEXPR14 bool bd3 = data3.any();
+      ETL_CONSTEXPR14 bool bd4 = data4.any();
+
+      CHECK_FALSE(bd1);
+      CHECK_TRUE(bd2);
+      CHECK_TRUE(bd3);
+      CHECK_TRUE(bd4);
+    }
+
+    //*************************************************************************
+    TEST(test_none_with_reduced_active_bits)
+    {
+      ETL_CONSTEXPR14 etl::bitset<60> data1(ull(0x0000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<60> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<60> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<60> data4(ull(0xFFFFFFFFFFFFFFFF));
+
+      ETL_CONSTEXPR14 bool bd1 = data1.none();
+      ETL_CONSTEXPR14 bool bd2 = data2.none();
+      ETL_CONSTEXPR14 bool bd3 = data3.none();
+      ETL_CONSTEXPR14 bool bd4 = data4.none();
+
+      CHECK_TRUE(bd1);
+      CHECK_FALSE(bd2);
+      CHECK_FALSE(bd3);
+      CHECK_FALSE(bd4);
+    }
+
+    //*************************************************************************
+    TEST(test_all_with_reduced_active_bits)
+    {
+      ETL_CONSTEXPR14 etl::bitset<60> data1(ull(0x0000000000000000));
+      ETL_CONSTEXPR14 etl::bitset<60> data2(ull(0x0000010000000000));
+      ETL_CONSTEXPR14 etl::bitset<60> data3(ull(0x1000010001000100));
+      ETL_CONSTEXPR14 etl::bitset<60> data4(ull(0xFFFFFFFFFFFFFFFF));
+
+      ETL_CONSTEXPR14 bool bd1 = data1.all();
+      ETL_CONSTEXPR14 bool bd2 = data2.all();
+      ETL_CONSTEXPR14 bool bd3 = data3.all();
+      ETL_CONSTEXPR14 bool bd4 = data4.all();
+
+      CHECK_FALSE(bd1);
+      CHECK_FALSE(bd2);
+      CHECK_FALSE(bd3);
+      CHECK_TRUE(bd4);
+    }
+
+    //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64> test_flip_helper()
+    {
+      etl::bitset<64> data;
+      data.flip();
+
+      return data;
+    }
+
     TEST(test_flip)
     {
-      std::bitset<60> compare;
-      etl::bitset<60> data;
+      std::bitset<64> compare;
+      ETL_CONSTEXPR14 etl::bitset<64> data(test_flip_helper());
 
       compare.flip();
-      data.flip();
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -1590,21 +1095,27 @@ namespace
     }
 
     //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64> test_flip_position_helper()
+    {
+      etl::bitset<64> data;
+      data.flip(1);
+      data.flip(3);
+      data.flip(7);
+      data.flip(13);
+
+      return data;
+    }
+
     TEST(test_flip_position)
     {
-      std::bitset<60> compare;
-      etl::bitset<60> data;
+      std::bitset<64> compare;
+      ETL_CONSTEXPR14 etl::bitset<64> data(test_flip_position_helper());
 
       compare.flip(1);
       compare.flip(3);
       compare.flip(7);
       compare.flip(13);
 
-      data.flip(1);
-      data.flip(3);
-      data.flip(7);
-      data.flip(13);
-
       for (size_t i = 0UL; i < data.size(); ++i)
       {
         CHECK_EQUAL(compare.test(i), data.test(i));
@@ -1612,21 +1123,27 @@ namespace
     }
 
     //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64> test_flip_reference_helper()
+    {
+      etl::bitset<64> data;
+      data[1].flip();
+      data[3].flip();
+      data[7].flip();
+      data[13].flip();
+
+      return data;
+    }
+
     TEST(test_flip_reference)
     {
-      std::bitset<60> compare;
-      etl::bitset<60> data;
+      std::bitset<64> compare;
+      ETL_CONSTEXPR14 etl::bitset<64> data(test_flip_reference_helper());
 
       compare[1].flip();
       compare[3].flip();
       compare[7].flip();
       compare[13].flip();
 
-      data[1].flip();
-      data[3].flip();
-      data[7].flip();
-      data[13].flip();
-
       for (size_t i = 0UL; i < data.size(); ++i)
       {
         CHECK_EQUAL(compare.test(i), data.test(i));
@@ -1636,8 +1153,8 @@ namespace
     //*************************************************************************
     TEST(test_invert_reference)
     {
-      std::bitset<60> compare;
-      etl::bitset<60> data;
+      std::bitset<64> compare;
+      etl::bitset<64> data;
 
       bool bc = ~compare[3];
       bool bd = ~data[3];
@@ -1645,18 +1162,18 @@ namespace
     }
 
     //*************************************************************************
-    void test_assignment_operator_helper(etl::bitset<60>& from, etl::bitset<60>& to)
+    ETL_CONSTEXPR14 etl::bitset<64> test_assignment_operator_helper(etl::bitset<64> to, const etl::bitset<64>&from)
     {
       to = from;
+
+      return to;
     }
 
     TEST(test_assignment_operator)
     {
-      std::bitset<60> compare(0xFFFFFFFFFFFFFFFULL);
-      etl::bitset<60> data1(0xFFFFFFFFFFFFFFFULL);
-      etl::bitset<60> data2;
-
-      test_assignment_operator_helper(data1, data2);
+      ETL_CONSTEXPR14 std::bitset<64> compare(0xFFFFFFFFFFFFFFFULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data1(0xFFFFFFFFFFFFFFFULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data2(test_assignment_operator_helper(etl::bitset<64>(), data1));
 
       for (size_t i = 0UL; i < data2.size(); ++i)
       {
@@ -1667,11 +1184,11 @@ namespace
     //*************************************************************************
     TEST(test_equality_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<60> data1(0x123456781234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<60> data2(0x123456781234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<60> data3;
+      ETL_CONSTEXPR14 etl::bitset<64> data1(0x123456781234567ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data2(0x123456781234567ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data3;
 
-      ETL_CONSTEXPR14 bool equal     =  (data1 == data2);
+      ETL_CONSTEXPR14 bool equal = (data1 == data2);
       ETL_CONSTEXPR14 bool not_equal = !(data1 == data3);
 
       CHECK(equal);
@@ -1681,9 +1198,9 @@ namespace
     //*************************************************************************
     TEST(test_inequality_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<60> data1(0x123456781234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<60> data2(0x123456781234567ULL);
-      ETL_CONSTEXPR14 etl::bitset<60> data3;
+      ETL_CONSTEXPR14 etl::bitset<64> data1(0x123456781234567ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data2(0x123456781234567ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> data3;
 
       ETL_CONSTEXPR14 bool equal = !(data1 != data2);
       ETL_CONSTEXPR14 bool not_equal = (data1 != data3);
@@ -1695,139 +1212,138 @@ namespace
     //*************************************************************************
     TEST(test_shift_left_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<60> shift1(0x2468ACF0ULL);
-      ETL_CONSTEXPR14 etl::bitset<60> shift2(0x48D159E0ULL);
-      ETL_CONSTEXPR14 etl::bitset<60> shift11(0x91A2B3C000ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> shift1(0x2468ACF0ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> shift2(0x48D159E0ULL);
+      ETL_CONSTEXPR14 etl::bitset<64> shift11(0x91A2B3C000ULL);
 
-      CHECK(generate_shift_left_bitset<60>(0x12345678ULL, 1U) == shift1);
-      CHECK(generate_shift_left_bitset<60>(0x12345678ULL, 2U) == shift2);
-      CHECK(generate_shift_left_bitset<60>(0x12345678ULL, 11U) == shift11);
+      CHECK((generate_shift_left_bitset<64>(0x12345678ULL, 1U)) == shift1);
+      CHECK((generate_shift_left_bitset<64>(0x12345678ULL, 2U)) == shift2);
+      CHECK((generate_shift_left_bitset<64>(0x12345678ULL, 11U)) == shift11);
     }
 
     //*************************************************************************
     TEST(test_shift_left_operator_overflow)
     {
-      ETL_CONSTEXPR14 etl::bitset<31> data(generate_shift_left_bitset<31>(0x7FFFFFFFULL, 1U));
-      ETL_CONSTEXPR14 etl::bitset<31> shifted(0x7FFFFFFEUL);
+      ETL_CONSTEXPR14 etl::bitset<32> data(generate_shift_left_bitset<32>(0x7FFFFFFFULL, 1U));
+      ETL_CONSTEXPR14 etl::bitset<32> shifted(0xFFFFFFFEUL);
 
-      CHECK(data == shifted);
+      CHECK_EQUAL_HEX(shifted.value<uint32_t>(), data.value<uint32_t>());
     }
 
     //*************************************************************************
     TEST(test_shift_left_copy_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<60> shift8(0x1234567800ULL);
-      CHECK_EQUAL_HEX(shift8.value<uint64_t>(), generate_shift_left_bitset_copy<60>(0x12345678UL, 8U).value<uint64_t>());
+      ETL_CONSTEXPR14 etl::bitset<64> shift8(0x1234567800ULL);
+      CHECK_EQUAL_HEX(shift8.value<int64_t>(), (generate_shift_left_bitset_copy<64>(0x12345678UL, 8U).value<int64_t>()));
 
-      ETL_CONSTEXPR14 etl::bitset<60> shift16(0x123456780000ULL);
-      CHECK_EQUAL_HEX(shift16.value<uint64_t>(), generate_shift_left_bitset_copy<60>(0x12345678UL, 16U).value<uint64_t>());
+      ETL_CONSTEXPR14 etl::bitset<64> shift16(0x123456780000ULL);
+      CHECK_EQUAL_HEX(shift16.value<int64_t>(), (generate_shift_left_bitset_copy<64>(0x12345678UL, 16U).value<int64_t>()));
 
-      ETL_CONSTEXPR14 etl::bitset<60> shift24(0x12345678000000ULL);
-      CHECK_EQUAL_HEX(shift24.value<uint64_t>(), generate_shift_left_bitset_copy<60>(0x12345678UL, 24U).value<uint64_t>());
+      ETL_CONSTEXPR14 etl::bitset<64> shift24(0x12345678000000ULL);
+      CHECK_EQUAL_HEX(shift24.value<int64_t>(), (generate_shift_left_bitset_copy<64>(0x12345678UL, 24U).value<int64_t>()));
 
-      ETL_CONSTEXPR14 etl::bitset<60> shift60(0x0000000000000000ULL);
-      CHECK_EQUAL_HEX(shift60.value<uint64_t>(), generate_shift_left_bitset_copy<60>(0x12345678UL, 60U).value<uint64_t>());
+      ETL_CONSTEXPR14 etl::bitset<64> shift64(0x0000000000000000ULL);
+      CHECK_EQUAL_HEX(shift64.value<int64_t>(), (generate_shift_left_bitset_copy<64>(0x12345678UL, 64U).value<int64_t>()));
     }
 
     //*************************************************************************
-    TEST(test_shift_left_operator_all_shifts_partial_size)
+    TEST(test_shift_left_operator_all_shifts_full_size)
     {
       uint64_t value = 0x0123456789ABCDEFULL;
-      uint64_t mask  = 0x0FFFFFFFFFFFFFFFULL;
 
-      CHECK_EQUAL_HEX((value << 0U) & mask, (generate_shift_left_bitset<60>(value, 0U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 1U) & mask, (generate_shift_left_bitset<60>(value, 1U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 2U) & mask, (generate_shift_left_bitset<60>(value, 2U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 3U) & mask, (generate_shift_left_bitset<60>(value, 3U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 4U) & mask, (generate_shift_left_bitset<60>(value, 4U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 5U) & mask, (generate_shift_left_bitset<60>(value, 5U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 6U) & mask, (generate_shift_left_bitset<60>(value, 6U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 7U) & mask, (generate_shift_left_bitset<60>(value, 7U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 8U) & mask, (generate_shift_left_bitset<60>(value, 8U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 9U) & mask, (generate_shift_left_bitset<60>(value, 9U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 10U) & mask, (generate_shift_left_bitset<60>(value, 10U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 11U) & mask, (generate_shift_left_bitset<60>(value, 11U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 12U) & mask, (generate_shift_left_bitset<60>(value, 12U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 13U) & mask, (generate_shift_left_bitset<60>(value, 13U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 14U) & mask, (generate_shift_left_bitset<60>(value, 14U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 15U) & mask, (generate_shift_left_bitset<60>(value, 15U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 16U) & mask, (generate_shift_left_bitset<60>(value, 16U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 17U) & mask, (generate_shift_left_bitset<60>(value, 17U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 18U) & mask, (generate_shift_left_bitset<60>(value, 18U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 19U) & mask, (generate_shift_left_bitset<60>(value, 19U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 20U) & mask, (generate_shift_left_bitset<60>(value, 20U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 21U) & mask, (generate_shift_left_bitset<60>(value, 21U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 22U) & mask, (generate_shift_left_bitset<60>(value, 22U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 23U) & mask, (generate_shift_left_bitset<60>(value, 23U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 24U) & mask, (generate_shift_left_bitset<60>(value, 24U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 25U) & mask, (generate_shift_left_bitset<60>(value, 25U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 26U) & mask, (generate_shift_left_bitset<60>(value, 26U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 27U) & mask, (generate_shift_left_bitset<60>(value, 27U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 28U) & mask, (generate_shift_left_bitset<60>(value, 28U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 29U) & mask, (generate_shift_left_bitset<60>(value, 29U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 30U) & mask, (generate_shift_left_bitset<60>(value, 30U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 31U) & mask, (generate_shift_left_bitset<60>(value, 31U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 32U) & mask, (generate_shift_left_bitset<60>(value, 32U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 33U) & mask, (generate_shift_left_bitset<60>(value, 33U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 34U) & mask, (generate_shift_left_bitset<60>(value, 34U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 35U) & mask, (generate_shift_left_bitset<60>(value, 35U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 36U) & mask, (generate_shift_left_bitset<60>(value, 36U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 37U) & mask, (generate_shift_left_bitset<60>(value, 37U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 38U) & mask, (generate_shift_left_bitset<60>(value, 38U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 39U) & mask, (generate_shift_left_bitset<60>(value, 39U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 40U) & mask, (generate_shift_left_bitset<60>(value, 40U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 41U) & mask, (generate_shift_left_bitset<60>(value, 41U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 42U) & mask, (generate_shift_left_bitset<60>(value, 42U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 43U) & mask, (generate_shift_left_bitset<60>(value, 43U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 44U) & mask, (generate_shift_left_bitset<60>(value, 44U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 45U) & mask, (generate_shift_left_bitset<60>(value, 45U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 46U) & mask, (generate_shift_left_bitset<60>(value, 46U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 47U) & mask, (generate_shift_left_bitset<60>(value, 47U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 48U) & mask, (generate_shift_left_bitset<60>(value, 48U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 49U) & mask, (generate_shift_left_bitset<60>(value, 49U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 50U) & mask, (generate_shift_left_bitset<60>(value, 50U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 51U) & mask, (generate_shift_left_bitset<60>(value, 51U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 52U) & mask, (generate_shift_left_bitset<60>(value, 52U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 53U) & mask, (generate_shift_left_bitset<60>(value, 53U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 54U) & mask, (generate_shift_left_bitset<60>(value, 54U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 55U) & mask, (generate_shift_left_bitset<60>(value, 55U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 56U) & mask, (generate_shift_left_bitset<60>(value, 56U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 57U) & mask, (generate_shift_left_bitset<60>(value, 57U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 58U) & mask, (generate_shift_left_bitset<60>(value, 58U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 59U) & mask, (generate_shift_left_bitset<60>(value, 59U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 60U) & mask, (generate_shift_left_bitset<60>(value, 60U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 61U) & mask, (generate_shift_left_bitset<60>(value, 61U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 62U) & mask, (generate_shift_left_bitset<60>(value, 62U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value << 63U) & mask, (generate_shift_left_bitset<60>(value, 63U).value<uint64_t>()));
-      CHECK_EQUAL_HEX(0ULL,                  (generate_shift_left_bitset<60>(value, 64U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 0U), (generate_shift_left_bitset<64>(value, 0U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 1U), (generate_shift_left_bitset<64>(value, 1U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 2U), (generate_shift_left_bitset<64>(value, 2U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 3U), (generate_shift_left_bitset<64>(value, 3U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 4U), (generate_shift_left_bitset<64>(value, 4U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 5U), (generate_shift_left_bitset<64>(value, 5U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 6U), (generate_shift_left_bitset<64>(value, 6U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 7U), (generate_shift_left_bitset<64>(value, 7U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 8U), (generate_shift_left_bitset<64>(value, 8U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 9U), (generate_shift_left_bitset<64>(value, 9U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 10U), (generate_shift_left_bitset<64>(value, 10U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 11U), (generate_shift_left_bitset<64>(value, 11U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 12U), (generate_shift_left_bitset<64>(value, 12U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 13U), (generate_shift_left_bitset<64>(value, 13U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 14U), (generate_shift_left_bitset<64>(value, 14U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 15U), (generate_shift_left_bitset<64>(value, 15U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 16U), (generate_shift_left_bitset<64>(value, 16U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 17U), (generate_shift_left_bitset<64>(value, 17U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 18U), (generate_shift_left_bitset<64>(value, 18U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 19U), (generate_shift_left_bitset<64>(value, 19U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 20U), (generate_shift_left_bitset<64>(value, 20U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 21U), (generate_shift_left_bitset<64>(value, 21U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 22U), (generate_shift_left_bitset<64>(value, 22U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 23U), (generate_shift_left_bitset<64>(value, 23U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 24U), (generate_shift_left_bitset<64>(value, 24U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 25U), (generate_shift_left_bitset<64>(value, 25U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 26U), (generate_shift_left_bitset<64>(value, 26U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 27U), (generate_shift_left_bitset<64>(value, 27U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 28U), (generate_shift_left_bitset<64>(value, 28U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 29U), (generate_shift_left_bitset<64>(value, 29U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 30U), (generate_shift_left_bitset<64>(value, 30U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 31U), (generate_shift_left_bitset<64>(value, 31U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 32U), (generate_shift_left_bitset<64>(value, 32U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 33U), (generate_shift_left_bitset<64>(value, 33U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 34U), (generate_shift_left_bitset<64>(value, 34U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 35U), (generate_shift_left_bitset<64>(value, 35U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 36U), (generate_shift_left_bitset<64>(value, 36U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 37U), (generate_shift_left_bitset<64>(value, 37U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 38U), (generate_shift_left_bitset<64>(value, 38U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 39U), (generate_shift_left_bitset<64>(value, 39U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 40U), (generate_shift_left_bitset<64>(value, 40U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 41U), (generate_shift_left_bitset<64>(value, 41U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 42U), (generate_shift_left_bitset<64>(value, 42U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 43U), (generate_shift_left_bitset<64>(value, 43U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 44U), (generate_shift_left_bitset<64>(value, 44U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 45U), (generate_shift_left_bitset<64>(value, 45U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 46U), (generate_shift_left_bitset<64>(value, 46U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 47U), (generate_shift_left_bitset<64>(value, 47U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 48U), (generate_shift_left_bitset<64>(value, 48U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 49U), (generate_shift_left_bitset<64>(value, 49U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 50U), (generate_shift_left_bitset<64>(value, 50U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 51U), (generate_shift_left_bitset<64>(value, 51U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 52U), (generate_shift_left_bitset<64>(value, 52U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 53U), (generate_shift_left_bitset<64>(value, 53U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 54U), (generate_shift_left_bitset<64>(value, 54U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 55U), (generate_shift_left_bitset<64>(value, 55U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 56U), (generate_shift_left_bitset<64>(value, 56U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 57U), (generate_shift_left_bitset<64>(value, 57U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 58U), (generate_shift_left_bitset<64>(value, 58U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 59U), (generate_shift_left_bitset<64>(value, 59U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 60U), (generate_shift_left_bitset<64>(value, 60U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 61U), (generate_shift_left_bitset<64>(value, 61U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 62U), (generate_shift_left_bitset<64>(value, 62U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value << 63U), (generate_shift_left_bitset<64>(value, 63U).value<uint64_t>()));
+      CHECK_EQUAL_HEX(0ULL, (generate_shift_left_bitset<64>(value, 64U).value<uint64_t>()));
     }
 
     //*************************************************************************
     TEST(test_shift_right_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<60> shift1(0x91A2B3CULL);
-      ETL_CONSTEXPR14 etl::bitset<60> shift2(0x48D159EULL);
-      ETL_CONSTEXPR14 etl::bitset<60> shift11(0x2468AULL);
+      ETL_CONSTEXPR14 etl::bitset<64> shift1(0x91A2B3CULL);
+      ETL_CONSTEXPR14 etl::bitset<64> shift2(0x48D159EULL);
+      ETL_CONSTEXPR14 etl::bitset<64> shift11(0x2468AULL);
 
-      CHECK(generate_shift_right_bitset<60>(0x12345678ULL, 1U) == shift1);
-      CHECK(generate_shift_right_bitset<60>(0x12345678ULL, 2U) == shift2);
-      CHECK(generate_shift_right_bitset<60>(0x12345678ULL, 11U) == shift11);
+      CHECK_EQUAL_HEX(shift1.value<int64_t>(), (generate_shift_right_bitset<64>(0x12345678ULL, 1U).value<int64_t>()));
+      CHECK_EQUAL_HEX(shift2.value<int64_t>(), (generate_shift_right_bitset<64>(0x12345678ULL, 2U).value<int64_t>()));
+      CHECK_EQUAL_HEX(shift11.value<int64_t>(), (generate_shift_right_bitset<64>(0x12345678ULL, 11U).value<int64_t>()));
     }
 
     //*************************************************************************
     TEST(test_shift_right_copy_operator)
     {
-      ETL_CONSTEXPR14 etl::bitset<60> shift8(0x123456ULL);
-      CHECK_EQUAL_HEX(shift8.value<uint64_t>(), generate_shift_right_bitset_copy<60>(0x12345678UL, 8U).value<uint64_t>());
+      ETL_CONSTEXPR14 etl::bitset<64> shift8(0x123456ULL);
+      CHECK_EQUAL_HEX(shift8.value<int64_t>(), (generate_shift_right_bitset_copy<64>(0x12345678UL, 8U).value<int64_t>()));
 
-      ETL_CONSTEXPR14 etl::bitset<60> shift16(0x1234ULL);
-      CHECK_EQUAL_HEX(shift16.value<uint64_t>(), generate_shift_right_bitset_copy<60>(0x12345678UL, 16U).value<uint64_t>());
+      ETL_CONSTEXPR14 etl::bitset<64> shift16(0x1234ULL);
+      CHECK_EQUAL_HEX(shift16.value<int64_t>(), (generate_shift_right_bitset_copy<64>(0x12345678UL, 16U).value<int64_t>()));
 
-      ETL_CONSTEXPR14 etl::bitset<60> shift24(0x12ULL);
-      CHECK_EQUAL_HEX(shift24.value<uint64_t>(), generate_shift_right_bitset_copy<60>(0x12345678UL, 24U).value<uint64_t>());
+      ETL_CONSTEXPR14 etl::bitset<64> shift24(0x12ULL);
+      CHECK_EQUAL_HEX(shift24.value<int64_t>(), (generate_shift_right_bitset_copy<64>(0x12345678UL, 24U).value<int64_t>()));
 
-      ETL_CONSTEXPR14 etl::bitset<60> shift60(0x00ULL);
-      CHECK_EQUAL_HEX(shift60.value<uint64_t>(), generate_shift_right_bitset_copy<60>(0x12345678UL, 60U).value<uint64_t>());
+      ETL_CONSTEXPR14 etl::bitset<64> shift60(0x00ULL);
+      CHECK_EQUAL_HEX(shift60.value<int64_t>(), (generate_shift_right_bitset_copy<64>(0x12345678UL, 60U).value<int64_t>()));
     }
 
     //*************************************************************************
@@ -1835,331 +1351,335 @@ namespace
     {
       uint64_t value = 0x0123456789ABCDEFULL;
 
-      CHECK_EQUAL_HEX((value >> 0U), (generate_shift_right_bitset<64>(value, 0U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 1U), (generate_shift_right_bitset<64>(value, 1U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 2U), (generate_shift_right_bitset<64>(value, 2U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 3U), (generate_shift_right_bitset<64>(value, 3U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 4U), (generate_shift_right_bitset<64>(value, 4U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 5U), (generate_shift_right_bitset<64>(value, 5U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 6U), (generate_shift_right_bitset<64>(value, 6U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 7U), (generate_shift_right_bitset<64>(value, 7U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 8U), (generate_shift_right_bitset<64>(value, 8U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 9U), (generate_shift_right_bitset<64>(value, 9U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 10U), (generate_shift_right_bitset<64>(value, 10U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 11U), (generate_shift_right_bitset<64>(value, 11U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 12U), (generate_shift_right_bitset<64>(value, 12U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 13U), (generate_shift_right_bitset<64>(value, 13U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 14U), (generate_shift_right_bitset<64>(value, 14U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 15U), (generate_shift_right_bitset<64>(value, 15U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 16U), (generate_shift_right_bitset<64>(value, 16U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 17U), (generate_shift_right_bitset<64>(value, 17U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 18U), (generate_shift_right_bitset<64>(value, 18U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 19U), (generate_shift_right_bitset<64>(value, 19U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 20U), (generate_shift_right_bitset<64>(value, 20U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 21U), (generate_shift_right_bitset<64>(value, 21U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 22U), (generate_shift_right_bitset<64>(value, 22U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 23U), (generate_shift_right_bitset<64>(value, 23U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 24U), (generate_shift_right_bitset<64>(value, 24U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 25U), (generate_shift_right_bitset<64>(value, 25U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 26U), (generate_shift_right_bitset<64>(value, 26U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 27U), (generate_shift_right_bitset<64>(value, 27U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 28U), (generate_shift_right_bitset<64>(value, 28U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 29U), (generate_shift_right_bitset<64>(value, 29U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 30U), (generate_shift_right_bitset<64>(value, 30U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 31U), (generate_shift_right_bitset<64>(value, 31U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 32U), (generate_shift_right_bitset<64>(value, 32U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 33U), (generate_shift_right_bitset<64>(value, 33U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 34U), (generate_shift_right_bitset<64>(value, 34U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 35U), (generate_shift_right_bitset<64>(value, 35U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 36U), (generate_shift_right_bitset<64>(value, 36U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 37U), (generate_shift_right_bitset<64>(value, 37U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 38U), (generate_shift_right_bitset<64>(value, 38U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 39U), (generate_shift_right_bitset<64>(value, 39U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 40U), (generate_shift_right_bitset<64>(value, 40U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 41U), (generate_shift_right_bitset<64>(value, 41U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 42U), (generate_shift_right_bitset<64>(value, 42U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 43U), (generate_shift_right_bitset<64>(value, 43U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 44U), (generate_shift_right_bitset<64>(value, 44U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 45U), (generate_shift_right_bitset<64>(value, 45U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 46U), (generate_shift_right_bitset<64>(value, 46U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 47U), (generate_shift_right_bitset<64>(value, 47U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 48U), (generate_shift_right_bitset<64>(value, 48U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 49U), (generate_shift_right_bitset<64>(value, 49U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 50U), (generate_shift_right_bitset<64>(value, 50U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 51U), (generate_shift_right_bitset<64>(value, 51U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 52U), (generate_shift_right_bitset<64>(value, 52U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 53U), (generate_shift_right_bitset<64>(value, 53U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 54U), (generate_shift_right_bitset<64>(value, 54U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 55U), (generate_shift_right_bitset<64>(value, 55U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 56U), (generate_shift_right_bitset<64>(value, 56U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 57U), (generate_shift_right_bitset<64>(value, 57U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 58U), (generate_shift_right_bitset<64>(value, 58U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 59U), (generate_shift_right_bitset<64>(value, 59U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 60U), (generate_shift_right_bitset<64>(value, 60U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 61U), (generate_shift_right_bitset<64>(value, 61U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 62U), (generate_shift_right_bitset<64>(value, 62U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 63U), (generate_shift_right_bitset<64>(value, 63U).value<uint64_t>()));
-      CHECK_EQUAL_HEX(0ULL, (generate_shift_right_bitset<64>(value, 64U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value >> 0U), (generate_shift_right_bitset<64>(value, 0U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 1U), (generate_shift_right_bitset<64>(value, 1U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 2U), (generate_shift_right_bitset<64>(value, 2U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 3U), (generate_shift_right_bitset<64>(value, 3U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 4U), (generate_shift_right_bitset<64>(value, 4U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 5U), (generate_shift_right_bitset<64>(value, 5U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 6U), (generate_shift_right_bitset<64>(value, 6U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 7U), (generate_shift_right_bitset<64>(value, 7U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 8U), (generate_shift_right_bitset<64>(value, 8U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 9U), (generate_shift_right_bitset<64>(value, 9U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 10U), (generate_shift_right_bitset<64>(value, 10U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 11U), (generate_shift_right_bitset<64>(value, 11U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 12U), (generate_shift_right_bitset<64>(value, 12U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 13U), (generate_shift_right_bitset<64>(value, 13U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 14U), (generate_shift_right_bitset<64>(value, 14U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 15U), (generate_shift_right_bitset<64>(value, 15U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 16U), (generate_shift_right_bitset<64>(value, 16U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 17U), (generate_shift_right_bitset<64>(value, 17U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 18U), (generate_shift_right_bitset<64>(value, 18U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 19U), (generate_shift_right_bitset<64>(value, 19U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 20U), (generate_shift_right_bitset<64>(value, 20U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 21U), (generate_shift_right_bitset<64>(value, 21U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 22U), (generate_shift_right_bitset<64>(value, 22U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 23U), (generate_shift_right_bitset<64>(value, 23U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 24U), (generate_shift_right_bitset<64>(value, 24U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 25U), (generate_shift_right_bitset<64>(value, 25U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 26U), (generate_shift_right_bitset<64>(value, 26U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 27U), (generate_shift_right_bitset<64>(value, 27U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 28U), (generate_shift_right_bitset<64>(value, 28U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 29U), (generate_shift_right_bitset<64>(value, 29U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 30U), (generate_shift_right_bitset<64>(value, 30U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 31U), (generate_shift_right_bitset<64>(value, 31U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 32U), (generate_shift_right_bitset<64>(value, 32U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 33U), (generate_shift_right_bitset<64>(value, 33U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 34U), (generate_shift_right_bitset<64>(value, 34U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 35U), (generate_shift_right_bitset<64>(value, 35U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 36U), (generate_shift_right_bitset<64>(value, 36U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 37U), (generate_shift_right_bitset<64>(value, 37U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 38U), (generate_shift_right_bitset<64>(value, 38U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 39U), (generate_shift_right_bitset<64>(value, 39U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 40U), (generate_shift_right_bitset<64>(value, 40U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 41U), (generate_shift_right_bitset<64>(value, 41U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 42U), (generate_shift_right_bitset<64>(value, 42U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 43U), (generate_shift_right_bitset<64>(value, 43U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 44U), (generate_shift_right_bitset<64>(value, 44U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 45U), (generate_shift_right_bitset<64>(value, 45U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 46U), (generate_shift_right_bitset<64>(value, 46U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 47U), (generate_shift_right_bitset<64>(value, 47U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 48U), (generate_shift_right_bitset<64>(value, 48U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 49U), (generate_shift_right_bitset<64>(value, 49U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 50U), (generate_shift_right_bitset<64>(value, 50U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 51U), (generate_shift_right_bitset<64>(value, 51U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 52U), (generate_shift_right_bitset<64>(value, 52U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 53U), (generate_shift_right_bitset<64>(value, 53U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 54U), (generate_shift_right_bitset<64>(value, 54U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 55U), (generate_shift_right_bitset<64>(value, 55U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 56U), (generate_shift_right_bitset<64>(value, 56U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 57U), (generate_shift_right_bitset<64>(value, 57U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 58U), (generate_shift_right_bitset<64>(value, 58U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 59U), (generate_shift_right_bitset<64>(value, 59U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 60U), (generate_shift_right_bitset<64>(value, 60U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 61U), (generate_shift_right_bitset<64>(value, 61U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 62U), (generate_shift_right_bitset<64>(value, 62U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 63U), (generate_shift_right_bitset<64>(value, 63U).value<int64_t>()));
+      CHECK_EQUAL_HEX(0ULL, (generate_shift_right_bitset<64>(value, 64U).value<int64_t>()));
     }
 
     //*************************************************************************
     TEST(test_shift_right_operator_all_shifts_partial_size)
     {
       uint64_t value = 0x0123456789ABCDEFULL;
-      uint64_t mask  = 0x0FFFFFFFFFFFFFFFULL;
+      uint64_t mask = 0x0FFFFFFFFFFFFFFFULL;
 
-      CHECK_EQUAL_HEX((value >> 0U) & mask, (generate_shift_right_bitset<60>(value, 0U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 1U) & mask, (generate_shift_right_bitset<60>(value, 1U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 2U) & mask, (generate_shift_right_bitset<60>(value, 2U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 3U) & mask, (generate_shift_right_bitset<60>(value, 3U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 4U) & mask, (generate_shift_right_bitset<60>(value, 4U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 5U) & mask, (generate_shift_right_bitset<60>(value, 5U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 6U) & mask, (generate_shift_right_bitset<60>(value, 6U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 7U) & mask, (generate_shift_right_bitset<60>(value, 7U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 8U) & mask, (generate_shift_right_bitset<60>(value, 8U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 9U) & mask, (generate_shift_right_bitset<60>(value, 9U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 10U) & mask, (generate_shift_right_bitset<60>(value, 10U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 11U) & mask, (generate_shift_right_bitset<60>(value, 11U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 12U) & mask, (generate_shift_right_bitset<60>(value, 12U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 13U) & mask, (generate_shift_right_bitset<60>(value, 13U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 14U) & mask, (generate_shift_right_bitset<60>(value, 14U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 15U) & mask, (generate_shift_right_bitset<60>(value, 15U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 16U) & mask, (generate_shift_right_bitset<60>(value, 16U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 17U) & mask, (generate_shift_right_bitset<60>(value, 17U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 18U) & mask, (generate_shift_right_bitset<60>(value, 18U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 19U) & mask, (generate_shift_right_bitset<60>(value, 19U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 20U) & mask, (generate_shift_right_bitset<60>(value, 20U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 21U) & mask, (generate_shift_right_bitset<60>(value, 21U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 22U) & mask, (generate_shift_right_bitset<60>(value, 22U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 23U) & mask, (generate_shift_right_bitset<60>(value, 23U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 24U) & mask, (generate_shift_right_bitset<60>(value, 24U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 25U) & mask, (generate_shift_right_bitset<60>(value, 25U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 26U) & mask, (generate_shift_right_bitset<60>(value, 26U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 27U) & mask, (generate_shift_right_bitset<60>(value, 27U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 28U) & mask, (generate_shift_right_bitset<60>(value, 28U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 29U) & mask, (generate_shift_right_bitset<60>(value, 29U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 30U) & mask, (generate_shift_right_bitset<60>(value, 30U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 31U) & mask, (generate_shift_right_bitset<60>(value, 31U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 32U) & mask, (generate_shift_right_bitset<60>(value, 32U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 33U) & mask, (generate_shift_right_bitset<60>(value, 33U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 34U) & mask, (generate_shift_right_bitset<60>(value, 34U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 35U) & mask, (generate_shift_right_bitset<60>(value, 35U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 36U) & mask, (generate_shift_right_bitset<60>(value, 36U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 37U) & mask, (generate_shift_right_bitset<60>(value, 37U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 38U) & mask, (generate_shift_right_bitset<60>(value, 38U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 39U) & mask, (generate_shift_right_bitset<60>(value, 39U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 40U) & mask, (generate_shift_right_bitset<60>(value, 40U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 41U) & mask, (generate_shift_right_bitset<60>(value, 41U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 42U) & mask, (generate_shift_right_bitset<60>(value, 42U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 43U) & mask, (generate_shift_right_bitset<60>(value, 43U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 44U) & mask, (generate_shift_right_bitset<60>(value, 44U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 45U) & mask, (generate_shift_right_bitset<60>(value, 45U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 46U) & mask, (generate_shift_right_bitset<60>(value, 46U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 47U) & mask, (generate_shift_right_bitset<60>(value, 47U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 48U) & mask, (generate_shift_right_bitset<60>(value, 48U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 49U) & mask, (generate_shift_right_bitset<60>(value, 49U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 50U) & mask, (generate_shift_right_bitset<60>(value, 50U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 51U) & mask, (generate_shift_right_bitset<60>(value, 51U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 52U) & mask, (generate_shift_right_bitset<60>(value, 52U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 53U) & mask, (generate_shift_right_bitset<60>(value, 53U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 54U) & mask, (generate_shift_right_bitset<60>(value, 54U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 55U) & mask, (generate_shift_right_bitset<60>(value, 55U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 56U) & mask, (generate_shift_right_bitset<60>(value, 56U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 57U) & mask, (generate_shift_right_bitset<60>(value, 57U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 58U) & mask, (generate_shift_right_bitset<60>(value, 58U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 59U) & mask, (generate_shift_right_bitset<60>(value, 59U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 60U) & mask, (generate_shift_right_bitset<60>(value, 60U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 61U) & mask, (generate_shift_right_bitset<60>(value, 61U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 62U) & mask, (generate_shift_right_bitset<60>(value, 62U).value<uint64_t>()));
-      CHECK_EQUAL_HEX((value >> 63U) & mask, (generate_shift_right_bitset<60>(value, 63U).value<uint64_t>()));
-      CHECK_EQUAL_HEX(0ULL, (generate_shift_right_bitset<60>(value, 64U).value<uint64_t>()));
+      CHECK_EQUAL_HEX((value >> 0U) & mask, (generate_shift_right_bitset<64>(value, 0U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 1U) & mask, (generate_shift_right_bitset<64>(value, 1U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 2U) & mask, (generate_shift_right_bitset<64>(value, 2U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 3U) & mask, (generate_shift_right_bitset<64>(value, 3U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 4U) & mask, (generate_shift_right_bitset<64>(value, 4U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 5U) & mask, (generate_shift_right_bitset<64>(value, 5U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 6U) & mask, (generate_shift_right_bitset<64>(value, 6U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 7U) & mask, (generate_shift_right_bitset<64>(value, 7U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 8U) & mask, (generate_shift_right_bitset<64>(value, 8U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 9U) & mask, (generate_shift_right_bitset<64>(value, 9U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 10U) & mask, (generate_shift_right_bitset<64>(value, 10U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 11U) & mask, (generate_shift_right_bitset<64>(value, 11U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 12U) & mask, (generate_shift_right_bitset<64>(value, 12U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 13U) & mask, (generate_shift_right_bitset<64>(value, 13U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 14U) & mask, (generate_shift_right_bitset<64>(value, 14U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 15U) & mask, (generate_shift_right_bitset<64>(value, 15U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 16U) & mask, (generate_shift_right_bitset<64>(value, 16U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 17U) & mask, (generate_shift_right_bitset<64>(value, 17U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 18U) & mask, (generate_shift_right_bitset<64>(value, 18U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 19U) & mask, (generate_shift_right_bitset<64>(value, 19U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 20U) & mask, (generate_shift_right_bitset<64>(value, 20U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 21U) & mask, (generate_shift_right_bitset<64>(value, 21U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 22U) & mask, (generate_shift_right_bitset<64>(value, 22U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 23U) & mask, (generate_shift_right_bitset<64>(value, 23U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 24U) & mask, (generate_shift_right_bitset<64>(value, 24U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 25U) & mask, (generate_shift_right_bitset<64>(value, 25U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 26U) & mask, (generate_shift_right_bitset<64>(value, 26U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 27U) & mask, (generate_shift_right_bitset<64>(value, 27U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 28U) & mask, (generate_shift_right_bitset<64>(value, 28U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 29U) & mask, (generate_shift_right_bitset<64>(value, 29U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 30U) & mask, (generate_shift_right_bitset<64>(value, 30U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 31U) & mask, (generate_shift_right_bitset<64>(value, 31U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 32U) & mask, (generate_shift_right_bitset<64>(value, 32U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 33U) & mask, (generate_shift_right_bitset<64>(value, 33U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 34U) & mask, (generate_shift_right_bitset<64>(value, 34U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 35U) & mask, (generate_shift_right_bitset<64>(value, 35U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 36U) & mask, (generate_shift_right_bitset<64>(value, 36U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 37U) & mask, (generate_shift_right_bitset<64>(value, 37U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 38U) & mask, (generate_shift_right_bitset<64>(value, 38U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 39U) & mask, (generate_shift_right_bitset<64>(value, 39U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 40U) & mask, (generate_shift_right_bitset<64>(value, 40U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 41U) & mask, (generate_shift_right_bitset<64>(value, 41U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 42U) & mask, (generate_shift_right_bitset<64>(value, 42U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 43U) & mask, (generate_shift_right_bitset<64>(value, 43U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 44U) & mask, (generate_shift_right_bitset<64>(value, 44U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 45U) & mask, (generate_shift_right_bitset<64>(value, 45U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 46U) & mask, (generate_shift_right_bitset<64>(value, 46U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 47U) & mask, (generate_shift_right_bitset<64>(value, 47U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 48U) & mask, (generate_shift_right_bitset<64>(value, 48U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 49U) & mask, (generate_shift_right_bitset<64>(value, 49U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 50U) & mask, (generate_shift_right_bitset<64>(value, 50U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 51U) & mask, (generate_shift_right_bitset<64>(value, 51U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 52U) & mask, (generate_shift_right_bitset<64>(value, 52U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 53U) & mask, (generate_shift_right_bitset<64>(value, 53U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 54U) & mask, (generate_shift_right_bitset<64>(value, 54U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 55U) & mask, (generate_shift_right_bitset<64>(value, 55U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 56U) & mask, (generate_shift_right_bitset<64>(value, 56U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 57U) & mask, (generate_shift_right_bitset<64>(value, 57U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 58U) & mask, (generate_shift_right_bitset<64>(value, 58U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 59U) & mask, (generate_shift_right_bitset<64>(value, 59U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 60U) & mask, (generate_shift_right_bitset<64>(value, 60U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 61U) & mask, (generate_shift_right_bitset<64>(value, 61U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 62U) & mask, (generate_shift_right_bitset<64>(value, 62U).value<int64_t>()));
+      CHECK_EQUAL_HEX((value >> 63U) & mask, (generate_shift_right_bitset<64>(value, 63U).value<int64_t>()));
+      CHECK_EQUAL_HEX(0ULL, (generate_shift_right_bitset<64>(value, 64U).value<int64_t>()));
     }
 
     //*************************************************************************
     TEST(test_and_operator)
     {
-      etl::bitset<60> data1(0x12345678UL);
-      etl::bitset<60> data2(0x23456789UL);
-      etl::bitset<60> data3(0x12345678UL & 0x23456789UL);
-      etl::bitset<60> data4(data1 & data2);
+      ETL_CONSTEXPR14 etl::bitset<64> data1(0x12345678UL);
+      ETL_CONSTEXPR14 etl::bitset<64> data2(0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64> data4(0x12345678UL & 0x23456789UL);
+
+      ETL_CONSTEXPR14 etl::bitset<64> data3 = data1 & data2;
       CHECK(data3 == data4);
     }
 
     //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64> test_and_equals_operator_helper(etl::bitset<64> data1, const etl::bitset<64>&data2)
+    {
+      data1 &= data2;
+
+      return data1;
+    }
+
     TEST(test_and_equals_operator)
     {
-      etl::bitset<60> data1(0x12345678UL);
-      etl::bitset<60> data2(0x23456789UL);
-      etl::bitset<60> data3(0x12345678UL & 0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64> data1(0x12345678UL);
+      ETL_CONSTEXPR14 etl::bitset<64> data2(0x23456789UL);
 
-      etl::bitset<60> data4(data1);
-      data4 &= data2;
-      CHECK(data3 == data4);
+      ETL_CONSTEXPR14 etl::bitset<64> data3(test_and_equals_operator_helper(data1, data2));
+
+      CHECK((data1 & data2) == data3);
     }
 
     //*************************************************************************
     TEST(test_or_operator)
     {
-      etl::bitset<60> data1(0x12345678UL);
-      etl::bitset<60> data2(0x23456789UL);
-      etl::bitset<60> data4(0x12345678UL | 0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64> data1(0x12345678UL);
+      ETL_CONSTEXPR14 etl::bitset<64> data2(0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64> data4(0x12345678UL | 0x23456789UL);
 
-      etl::bitset<60> data3(data1 | data2);
+      ETL_CONSTEXPR14 etl::bitset<64> data3 = data1 | data2;
       CHECK(data3 == data4);
     }
 
     //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64> test_or_equals_operator_helper(etl::bitset<64> data1, const etl::bitset<64>&data2)
+    {
+      data1 |= data2;
+
+      return data1;
+    }
+
     TEST(test_or_equals_operator)
     {
-      etl::bitset<60> data1(0x12345678UL);
-      etl::bitset<60> data2(0x23456789UL);
-      etl::bitset<60> data3(0x12345678UL | 0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64> data1(0x12345678UL);
+      ETL_CONSTEXPR14 etl::bitset<64> data2(0x23456789UL);
 
-      etl::bitset<60> data4(data1);
-      data4 |= data2;
-      CHECK(data3 == data4);
+      ETL_CONSTEXPR14 etl::bitset<64> data3(test_or_equals_operator_helper(data1, data2));
+
+      CHECK((data1 | data2) == data3);
     }
 
     //*************************************************************************
     TEST(test_xor_operator)
     {
-      etl::bitset<60> data1(0x12345678UL);
-      etl::bitset<60> data2(0x23456789UL);
-      etl::bitset<60> data4(0x12345678UL ^ 0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64> data1(0x12345678UL);
+      ETL_CONSTEXPR14 etl::bitset<64> data2(0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64> data4(0x12345678UL ^ 0x23456789UL);
 
-      etl::bitset<60> data3(data1 ^ data2);
+      ETL_CONSTEXPR14 etl::bitset<64> data3 = data1 ^ data2;
       CHECK(data3 == data4);
     }
 
     //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64> test_xor_equals_operator_helper(etl::bitset<64> data1, const etl::bitset<64>&data2)
+    {
+      data1 ^= data2;
+
+      return data1;
+    }
+
     TEST(test_xor_equals_operator)
     {
-      etl::bitset<60> data1(0x12345678UL);
-      etl::bitset<60> data2(0x23456789UL);
-      etl::bitset<60> data3(0x12345678UL ^ 0x23456789UL);
+      ETL_CONSTEXPR14 etl::bitset<64> data1(0x12345678UL);
+      ETL_CONSTEXPR14 etl::bitset<64> data2(0x23456789UL);
 
-      etl::bitset<60> data4(data1);
-      data4 ^= data2;
-      CHECK(data3 == data4);
+      ETL_CONSTEXPR14 etl::bitset<64> data3(test_xor_equals_operator_helper(data1, data2));
+
+      CHECK((data1 ^ data2) == data3);
     }
 
     //*************************************************************************
     TEST(test_find_first)
     {
-      ETL_CONSTEXPR14 etl::bitset<9> bs1(ull(0x0000));
-      ETL_CONSTEXPR14 size_t bs1fff = bs1.find_first(false);
-      ETL_CONSTEXPR14 size_t bs1fft = bs1.find_first(true);
-      CHECK_EQUAL(0U, bs1fff);
-      CHECK_EQUAL(etl::bitset<>::npos, bs1fft);
+      ETL_CONSTEXPR14 etl::bitset<8> bs1(ull(0x00));
+      ETL_CONSTEXPR14 size_t bs1find_first_false = bs1.find_first(false);
+      ETL_CONSTEXPR14 size_t bs1find_first_true = bs1.find_first(true);
+      CHECK_EQUAL(0U, bs1find_first_false);
+      CHECK_EQUAL(etl::bitset<>::npos, bs1find_first_true);
 
-      ETL_CONSTEXPR14 etl::bitset<9> bs2(ull(0x01FF));
-      ETL_CONSTEXPR14 size_t bs2fff = bs2.find_first(false);
-      ETL_CONSTEXPR14 size_t bs2fft = bs2.find_first(true);
-      CHECK_EQUAL(etl::bitset<>::npos, bs2fff);
-      CHECK_EQUAL(0U, bs2fft);
+      ETL_CONSTEXPR14 etl::bitset<8> bs2(ull(0xFF));
+      ETL_CONSTEXPR14 size_t bs2find_first_false = bs2.find_first(false);
+      ETL_CONSTEXPR14 size_t bs2find_first_true = bs2.find_first(true);
+      CHECK_EQUAL(etl::bitset<>::npos, bs2find_first_false);
+      CHECK_EQUAL(0U, bs2find_first_true);
 
-      ETL_CONSTEXPR14 etl::bitset<9> bs3(ull(0x0001));
-      ETL_CONSTEXPR14 size_t bs3fff = bs3.find_first(false);
-      ETL_CONSTEXPR14 size_t bs3fft = bs3.find_first(true);
-      CHECK_EQUAL(1U, bs3fff);
-      CHECK_EQUAL(0U, bs3fft);
+      ETL_CONSTEXPR14 etl::bitset<8> bs3(ull(0x01));
+      ETL_CONSTEXPR14 size_t bs3find_first_false = bs3.find_first(false);
+      ETL_CONSTEXPR14 size_t bs3find_first_true = bs3.find_first(true);
+      CHECK_EQUAL(1U, bs3find_first_false);
+      CHECK_EQUAL(0U, bs3find_first_true);
 
-      ETL_CONSTEXPR14 etl::bitset<9> bs4(ull(0x0020));
-      ETL_CONSTEXPR14 size_t bs4fff = bs4.find_first(false);
-      ETL_CONSTEXPR14 size_t bs4fft = bs4.find_first(true);
-      CHECK_EQUAL(0U, bs4fff);
-      CHECK_EQUAL(5U, bs4fft);
+      ETL_CONSTEXPR14 etl::bitset<8> bs4(ull(0x20));
+      ETL_CONSTEXPR14 size_t bs4find_first_false = bs4.find_first(false);
+      ETL_CONSTEXPR14 size_t bs4find_first_true = bs4.find_first(true);
+      CHECK_EQUAL(0U, bs4find_first_false);
+      CHECK_EQUAL(5U, bs4find_first_true);
 
-      ETL_CONSTEXPR14 etl::bitset<9> bs5(ull(0x0021));
-      ETL_CONSTEXPR14 size_t bs5fff = bs5.find_first(false);
-      ETL_CONSTEXPR14 size_t bs5fft = bs5.find_first(true);
-      CHECK_EQUAL(1U, bs5fff);
-      CHECK_EQUAL(0U, bs5fft);
+      ETL_CONSTEXPR14 etl::bitset<8> bs5(ull(0x21));
+      ETL_CONSTEXPR14 size_t bs5find_first_false = bs5.find_first(false);
+      ETL_CONSTEXPR14 size_t bs5find_first_true = bs5.find_first(true);
+      CHECK_EQUAL(1U, bs5find_first_false);
+      CHECK_EQUAL(0U, bs5find_first_true);
 
-      ETL_CONSTEXPR14 etl::bitset<9> bs6(ull(0x000E));
-      ETL_CONSTEXPR14 size_t bs6fff = bs6.find_first(false);
-      ETL_CONSTEXPR14 size_t bs6fft = bs6.find_first(true);
-      CHECK_EQUAL(0U, bs6fff);
-      CHECK_EQUAL(1U, bs6fft);
+      ETL_CONSTEXPR14 etl::bitset<8> bs6(ull(0x0E));
+      ETL_CONSTEXPR14 size_t bs6find_first_false = bs6.find_first(false);
+      ETL_CONSTEXPR14 size_t bs6find_first_true = bs6.find_first(true);
+      CHECK_EQUAL(0U, bs6find_first_false);
+      CHECK_EQUAL(1U, bs6find_first_true);
 
-      ETL_CONSTEXPR14 etl::bitset<9> bs7(ull(0x31));
-      ETL_CONSTEXPR14 size_t bs7fff = bs7.find_first(false);
-      ETL_CONSTEXPR14 size_t bs7fft = bs7.find_first(true);
-      CHECK_EQUAL(1U, bs7fff);
-      CHECK_EQUAL(0U, bs7fft);
+      ETL_CONSTEXPR14 etl::bitset<8> bs7(ull(0x31));
+      ETL_CONSTEXPR14 size_t bs7find_first_false = bs7.find_first(false);
+      ETL_CONSTEXPR14 size_t bs7find_first_true = bs7.find_first(true);
+      CHECK_EQUAL(1U, bs7find_first_false);
+      CHECK_EQUAL(0U, bs7find_first_true);
     }
-     
+
     //*************************************************************************
     TEST(test_find_next)
     {
-      ETL_CONSTEXPR14 etl::bitset<9> bs1(ull(0x0000));
-      ETL_CONSTEXPR14 size_t bs1fnf0 = bs1.find_next(false, 0);
-      ETL_CONSTEXPR14 size_t bs1fnf1 = bs1.find_next(false, 1);
-      ETL_CONSTEXPR14 size_t bs1fnt2 = bs1.find_next(true, 2);
-      CHECK_EQUAL(0U, bs1fnf0);
-      CHECK_EQUAL(1U, bs1fnf1);
-      CHECK_EQUAL(etl::bitset<>::npos, bs1fnt2);
+      ETL_CONSTEXPR14 etl::bitset<8> bs1(ull(0x00));
+      ETL_CONSTEXPR14 size_t bs1find_next_false0 = bs1.find_next(false, 0);
+      ETL_CONSTEXPR14 size_t bs1find_next_false1 = bs1.find_next(false, 1);
+      ETL_CONSTEXPR14 size_t bs1find_next_true2 = bs1.find_next(true, 2);
+      CHECK_EQUAL(0U, bs1find_next_false0);
+      CHECK_EQUAL(1U, bs1find_next_false1);
+      CHECK_EQUAL(etl::bitset<>::npos, bs1find_next_true2);
 
-      ETL_CONSTEXPR14 etl::bitset<9> bs2(ull(0x1FF));
-      ETL_CONSTEXPR14 size_t bs2fnt0 = bs2.find_next(true, 0);
-      ETL_CONSTEXPR14 size_t bs2fnt1 = bs2.find_next(true, 1);
-      ETL_CONSTEXPR14 size_t bs2fnf2 = bs2.find_next(false, 2);
-      CHECK_EQUAL(0U, bs2fnt0);
-      CHECK_EQUAL(1U, bs2fnt1);
-      CHECK_EQUAL(etl::bitset<>::npos, bs2fnf2);
+      ETL_CONSTEXPR14 etl::bitset<8> bs2(ull(0xFF));
+      ETL_CONSTEXPR14 size_t bs2find_next_true0 = bs2.find_next(true, 0);
+      ETL_CONSTEXPR14 size_t bs2find_next_true1 = bs2.find_next(true, 1);
+      ETL_CONSTEXPR14 size_t bs2find_next_false2 = bs2.find_next(false, 2);
+      CHECK_EQUAL(0U, bs2find_next_true0);
+      CHECK_EQUAL(1U, bs2find_next_true1);
+      CHECK_EQUAL(etl::bitset<>::npos, bs2find_next_false2);
 
-      ETL_CONSTEXPR14 etl::bitset<9> bs3(ull(0x000E));
-      ETL_CONSTEXPR14 size_t bs3fnf0 = bs3.find_next(false, 0);
-      ETL_CONSTEXPR14 size_t bs3fnt1 = bs3.find_next(true, 1);
-      ETL_CONSTEXPR14 size_t bs3fnf2 = bs3.find_next(false, 2);
-      CHECK_EQUAL(0U, bs3fnf0);
-      CHECK_EQUAL(1U, bs3fnt1);
-      CHECK_EQUAL(4U, bs3fnf2);
+      ETL_CONSTEXPR14 etl::bitset<8> bs3(ull(0x0E));
+      ETL_CONSTEXPR14 size_t bs3find_next_false0 = bs3.find_next(false, 0);
+      ETL_CONSTEXPR14 size_t bs3find_next_true1 = bs3.find_next(true, 1);
+      ETL_CONSTEXPR14 size_t bs3find_next_false2 = bs3.find_next(false, 2);
+      CHECK_EQUAL(0U, bs3find_next_false0);
+      CHECK_EQUAL(1U, bs3find_next_true1);
+      CHECK_EQUAL(4U, bs3find_next_false2);
 
-      ETL_CONSTEXPR14 etl::bitset<9> bs4(ull(0x0031));
-      ETL_CONSTEXPR14 size_t bs4fnt0 = bs4.find_next(true, 0);
-      ETL_CONSTEXPR14 size_t bs4fnf0 = bs4.find_next(false, 0);
-      ETL_CONSTEXPR14 size_t bs4fnt1 = bs4.find_next(true, 1);
-      CHECK_EQUAL(0U, bs4fnt0);
-      CHECK_EQUAL(1U, bs4fnf0);
-      CHECK_EQUAL(4U, bs4fnt1);
+      ETL_CONSTEXPR14 etl::bitset<8> bs4(ull(0x31));
+      ETL_CONSTEXPR14 size_t bs4find_next_true0 = bs4.find_next(true, 0);
+      ETL_CONSTEXPR14 size_t bs4find_next_false0 = bs4.find_next(false, 0);
+      ETL_CONSTEXPR14 size_t bs4find_next_true1 = bs4.find_next(true, 1);
+      CHECK_EQUAL(0U, bs4find_next_true0);
+      CHECK_EQUAL(1U, bs4find_next_false0);
+      CHECK_EQUAL(4U, bs4find_next_true1);
     }
 
     //*************************************************************************
-    TEST(test_find_next_github_issue_617)
+    ETL_CONSTEXPR14 std::pair<etl::bitset<8>, etl::bitset<8>> test_swap_helper()
     {
-      ETL_CONSTEXPR14 etl::bitset<64> bs1(ull(0xC000000000000031));
-      ETL_CONSTEXPR14 size_t bs1fnt1 = bs1.find_next(true, 10);
-      ETL_CONSTEXPR14 size_t bs1fnt2 = bs1.find_next(true, 59);
-      CHECK_EQUAL(62U, bs1fnt1);
-      CHECK_EQUAL(62U, bs1fnt2);
+      etl::bitset<8> data1(ull(0x2A));
+      etl::bitset<8> data2(ull(0x15));
 
-      ETL_CONSTEXPR14 etl::bitset<64> bs2(ull(0x3FFFFFFFFFFFFFCE));
-      ETL_CONSTEXPR14 size_t bs2fnf1 = bs2.find_next(false, 10);
-      ETL_CONSTEXPR14 size_t bs2fnf2 = bs2.find_next(false, 59);
-      CHECK_EQUAL(62U, bs2fnf1);
-      CHECK_EQUAL(62U, bs2fnf2);
+      swap(data1, data2);
 
-      ETL_CONSTEXPR14 etl::bitset<64, uint32_t> bs32(ull(0xC000000000000031));
-      ETL_CONSTEXPR14 size_t bs32fnt1 = bs32.find_next(true, 10);
-      ETL_CONSTEXPR14 size_t bs32fnt2 = bs32.find_next(true, 59);
-      CHECK_EQUAL(62U, bs32fnt1);
-      CHECK_EQUAL(62U, bs32fnt2);
+      return std::pair<etl::bitset<8>, etl::bitset<8>>(data1, data2);
     }
 
-    //*************************************************************************
-    //*************************************************************************
     TEST(test_swap)
     {
-      etl::bitset<9> compare1(0x2A);
-      etl::bitset<9> compare2(0x15);
-      etl::bitset<9> compare1a(0x2A);
-      etl::bitset<9> compare2a(0x15);
+      ETL_CONSTEXPR14 etl::bitset<8> compare1(0x2A);
+      ETL_CONSTEXPR14 etl::bitset<8> compare2(0x15);
 
-      swap(compare1a, compare2a);
+      ETL_CONSTEXPR14 std::pair<etl::bitset<8>, etl::bitset<8>> swapped = test_swap_helper();
 
-      CHECK(compare1 == compare2a);
-      CHECK(compare2 == compare1a);
+      CHECK(swapped.first == compare2);
+      CHECK(swapped.second == compare1);
     }
 
     //*************************************************************************
@@ -2170,10 +1690,25 @@ namespace
       etl::bitset<32> b(0x12345678UL);
 
       span_t s = b.span();
-      CHECK_EQUAL(0x78U, s[0]);
-      CHECK_EQUAL(0x56U, s[1]);
-      CHECK_EQUAL(0x34U, s[2]);
-      CHECK_EQUAL(0x12U, s[3]);
+
+      if (etl::endianness::value() == etl::endian::little)
+      {
+        CHECK_EQUAL(0x78UL, s[0]);
+        CHECK_EQUAL(0x56UL, s[1]);
+        CHECK_EQUAL(0x34UL, s[2]);
+        CHECK_EQUAL(0x12UL, s[3]);
+      }
+      else
+      {
+        CHECK_EQUAL(0x78UL, s[3]);
+        CHECK_EQUAL(0x56UL, s[2]);
+        CHECK_EQUAL(0x34UL, s[1]);
+        CHECK_EQUAL(0x12UL, s[0]);
+      }
+
+      s[2] = 0x9AU;
+      uint32_t value = b.value<uint32_t>();
+      CHECK_EQUAL(0x129A5678UL, value);
     }
 
     //*************************************************************************
@@ -2184,28 +1719,44 @@ namespace
       const etl::bitset<32> b(0x12345678UL);
 
       span_t s = b.span();
-      CHECK_EQUAL(0x78U, s[0]);
-      CHECK_EQUAL(0x56U, s[1]);
-      CHECK_EQUAL(0x34U, s[2]);
-      CHECK_EQUAL(0x12U, s[3]);
+
+      if (etl::endianness::value() == etl::endian::little)
+      {
+        CHECK_EQUAL(0x78UL, s[0]);
+        CHECK_EQUAL(0x56UL, s[1]);
+        CHECK_EQUAL(0x34UL, s[2]);
+        CHECK_EQUAL(0x12UL, s[3]);
+      }
+      else
+      {
+        CHECK_EQUAL(0x78UL, s[3]);
+        CHECK_EQUAL(0x56UL, s[2]);
+        CHECK_EQUAL(0x34UL, s[1]);
+        CHECK_EQUAL(0x12UL, s[0]);
+      }
     }
 
     //*************************************************************************
     TEST(test_to_string)
     {
-      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+      using bs32 = etl::bitset<32>;
+
+      ETL_CONSTEXPR14 bs32 b(0x12345678UL);
 
       etl::string<32> text = b.to_string('.', '*');
-      std::string stdtext  = b.to_string<std::string>('.', '*');
+      std::string stdtext = b.to_string<std::string>('.', '*');
 
-      CHECK_EQUAL("...*..*...**.*...*.*.**..****...", text.c_str());
-      CHECK_EQUAL("...*..*...**.*...*.*.**..****...", stdtext.c_str());
+      //CHECK_THROW(b.to_string<etl::string<30>>('.', '*'), etl::bitset_overflow);
+      CHECK_EQUAL(std::string("...*..*...**.*...*.*.**..****..."), std::string(text.c_str()));
+      CHECK_EQUAL(std::string("...*..*...**.*...*.*.**..****..."), std::string(stdtext.c_str()));
     }
 
     //*************************************************************************
     TEST(test_to_wstring)
     {
-      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+      using bs32 = etl::bitset<32>;
+
+      ETL_CONSTEXPR14 bs32 b(0x12345678UL);
 
       etl::wstring<32> text = b.to_string<etl::wstring<32>>(L'.', L'*');
       std::wstring stdtext = b.to_string<std::wstring>(L'.', L'*');
@@ -2217,7 +1768,9 @@ namespace
     //*************************************************************************
     TEST(test_to_u16string)
     {
-      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+      using bs32 = etl::bitset<32>;
+
+      ETL_CONSTEXPR14 bs32 b(0x12345678UL);
 
       etl::u16string<32> text = b.to_string<etl::u16string<32>>(u'.', u'*');
       std::u16string stdtext = b.to_string<std::u16string>(u'.', u'*');
@@ -2229,7 +1782,9 @@ namespace
     //*************************************************************************
     TEST(test_to_u32string)
     {
-      ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
+      using bs32 = etl::bitset<32>;
+
+      ETL_CONSTEXPR14 bs32 b(0x12345678UL);
 
       etl::u32string<32> text = b.to_string<etl::u32string<32>>(U'.', U'*');
       std::u32string stdtext = b.to_string<std::u32string>(U'.', U'*');
@@ -2238,21 +1793,21 @@ namespace
       CHECK(std::u32string(U"...*..*...**.*...*.*.**..****...") == std::u32string(stdtext.c_str()));
     }
 
-    //*************************************************************************
+    ////*************************************************************************
     TEST(test_extract_6_bit_uint8_t_with_run_time_parameters)
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t>( 0, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t>( 1, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t>( 2, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t>( 3, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t>( 4, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t>( 5, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t>( 6, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t>( 7, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t>( 8, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t>(0, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t>(1, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t>(2, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t>(3, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t>(4, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t>(5, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t>(6, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t>(7, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t>(8, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t>(9, 6)));
       CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t>(10, 6)));
       CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t>(11, 6)));
       CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t>(12, 6)));
@@ -2280,16 +1835,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t,  0, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t,  2, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t,  3, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t,  4, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t,  5, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t,  6, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t,  7, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t,  8, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t, 0, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t, 1, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t, 2, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t, 3, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t, 4, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t, 5, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t, 6, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t, 7, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t, 8, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t, 9, 6>()));
       CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 6>()));
       CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t, 11, 6>()));
       CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t, 12, 6>()));
@@ -2318,16 +1873,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>( 0, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>( 1, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>( 2, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>( 3, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>( 4, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>( 5, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>( 6, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>( 7, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>( 8, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>(0, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>(1, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>(2, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>(3, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>(4, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>(5, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>(6, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>(7, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>(8, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>(9, 6)));
       CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t>(10, 6)));
       CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t>(11, 6)));
       CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t>(12, 6)));
@@ -2355,16 +1910,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t,  0, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t,  1, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t,  2, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t,  3, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t,  4, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t,  5, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t,  6, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t,  7, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t,  8, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t, 0, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t, 1, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t, 2, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t, 3, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t, 4, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t, 5, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t, 6, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t, 7, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t, 8, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t, 9, 6>()));
       CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 6>()));
       CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t, 11, 6>()));
       CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t, 12, 6>()));
@@ -2393,16 +1948,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(uint8_t(0x78), b.extract<uint8_t>( 0, 8));
-      CHECK_EQUAL_HEX(uint8_t(0x3C), b.extract<uint8_t>( 1, 8));
-      CHECK_EQUAL_HEX(uint8_t(0x9E), b.extract<uint8_t>( 2, 8));
-      CHECK_EQUAL_HEX(uint8_t(0xCF), b.extract<uint8_t>( 3, 8));
-      CHECK_EQUAL_HEX(uint8_t(0x67), b.extract<uint8_t>( 4, 8));
-      CHECK_EQUAL_HEX(uint8_t(0xB3), b.extract<uint8_t>( 5, 8));
-      CHECK_EQUAL_HEX(uint8_t(0x59), b.extract<uint8_t>( 6, 8));
-      CHECK_EQUAL_HEX(uint8_t(0xAC), b.extract<uint8_t>( 7, 8));
-      CHECK_EQUAL_HEX(uint8_t(0x56), b.extract<uint8_t>( 8, 8));
-      CHECK_EQUAL_HEX(uint8_t(0x2B), b.extract<uint8_t>( 9, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x78), b.extract<uint8_t>(0, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), b.extract<uint8_t>(1, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), b.extract<uint8_t>(2, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), b.extract<uint8_t>(3, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x67), b.extract<uint8_t>(4, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), b.extract<uint8_t>(5, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x59), b.extract<uint8_t>(6, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), b.extract<uint8_t>(7, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x56), b.extract<uint8_t>(8, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), b.extract<uint8_t>(9, 8));
       CHECK_EQUAL_HEX(uint8_t(0x15), b.extract<uint8_t>(10, 8));
       CHECK_EQUAL_HEX(uint8_t(0x8A), b.extract<uint8_t>(11, 8));
       CHECK_EQUAL_HEX(uint8_t(0x45), b.extract<uint8_t>(12, 8));
@@ -2418,7 +1973,7 @@ namespace
       CHECK_EQUAL_HEX(uint8_t(0x48), b.extract<uint8_t>(22, 8));
       CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
       CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
-      
+
       CHECK_THROW(b.extract<uint8_t>(24, 9), etl::bitset_overflow);
       CHECK_THROW(b.extract<uint8_t>(25, 8), etl::bitset_overflow);
     }
@@ -2428,16 +1983,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(uint8_t(0x78), (b.extract<uint8_t,  0, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0x9E), (b.extract<uint8_t,  2, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0xCF), (b.extract<uint8_t,  3, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0x67), (b.extract<uint8_t,  4, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0xB3), (b.extract<uint8_t,  5, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0x59), (b.extract<uint8_t,  6, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0xAC), (b.extract<uint8_t,  7, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0x56), (b.extract<uint8_t,  8, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x78), (b.extract<uint8_t, 0, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t, 1, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), (b.extract<uint8_t, 2, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), (b.extract<uint8_t, 3, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x67), (b.extract<uint8_t, 4, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), (b.extract<uint8_t, 5, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x59), (b.extract<uint8_t, 6, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), (b.extract<uint8_t, 7, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x56), (b.extract<uint8_t, 8, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t, 9, 8>()));
       CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 8>()));
       CHECK_EQUAL_HEX(uint8_t(0x8A), (b.extract<uint8_t, 11, 8>()));
       CHECK_EQUAL_HEX(uint8_t(0x45), (b.extract<uint8_t, 12, 8>()));
@@ -2464,16 +2019,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(int8_t(0x78), b.extract<int8_t>( 0, 8));
-      CHECK_EQUAL_HEX(int8_t(0x3C), b.extract<int8_t>( 1, 8));
-      CHECK_EQUAL_HEX(int8_t(0x9E), b.extract<int8_t>( 2, 8));
-      CHECK_EQUAL_HEX(int8_t(0xCF), b.extract<int8_t>( 3, 8));
-      CHECK_EQUAL_HEX(int8_t(0x67), b.extract<int8_t>( 4, 8));
-      CHECK_EQUAL_HEX(int8_t(0xB3), b.extract<int8_t>( 5, 8));
-      CHECK_EQUAL_HEX(int8_t(0x59), b.extract<int8_t>( 6, 8));
-      CHECK_EQUAL_HEX(int8_t(0xAC), b.extract<int8_t>( 7, 8));
-      CHECK_EQUAL_HEX(int8_t(0x56), b.extract<int8_t>( 8, 8));
-      CHECK_EQUAL_HEX(int8_t(0x2B), b.extract<int8_t>( 9, 8));
+      CHECK_EQUAL_HEX(int8_t(0x78), b.extract<int8_t>(0, 8));
+      CHECK_EQUAL_HEX(int8_t(0x3C), b.extract<int8_t>(1, 8));
+      CHECK_EQUAL_HEX(int8_t(0x9E), b.extract<int8_t>(2, 8));
+      CHECK_EQUAL_HEX(int8_t(0xCF), b.extract<int8_t>(3, 8));
+      CHECK_EQUAL_HEX(int8_t(0x67), b.extract<int8_t>(4, 8));
+      CHECK_EQUAL_HEX(int8_t(0xB3), b.extract<int8_t>(5, 8));
+      CHECK_EQUAL_HEX(int8_t(0x59), b.extract<int8_t>(6, 8));
+      CHECK_EQUAL_HEX(int8_t(0xAC), b.extract<int8_t>(7, 8));
+      CHECK_EQUAL_HEX(int8_t(0x56), b.extract<int8_t>(8, 8));
+      CHECK_EQUAL_HEX(int8_t(0x2B), b.extract<int8_t>(9, 8));
       CHECK_EQUAL_HEX(int8_t(0x15), b.extract<int8_t>(10, 8));
       CHECK_EQUAL_HEX(int8_t(0x8A), b.extract<int8_t>(11, 8));
       CHECK_EQUAL_HEX(int8_t(0x45), b.extract<int8_t>(12, 8));
@@ -2499,16 +2054,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(int8_t(0x78), (b.extract<int8_t,  0, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x3C), (b.extract<int8_t,  1, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x9E), (b.extract<int8_t,  2, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0xCF), (b.extract<int8_t,  3, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x67), (b.extract<int8_t,  4, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0xB3), (b.extract<int8_t,  5, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x59), (b.extract<int8_t,  6, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0xAC), (b.extract<int8_t,  7, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x56), (b.extract<int8_t,  8, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x2B), (b.extract<int8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x78), (b.extract<int8_t, 0, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x3C), (b.extract<int8_t, 1, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x9E), (b.extract<int8_t, 2, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xCF), (b.extract<int8_t, 3, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x67), (b.extract<int8_t, 4, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xB3), (b.extract<int8_t, 5, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x59), (b.extract<int8_t, 6, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0xAC), (b.extract<int8_t, 7, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x56), (b.extract<int8_t, 8, 8>()));
+      CHECK_EQUAL_HEX(int8_t(0x2B), (b.extract<int8_t, 9, 8>()));
       CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 8>()));
       CHECK_EQUAL_HEX(int8_t(0x8A), (b.extract<int8_t, 11, 8>()));
       CHECK_EQUAL_HEX(int8_t(0x45), (b.extract<int8_t, 12, 8>()));
@@ -2535,16 +2090,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(uint16_t(0x1678), b.extract<uint16_t>( 0, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x0B3C), b.extract<uint16_t>( 1, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x0ACF), b.extract<uint16_t>( 3, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x0567), b.extract<uint16_t>( 4, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x02B3), b.extract<uint16_t>( 5, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x1159), b.extract<uint16_t>( 6, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x08AC), b.extract<uint16_t>( 7, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x1456), b.extract<uint16_t>( 8, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1678), b.extract<uint16_t>(0, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), b.extract<uint16_t>(1, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>(2, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), b.extract<uint16_t>(3, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), b.extract<uint16_t>(4, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), b.extract<uint16_t>(5, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), b.extract<uint16_t>(6, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), b.extract<uint16_t>(7, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), b.extract<uint16_t>(8, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>(9, 13));
       CHECK_EQUAL_HEX(uint16_t(0x0D15), b.extract<uint16_t>(10, 13));
       CHECK_EQUAL_HEX(uint16_t(0x068A), b.extract<uint16_t>(11, 13));
       CHECK_EQUAL_HEX(uint16_t(0x0345), b.extract<uint16_t>(12, 13));
@@ -2565,26 +2120,26 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(uint16_t(0x1678), (b.extract<uint16_t,  0,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x0B3C), (b.extract<uint16_t,  1,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x0ACF), (b.extract<uint16_t,  3,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x0567), (b.extract<uint16_t,  4,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x02B3), (b.extract<uint16_t,  5,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x1159), (b.extract<uint16_t,  6,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x08AC), (b.extract<uint16_t,  7,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x1456), (b.extract<uint16_t,  8,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x0D15), (b.extract<uint16_t, 10,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x068A), (b.extract<uint16_t, 11,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x0345), (b.extract<uint16_t, 12,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x11A2), (b.extract<uint16_t, 13,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x08D1), (b.extract<uint16_t, 14,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x0468), (b.extract<uint16_t, 15,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x091A), (b.extract<uint16_t, 17,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x048D), (b.extract<uint16_t, 18,13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x0246), (b.extract<uint16_t, 19,13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1678), (b.extract<uint16_t, 0, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), (b.extract<uint16_t, 1, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t, 2, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), (b.extract<uint16_t, 3, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), (b.extract<uint16_t, 4, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), (b.extract<uint16_t, 5, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), (b.extract<uint16_t, 6, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), (b.extract<uint16_t, 7, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), (b.extract<uint16_t, 8, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t, 9, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0D15), (b.extract<uint16_t, 10, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x068A), (b.extract<uint16_t, 11, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0345), (b.extract<uint16_t, 12, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x11A2), (b.extract<uint16_t, 13, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08D1), (b.extract<uint16_t, 14, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0468), (b.extract<uint16_t, 15, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x091A), (b.extract<uint16_t, 17, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x048D), (b.extract<uint16_t, 18, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0246), (b.extract<uint16_t, 19, 13>()));
 
       // The lines below should static assert.
       //uint16_t v1 = b.extract<uint16_t, 19, 14);
@@ -2596,16 +2151,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(uint16_t(0x5678), b.extract<uint16_t>( 0, 16));
-      CHECK_EQUAL_HEX(uint16_t(0x2B3C), b.extract<uint16_t>( 1, 16));
-      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 16));
-      CHECK_EQUAL_HEX(uint16_t(0x8ACF), b.extract<uint16_t>( 3, 16));
-      CHECK_EQUAL_HEX(uint16_t(0x4567), b.extract<uint16_t>( 4, 16));
-      CHECK_EQUAL_HEX(uint16_t(0xA2B3), b.extract<uint16_t>( 5, 16));
-      CHECK_EQUAL_HEX(uint16_t(0xD159), b.extract<uint16_t>( 6, 16));
-      CHECK_EQUAL_HEX(uint16_t(0x68AC), b.extract<uint16_t>( 7, 16));
-      CHECK_EQUAL_HEX(uint16_t(0x3456), b.extract<uint16_t>( 8, 16));
-      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x5678), b.extract<uint16_t>(0, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), b.extract<uint16_t>(1, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>(2, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), b.extract<uint16_t>(3, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), b.extract<uint16_t>(4, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), b.extract<uint16_t>(5, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), b.extract<uint16_t>(6, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), b.extract<uint16_t>(7, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), b.extract<uint16_t>(8, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>(9, 16));
       CHECK_EQUAL_HEX(uint16_t(0x8D15), b.extract<uint16_t>(10, 16));
       CHECK_EQUAL_HEX(uint16_t(0x468A), b.extract<uint16_t>(11, 16));
       CHECK_EQUAL_HEX(uint16_t(0x2345), b.extract<uint16_t>(12, 16));
@@ -2623,16 +2178,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(uint16_t(0x5678), (b.extract<uint16_t,  0, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0x2B3C), (b.extract<uint16_t,  1, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0x8ACF), (b.extract<uint16_t,  3, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0x4567), (b.extract<uint16_t,  4, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0xA2B3), (b.extract<uint16_t,  5, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0xD159), (b.extract<uint16_t,  6, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0x68AC), (b.extract<uint16_t,  7, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0x3456), (b.extract<uint16_t,  8, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x5678), (b.extract<uint16_t, 0, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), (b.extract<uint16_t, 1, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t, 2, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), (b.extract<uint16_t, 3, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), (b.extract<uint16_t, 4, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), (b.extract<uint16_t, 5, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), (b.extract<uint16_t, 6, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), (b.extract<uint16_t, 7, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), (b.extract<uint16_t, 8, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t, 9, 16>()));
       CHECK_EQUAL_HEX(uint16_t(0x8D15), (b.extract<uint16_t, 10, 16>()));
       CHECK_EQUAL_HEX(uint16_t(0x468A), (b.extract<uint16_t, 11, 16>()));
       CHECK_EQUAL_HEX(uint16_t(0x2345), (b.extract<uint16_t, 12, 16>()));
@@ -2651,16 +2206,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>( 0, 16));
-      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>( 1, 16));
-      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>( 2, 16));
-      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>( 3, 16));
-      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>( 4, 16));
-      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>( 5, 16));
-      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>( 6, 16));
-      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>( 7, 16));
-      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>( 8, 16));
-      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>( 9, 16));
+      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>(0, 16));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>(1, 16));
+      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>(2, 16));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>(3, 16));
+      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>(4, 16));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>(5, 16));
+      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>(6, 16));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>(7, 16));
+      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>(8, 16));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>(9, 16));
       CHECK_EQUAL_HEX(int16_t(0x8D15), b.extract<int16_t>(10, 16));
       CHECK_EQUAL_HEX(int16_t(0x468A), b.extract<int16_t>(11, 16));
       CHECK_EQUAL_HEX(int16_t(0x2345), b.extract<int16_t>(12, 16));
@@ -2678,16 +2233,16 @@ namespace
     {
       ETL_CONSTEXPR14 etl::bitset<32> b(0x12345678UL);
 
-      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t,  0, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t,  1, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t,  2, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t,  3, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t,  4, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t,  5, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t,  6, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t,  7, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t,  8, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t, 0, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t, 1, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t, 2, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t, 3, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t, 4, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t, 5, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t, 6, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t, 7, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t, 8, 16>()));
+      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t, 9, 16>()));
       CHECK_EQUAL_HEX(int16_t(0x8D15), (b.extract<int16_t, 10, 16>()));
       CHECK_EQUAL_HEX(int16_t(0x468A), (b.extract<int16_t, 11, 16>()));
       CHECK_EQUAL_HEX(int16_t(0x2345), (b.extract<int16_t, 12, 16>()));
diff --git a/test/test_bitset_new_explicit_single_element_type.cpp b/test/test_bitset_new_explicit_single_element_type.cpp
index 18d19157..0ce70049 100644
--- a/test/test_bitset_new_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_explicit_single_element_type.cpp
@@ -117,7 +117,7 @@ namespace
     return data2;
   }
 
-  SUITE(test_bitset_new_implicit_element_type)
+  SUITE(test_bitset_new_explicit_element_type)
   {
     //*************************************************************************
     TEST(test_default_constructor)
@@ -142,15 +142,20 @@ namespace
       etl::bitset<32, uint32_t> data32;
       etl::bitset<64, uint64_t> data64;
 
+      CHECK_EQUAL(8,  data8.Size);
+      CHECK_EQUAL(16, data16.Size);
+      CHECK_EQUAL(32, data32.Size);
+      CHECK_EQUAL(64, data64.Size);
+
       CHECK_EQUAL(1U, data8.Number_Of_Elements);
       CHECK_EQUAL(1U, data16.Number_Of_Elements);
       CHECK_EQUAL(1U, data32.Number_Of_Elements);
       CHECK_EQUAL(1U, data64.Number_Of_Elements);
 
-      CHECK_EQUAL(etl::bitset_layout::Single, data8.Element_Layout);
-      CHECK_EQUAL(etl::bitset_layout::Single, data16.Element_Layout);
-      CHECK_EQUAL(etl::bitset_layout::Single, data32.Element_Layout);
-      CHECK_EQUAL(etl::bitset_layout::Single, data64.Element_Layout);
+      CHECK_EQUAL(etl::bitset_storage_model::Single, data8.Storage_Model);
+      CHECK_EQUAL(etl::bitset_storage_model::Single, data16.Storage_Model);
+      CHECK_EQUAL(etl::bitset_storage_model::Single, data32.Storage_Model);
+      CHECK_EQUAL(etl::bitset_storage_model::Single, data64.Storage_Model);
     }
 
     //*************************************************************************
@@ -554,7 +559,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_char16_t_6string)
+    TEST(test_from_string_with_char16_t)
     {
       std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
       etl::bitset<64, uint64_t> data;
@@ -1808,6 +1813,9 @@ namespace
 
       span_t s = b.span();
       CHECK_EQUAL(0x12345678UL, s[0]);
+
+      s[0] = 0x87654321UL;
+      CHECK_EQUAL(0x87654321UL, b.value<uint32_t>());
     }
 
     //*************************************************************************
diff --git a/test/test_bitset_new_ext_default_element_type.cpp b/test/test_bitset_new_ext_default_element_type.cpp
index 7cd47788..d62d5c42 100644
--- a/test/test_bitset_new_ext_default_element_type.cpp
+++ b/test/test_bitset_new_ext_default_element_type.cpp
@@ -37,6 +37,7 @@ SOFTWARE.
 #include "etl/wstring.h"
 #include "etl/u16string.h"
 #include "etl/u32string.h"
+#include "etl/endianness.h"
 
 namespace
 {
@@ -44,729 +45,6 @@ namespace
 
   SUITE(test_bitset_new_ext_default_element_type)
   {
-    //*************************************************************************
-    TEST(test_default_constructor)
-    {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare;
-      etl::bitset_ext<60> data(buffer);
-
-      CHECK_EQUAL(compare.size(),  data.size());
-      CHECK_EQUAL(compare.count(), data.count());
-
-      for (size_t i = 0UL; i < data.size(); ++i)
-      {
-        CHECK_EQUAL(compare.test(i), data.test(i));
-      }
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_multi_element)
-    {
-      etl::bitset_ext<14, int8_t>::buffer_type buffer14;
-      etl::bitset_ext<30, int16_t>::buffer_type buffer30;
-      etl::bitset_ext<62, int32_t>::buffer_type buffer62;
-
-      etl::bitset_ext<14, int8_t>  data8(buffer14);
-      etl::bitset_ext<30, int16_t> data16(buffer30);
-      etl::bitset_ext<62, int32_t> data32(buffer62);
-
-      CHECK_EQUAL(2U, data8.Number_Of_Elements);
-      CHECK_EQUAL(2U, data16.Number_Of_Elements);
-      CHECK_EQUAL(2U, data32.Number_Of_Elements);
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_default_element_type_bits)
-    {
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<1>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<2>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<3>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<4>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<5>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<6>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<7>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<8>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<9>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<10>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<11>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<12>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<13>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<14>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<15>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<16>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<17>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<18>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<19>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<20>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<21>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<22>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<23>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<24>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<25>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<26>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<27>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<28>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<29>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<30>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<31>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<32>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<33>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<34>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<35>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<36>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<37>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<38>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<39>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<40>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<41>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<42>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<43>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<44>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<45>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<46>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<47>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<48>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<49>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<50>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<51>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<52>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<53>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<54>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<55>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<56>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<57>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<58>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<59>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<60>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<61>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<62>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<63>::element_type>::bits);
-      CHECK_EQUAL(8U, etl::integral_limits<etl::bitset_ext<64>::element_type>::bits);
-    }
-     
-    //*************************************************************************
-    TEST(test_default_constructor_default_element_type_number_of_elements)
-    {
-      CHECK_EQUAL(1U, etl::bitset_ext<1>::Number_Of_Elements);
-      CHECK_EQUAL(1U, etl::bitset_ext<2>::Number_Of_Elements);
-      CHECK_EQUAL(1U, etl::bitset_ext<3>::Number_Of_Elements);
-      CHECK_EQUAL(1U, etl::bitset_ext<4>::Number_Of_Elements);
-      CHECK_EQUAL(1U, etl::bitset_ext<5>::Number_Of_Elements);
-      CHECK_EQUAL(1U, etl::bitset_ext<6>::Number_Of_Elements);
-      CHECK_EQUAL(1U, etl::bitset_ext<7>::Number_Of_Elements);
-      CHECK_EQUAL(1U, etl::bitset_ext<8>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset_ext<9>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset_ext<10>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset_ext<11>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset_ext<12>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset_ext<13>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset_ext<14>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset_ext<15>::Number_Of_Elements);
-      CHECK_EQUAL(2U, etl::bitset_ext<16>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset_ext<17>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset_ext<18>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset_ext<19>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset_ext<20>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset_ext<21>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset_ext<22>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset_ext<23>::Number_Of_Elements);
-      CHECK_EQUAL(3U, etl::bitset_ext<24>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset_ext<25>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset_ext<26>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset_ext<27>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset_ext<28>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset_ext<29>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset_ext<30>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset_ext<31>::Number_Of_Elements);
-      CHECK_EQUAL(4U, etl::bitset_ext<32>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset_ext<33>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset_ext<34>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset_ext<35>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset_ext<36>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset_ext<37>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset_ext<38>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset_ext<39>::Number_Of_Elements);
-      CHECK_EQUAL(5U, etl::bitset_ext<40>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset_ext<41>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset_ext<42>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset_ext<43>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset_ext<44>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset_ext<45>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset_ext<46>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset_ext<47>::Number_Of_Elements);
-      CHECK_EQUAL(6U, etl::bitset_ext<48>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset_ext<49>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset_ext<50>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset_ext<51>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset_ext<52>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset_ext<53>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset_ext<54>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset_ext<55>::Number_Of_Elements);
-      CHECK_EQUAL(7U, etl::bitset_ext<56>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset_ext<57>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset_ext<58>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset_ext<59>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset_ext<60>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset_ext<61>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset_ext<62>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset_ext<63>::Number_Of_Elements);
-      CHECK_EQUAL(8U, etl::bitset_ext<64>::Number_Of_Elements);
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int8_t_element_types_bits)
-    {
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<1, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<2, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<3, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<4, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<5, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<6, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<7, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<8, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<9, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<10, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<11, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<12, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<13, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<14, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<15, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<16, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<17, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<18, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<19, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<20, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<21, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<22, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<23, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<24, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<25, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<26, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<27, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<28, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<29, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<30, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<31, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<32, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<33, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<34, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<35, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<36, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<37, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<38, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<39, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<40, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<41, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<42, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<43, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<44, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<45, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<46, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<47, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<48, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<49, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<50, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<51, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<52, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<53, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<54, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<55, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<56, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<57, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<58, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<59, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<60, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<61, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<62, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<63, int8_t>::element_type>::bits));
-      CHECK_EQUAL(8U, (etl::integral_limits<etl::bitset_ext<64, int8_t>::element_type>::bits));
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int8_t_element_types_number_of_elements)
-    {
-      CHECK_EQUAL(1U, (etl::bitset_ext<1, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<2, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<3, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<4, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<5, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<6, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<7, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<8, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<9, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<10, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<11, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<12, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<13, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<14, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<15, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<16, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<17, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<18, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<19, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<20, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<21, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<22, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<23, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<24, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<25, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<26, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<27, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<28, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<29, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<30, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<31, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<32, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset_ext<33, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset_ext<34, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset_ext<35, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset_ext<36, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset_ext<37, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset_ext<38, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset_ext<39, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(5U, (etl::bitset_ext<40, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset_ext<41, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset_ext<42, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset_ext<43, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset_ext<44, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset_ext<45, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset_ext<46, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset_ext<47, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(6U, (etl::bitset_ext<48, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset_ext<49, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset_ext<50, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset_ext<51, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset_ext<52, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset_ext<53, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset_ext<54, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset_ext<55, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(7U, (etl::bitset_ext<56, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset_ext<57, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset_ext<58, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset_ext<59, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset_ext<60, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset_ext<61, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset_ext<62, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset_ext<63, int8_t>::Number_Of_Elements));
-      CHECK_EQUAL(8U, (etl::bitset_ext<64, int8_t>::Number_Of_Elements));
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int16_t_element_types_bits)
-    {
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<1, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<2, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<3, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<4, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<5, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<6, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<7, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<8, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<9, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<10, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<11, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<12, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<13, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<14, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<15, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<16, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<17, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<18, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<19, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<20, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<21, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<22, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<23, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<24, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<25, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<26, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<27, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<28, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<29, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<30, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<31, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<32, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<33, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<34, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<35, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<36, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<37, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<38, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<39, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<40, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<41, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<42, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<43, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<44, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<45, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<46, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<47, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<48, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<49, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<50, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<51, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<52, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<53, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<54, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<55, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<56, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<57, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<58, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<59, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<60, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<61, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<62, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<63, int16_t>::element_type>::bits));
-      CHECK_EQUAL(16U, (etl::integral_limits<etl::bitset_ext<64, int16_t>::element_type>::bits));
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int16_t_element_types_number_of_elements)
-    {
-      CHECK_EQUAL(1U, (etl::bitset_ext<1, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<2, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<3, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<4, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<5, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<6, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<7, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<8, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<9, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<10, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<11, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<12, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<13, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<14, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<15, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<16, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<17, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<18, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<19, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<20, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<21, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<22, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<23, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<24, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<25, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<26, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<27, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<28, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<29, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<30, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<31, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<32, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<33, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<34, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<35, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<36, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<37, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<38, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<39, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<40, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<41, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<42, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<43, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<44, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<45, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<46, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<47, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(3U, (etl::bitset_ext<48, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<49, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<50, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<51, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<52, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<53, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<54, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<55, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<56, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<57, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<58, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<59, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<60, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<61, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<62, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<63, int16_t>::Number_Of_Elements));
-      CHECK_EQUAL(4U, (etl::bitset_ext<64, int16_t>::Number_Of_Elements));
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int32_t_element_types_bits)
-    {
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<1, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<2, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<3, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<4, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<5, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<6, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<7, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<8, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<9, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<10, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<11, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<12, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<13, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<14, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<15, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<16, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<17, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<18, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<19, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<20, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<21, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<22, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<23, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<24, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<25, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<26, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<27, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<28, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<29, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<30, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<31, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<32, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<33, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<34, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<35, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<36, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<37, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<38, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<39, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<40, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<41, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<42, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<43, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<44, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<45, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<46, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<47, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<48, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<49, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<50, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<51, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<52, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<53, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<54, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<55, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<56, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<57, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<58, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<59, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<60, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<61, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<62, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<63, int32_t>::element_type>::bits));
-      CHECK_EQUAL(32U, (etl::integral_limits<etl::bitset_ext<64, int32_t>::element_type>::bits));
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int32_t_element_types_number_of_elements)
-    {
-      CHECK_EQUAL(1U, (etl::bitset_ext<1, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<2, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<3, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<4, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<5, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<6, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<7, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<8, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<9, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<10, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<11, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<12, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<13, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<14, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<15, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<16, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<17, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<18, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<19, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<20, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<21, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<22, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<23, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<24, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<25, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<26, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<27, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<28, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<29, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<30, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<31, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<32, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<33, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<34, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<35, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<36, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<37, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<38, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<39, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<40, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<41, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<42, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<43, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<44, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<45, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<46, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<47, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<48, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<49, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<50, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<51, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<52, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<53, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<54, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<55, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<56, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<57, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<58, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<59, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<60, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<61, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<62, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<63, int32_t>::Number_Of_Elements));
-      CHECK_EQUAL(2U, (etl::bitset_ext<64, int32_t>::Number_Of_Elements));
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int64_t_element_types_bits)
-    {
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<1, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<2, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<3, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<4, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<5, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<6, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<7, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<8, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<9, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<10, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<11, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<12, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<13, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<14, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<15, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<16, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<17, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<18, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<19, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<20, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<21, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<22, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<23, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<24, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<25, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<26, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<27, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<28, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<29, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<30, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<31, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<32, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<33, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<34, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<35, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<36, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<37, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<38, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<39, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<40, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<41, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<42, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<43, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<44, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<45, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<46, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<47, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<48, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<49, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<50, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<51, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<52, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<53, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<54, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<55, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<56, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<57, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<58, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<59, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<60, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<61, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<62, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<63, int64_t>::element_type>::bits));
-      CHECK_EQUAL(64U, (etl::integral_limits<etl::bitset_ext<64, int64_t>::element_type>::bits));
-    }
-
-    //*************************************************************************
-    TEST(test_default_constructor_explicit_int64_t_element_types_number_of_elements)
-    {
-      CHECK_EQUAL(1U, (etl::bitset_ext<1, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<2, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<3, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<4, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<5, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<6, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<7, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<8, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<9, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<10, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<11, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<12, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<13, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<14, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<15, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<16, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<17, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<18, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<19, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<20, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<21, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<22, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<23, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<24, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<25, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<26, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<27, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<28, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<29, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<30, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<31, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<32, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<33, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<34, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<35, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<36, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<37, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<38, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<39, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<40, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<41, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<42, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<43, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<44, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<45, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<46, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<47, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<48, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<49, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<50, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<51, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<52, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<53, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<54, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<55, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<56, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<57, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<58, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<59, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<60, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<61, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<62, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<63, int64_t>::Number_Of_Elements));
-      CHECK_EQUAL(1U, (etl::bitset_ext<64, int64_t>::Number_Of_Elements));
-    }
-
     //*************************************************************************
     TEST(test_construct_from_nullptr_buffer)
     {
@@ -777,23 +55,55 @@ namespace
 
       CHECK_THROW(BsExt bs1(nullptr), etl::bitset_invalid_buffer);
       CHECK_THROW(BsExt bs2b(bs2a, nullptr), etl::bitset_invalid_buffer);
-      CHECK_THROW(BsExt bs3(0ULL,  nullptr), etl::bitset_invalid_buffer);
-      CHECK_THROW(BsExt bs4("0",   nullptr), etl::bitset_invalid_buffer);
-      CHECK_THROW(BsExt bs5(L"0",  nullptr), etl::bitset_invalid_buffer);
-      CHECK_THROW(BsExt bs6(u"0",  nullptr), etl::bitset_invalid_buffer);
-      CHECK_THROW(BsExt bs7(U"0",  nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs3(0ULL, nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs4("0", nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs5(L"0", nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs6(u"0", nullptr), etl::bitset_invalid_buffer);
+      CHECK_THROW(BsExt bs7(U"0", nullptr), etl::bitset_invalid_buffer);
+    }
+
+    //*************************************************************************
+    TEST(test_default_constructor_from_array)
+    {
+      etl::bitset_ext<64>::element_type buffer[etl::bitset_ext<64>::Number_Of_Elements];
+      std::bitset<64> compare;
+      etl::bitset_ext<64> data(buffer);
+
+      CHECK_EQUAL(compare.size(), data.size());
+      CHECK_EQUAL(compare.count(), data.count());
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    TEST(test_default_constructor_from_buffer_type)
+    {
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare;
+      etl::bitset_ext<64> data(buffer);
+
+      CHECK_EQUAL(compare.size(), data.size());
+      CHECK_EQUAL(compare.count(), data.count());
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
     }
 
     //*************************************************************************
     TEST(test_construct_from_value)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
+      etl::bitset_ext<64>::buffer_type buffer1;
+      std::bitset<64> compare(0x123456731234567ULL);
+      etl::bitset_ext<64> data(0x123456731234567ULL, buffer1);
 
-      std::bitset<60> compare(0x123456731234567ULL);
-      etl::bitset_ext<60> data(0x123456731234567ULL, buffer);
-
-      CHECK_EQUAL(compare.size(),  data.size());
+      CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
+      CHECK_EQUAL_HEX(compare.to_ullong(), data.to_ullong());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -804,12 +114,11 @@ namespace
     //*************************************************************************
     TEST(test_copy_construct)
     {
-      etl::bitset_ext<60>::buffer_type buffer1;
-      etl::bitset_ext<60>::buffer_type buffer2;
-
-      std::bitset<60> compare(0x123456731234567ULL);
-      etl::bitset_ext<60> data(0x123456731234567ULL, buffer1);
-      etl::bitset_ext<60> data_copy(data, buffer2);
+      etl::bitset_ext<64>::buffer_type buffer1;
+      etl::bitset_ext<64>::buffer_type buffer2;
+      std::bitset<64> compare(0x123456731234567ULL);
+      etl::bitset_ext<64> data(0x123456731234567ULL, buffer1);
+      etl::bitset_ext<64> data_copy(data, buffer2);
 
       CHECK_EQUAL(compare.size(), data_copy.size());
       CHECK_EQUAL(compare.count(), data_copy.count());
@@ -823,12 +132,11 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_excess_value)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare(0x8765432187654321ULL);
+      etl::bitset_ext<64> data(0x8765432187654321ULL, buffer);
 
-      std::bitset<60> compare(0x8765432187654321ULL);
-      etl::bitset_ext<60> data(0x8765432187654321ULL, buffer);
-
-      CHECK_EQUAL(compare.size(),  data.size());
+      CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
 
       for (size_t i = 0UL; i < data.size(); ++i)
@@ -840,12 +148,11 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_char_string)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset_ext<64> data("110001001000110100010101100111001100010010001101000101011001", buffer);
 
-      std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<60> data("110001001000110100010101100111001100010010001101000101011001", buffer);
-
-      CHECK_EQUAL(compare.size(),  data.size());
+      CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
 
       for (size_t i = 0UL; i < data.size(); ++i)
@@ -857,10 +164,9 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_wchar_t_string)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare(L"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<60> data(L"110001001000110100010101100111001100010010001101000101011001", buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare(L"110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset_ext<64> data(L"110001001000110100010101100111001100010010001101000101011001", buffer);
 
       CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -874,10 +180,9 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_char16_t_string)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare(u"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<60> data(u"110001001000110100010101100111001100010010001101000101011001", buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare(u"110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset_ext<64> data(u"110001001000110100010101100111001100010010001101000101011001", buffer);
 
       CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -891,10 +196,9 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_char32_t_string)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare(U"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<60> data(U"110001001000110100010101100111001100010010001101000101011001", buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare(U"110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset_ext<64> data(U"110001001000110100010101100111001100010010001101000101011001", buffer);
 
       CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
@@ -908,10 +212,9 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_nullptr_char_string)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
       const char* s = nullptr;
 
+      etl::bitset_ext<60>::buffer_type buffer;
       etl::bitset_ext<60> data(s, buffer);
 
       CHECK_EQUAL(60, data.size());
@@ -921,10 +224,9 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_nullptr_wchar_t_string)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
       const wchar_t* s = nullptr;
 
+      etl::bitset_ext<60>::buffer_type buffer;
       etl::bitset_ext<60> data(s, buffer);
 
       CHECK_EQUAL(60, data.size());
@@ -934,10 +236,9 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_nullptr_char16_t_string)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
       const char16_t* s = nullptr;
 
+      etl::bitset_ext<60>::buffer_type buffer;
       etl::bitset_ext<60> data(s, buffer);
 
       CHECK_EQUAL(60, data.size());
@@ -947,10 +248,9 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_nullptr_char32_t_string)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
       const char32_t* s = nullptr;
 
+      etl::bitset_ext<60>::buffer_type buffer;
       etl::bitset_ext<60> data(s, buffer);
 
       CHECK_EQUAL(60, data.size());
@@ -960,16 +260,17 @@ namespace
     //*************************************************************************
     TEST(test_construct_from_excess_string)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001111100001");
+      etl::bitset_ext<64> data("110001001000110100010101100111001100010010001101000101011001111100001", buffer);
 
-      std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001111100001");
-      etl::bitset_ext<60> data("110001001000110100010101100111001100010010001101000101011001111100001", buffer);
-
-      CHECK_EQUAL(compare.size(),  data.size());
+      CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(),  data.none());
-      CHECK_EQUAL(compare.any(),   data.any());
-      CHECK_EQUAL(compare.all(),   data.all());
+      CHECK_EQUAL(compare.none(), data.none());
+      CHECK_EQUAL(compare.any(), data.any());
+      CHECK_EQUAL(compare.all(), data.all());
+
+      CHECK_EQUAL_HEX(compare.to_ullong(), data.to_ullong());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -977,22 +278,55 @@ namespace
       }
     }
 
-    //*************************************************************************    
+    //*************************************************************************
     TEST(test_set)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare;
+      etl::bitset_ext<64> data(buffer);
 
+      compare.set();
+      data.set();
+
+      auto size = data.size();
+      auto count = data.count();
+      auto none = data.none();
+      auto any = data.any();
+      auto all = data.all();
+
+      CHECK_EQUAL(compare.size(), size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(), none);
+      CHECK_EQUAL(compare.any(), any);
+      CHECK_EQUAL(compare.all(), all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    TEST(test_set_less_than_full_size)
+    {
+      etl::bitset_ext<60>::buffer_type buffer;
       std::bitset<60> compare;
       etl::bitset_ext<60> data(buffer);
 
       compare.set();
       data.set();
 
-      CHECK_EQUAL(compare.size(),  data.size());
-      CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(),  data.none());
-      CHECK_EQUAL(compare.any(),   data.any());
-      CHECK_EQUAL(compare.all(),   data.all());
+      auto size = data.size();
+      auto count = data.count();
+      auto none = data.none();
+      auto any = data.any();
+      auto all = data.all();
+
+      CHECK_EQUAL(compare.size(), size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(), none);
+      CHECK_EQUAL(compare.any(), any);
+      CHECK_EQUAL(compare.all(), all);
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -1003,18 +337,17 @@ namespace
     //*************************************************************************
     TEST(test_set_with_char_string)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset_ext<64> data(buffer);
 
       data.set("110001001000110100010101100111001100010010001101000101011001");
 
-      CHECK_EQUAL(compare.size(),  data.size());
+      CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(),  data.none());
-      CHECK_EQUAL(compare.any(),   data.any());
-      CHECK_EQUAL(compare.all(),   data.all());
+      CHECK_EQUAL(compare.none(), data.none());
+      CHECK_EQUAL(compare.any(), data.any());
+      CHECK_EQUAL(compare.all(), data.all());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -1025,10 +358,9 @@ namespace
     //*************************************************************************
     TEST(test_set_with_wchar_t_string)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare(L"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare(L"110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset_ext<64> data(buffer);
 
       data.set(L"110001001000110100010101100111001100010010001101000101011001");
 
@@ -1047,10 +379,9 @@ namespace
     //*************************************************************************
     TEST(test_set_with_char16_t_string)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare(u"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare(u"110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset_ext<64> data(buffer);
 
       data.set(u"110001001000110100010101100111001100010010001101000101011001");
 
@@ -1069,10 +400,9 @@ namespace
     //*************************************************************************
     TEST(test_set_with_char32_t_string)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare(U"110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare(U"110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset_ext<64> data(buffer);
 
       data.set(U"110001001000110100010101100111001100010010001101000101011001");
 
@@ -1093,11 +423,11 @@ namespace
     {
       const char* s = nullptr;
 
-      etl::bitset_ext<60>::buffer_type buffer;
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      etl::bitset_ext<64> data(buffer);
       data.set(s);
 
-      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(64, data.size());
       CHECK_EQUAL(0, data.count());
     }
 
@@ -1106,11 +436,11 @@ namespace
     {
       const wchar_t* s = nullptr;
 
-      etl::bitset_ext<60>::buffer_type buffer;
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      etl::bitset_ext<64> data(buffer);
       data.set(s);
 
-      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(64, data.size());
       CHECK_EQUAL(0, data.count());
     }
 
@@ -1119,11 +449,11 @@ namespace
     {
       const char16_t* s = nullptr;
 
-      etl::bitset_ext<60>::buffer_type buffer;
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      etl::bitset_ext<64> data(buffer);
       data.set(s);
 
-      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(64, data.size());
       CHECK_EQUAL(0, data.count());
     }
 
@@ -1132,21 +462,20 @@ namespace
     {
       const char32_t* s = nullptr;
 
-      etl::bitset_ext<60>::buffer_type buffer;
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      etl::bitset_ext<64> data(buffer);
       data.set(s);
 
-      CHECK_EQUAL(60, data.size());
+      CHECK_EQUAL(64, data.size());
       CHECK_EQUAL(0, data.count());
     }
 
     //*************************************************************************
     TEST(test_from_string_with_char)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset_ext<64> data(buffer);
 
       data.from_string("110001001000110100010101100111001100010010001101000101011001");
 
@@ -1165,10 +494,9 @@ namespace
     //*************************************************************************
     TEST(test_from_string_with_wchar_t)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset_ext<64> data(buffer);
 
       data.from_string(L"110001001000110100010101100111001100010010001101000101011001");
 
@@ -1185,12 +513,11 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_from_char16_t_6string)
+    TEST(test_from_string_with_char16_t)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset_ext<64> data(buffer);
 
       data.from_string(u"110001001000110100010101100111001100010010001101000101011001");
 
@@ -1209,10 +536,9 @@ namespace
     //*************************************************************************
     TEST(test_from_string_with_char32_t)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare("110001001000110100010101100111001100010010001101000101011001");
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare("110001001000110100010101100111001100010010001101000101011001");
+      etl::bitset_ext<64> data(buffer);
 
       data.from_string(U"110001001000110100010101100111001100010010001101000101011001");
 
@@ -1280,11 +606,50 @@ namespace
       CHECK_EQUAL(0, data.count());
     }
 
+    //*************************************************************************
+    TEST(test_value_u8_min)
+    {
+      etl::bitset_ext<8>::buffer_type buffer;
+      etl::bitset_ext<8> data((unsigned long long)etl::integral_limits<uint8_t>::min, buffer);
+      uint8_t value = data.value<uint8_t>();
+
+      CHECK_EQUAL(std::numeric_limits<uint8_t>::min(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_value_u8_max)
+    {
+      etl::bitset_ext<8>::buffer_type buffer;
+      etl::bitset_ext<8> data((unsigned long long)etl::integral_limits<uint8_t>::max, buffer);
+      uint8_t value = data.value<uint8_t>();
+
+      CHECK_EQUAL(std::numeric_limits<uint8_t>::max(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_value_s8_min)
+    {
+      etl::bitset_ext<8>::buffer_type buffer;
+      etl::bitset_ext<8> data((unsigned long long)etl::integral_limits<uint8_t>::min, buffer);
+      uint8_t value = data.value<uint8_t>();
+
+      CHECK_EQUAL(std::numeric_limits<uint8_t>::min(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_value_s8_max)
+    {
+      etl::bitset_ext<8>::buffer_type buffer;
+      etl::bitset_ext<8> data((unsigned long long)etl::integral_limits<uint8_t>::max, buffer);
+      uint8_t value = data.value<uint8_t>();
+
+      CHECK_EQUAL(std::numeric_limits<uint8_t>::max(), value);
+    }
+
     //*************************************************************************
     TEST(test_value_u16_min)
     {
       etl::bitset_ext<16>::buffer_type buffer;
-
       etl::bitset_ext<16> data((unsigned long long)etl::integral_limits<uint16_t>::min, buffer);
       uint16_t value = data.value<uint16_t>();
 
@@ -1295,7 +660,6 @@ namespace
     TEST(test_value_u16_max)
     {
       etl::bitset_ext<16>::buffer_type buffer;
-
       etl::bitset_ext<16> data((unsigned long long)etl::integral_limits<uint16_t>::max, buffer);
       uint16_t value = data.value<uint16_t>();
 
@@ -1306,29 +670,26 @@ namespace
     TEST(test_value_s16_min)
     {
       etl::bitset_ext<16>::buffer_type buffer;
+      etl::bitset_ext<16> data((unsigned long long)etl::integral_limits<uint16_t>::min, buffer);
+      uint16_t value = data.value<uint16_t>();
 
-      etl::bitset_ext<16> data((unsigned long long)etl::integral_limits<int16_t>::min, buffer);
-      int16_t value = data.value<int16_t>();
-
-      CHECK_EQUAL(std::numeric_limits<int16_t>::min(), value);
+      CHECK_EQUAL(std::numeric_limits<uint16_t>::min(), value);
     }
 
     //*************************************************************************
     TEST(test_value_s16_max)
     {
       etl::bitset_ext<16>::buffer_type buffer;
+      etl::bitset_ext<16> data((unsigned long long)etl::integral_limits<uint16_t>::max, buffer);
+      uint16_t value = data.value<uint16_t>();
 
-      etl::bitset_ext<16> data((unsigned long long)etl::integral_limits<int16_t>::max, buffer);
-      int16_t value = data.value<int16_t>();
-
-      CHECK_EQUAL(std::numeric_limits<int16_t>::max(), value);
+      CHECK_EQUAL(std::numeric_limits<uint16_t>::max(), value);
     }
 
     //*************************************************************************
     TEST(test_value_u32_min)
     {
-      etl::bitset_ext<32>::element_type buffer[etl::bitset_ext<32>::Number_Of_Elements];
-
+      etl::bitset_ext<32>::buffer_type buffer;
       etl::bitset_ext<32> data((unsigned long long)etl::integral_limits<uint32_t>::min, buffer);
       uint32_t value = data.value<uint32_t>();
 
@@ -1338,8 +699,7 @@ namespace
     //*************************************************************************
     TEST(test_value_u32_max)
     {
-      etl::bitset_ext<32>::element_type buffer[etl::bitset_ext<32>::Number_Of_Elements];
-
+      etl::bitset_ext<32>::buffer_type buffer;
       etl::bitset_ext<32> data((unsigned long long)etl::integral_limits<uint32_t>::max, buffer);
       uint32_t value = data.value<uint32_t>();
 
@@ -1349,30 +709,27 @@ namespace
     //*************************************************************************
     TEST(test_value_s32_min)
     {
-      etl::bitset_ext<32>::element_type buffer[etl::bitset_ext<32>::Number_Of_Elements];
+      etl::bitset_ext<32>::buffer_type buffer;
+      etl::bitset_ext<32> data((unsigned long long)etl::integral_limits<uint32_t>::min, buffer);
+      uint32_t value = data.value<uint32_t>();
 
-      etl::bitset_ext<32> data((unsigned long long)etl::integral_limits<int32_t>::min, buffer);
-      int32_t value = data.value<int32_t>();
-
-      CHECK_EQUAL(std::numeric_limits<int32_t>::min(), value);
+      CHECK_EQUAL(std::numeric_limits<uint32_t>::min(), value);
     }
 
     //*************************************************************************
     TEST(test_value_s32_max)
     {
-      etl::bitset_ext<32>::element_type buffer[etl::bitset_ext<32>::Number_Of_Elements];
+      etl::bitset_ext<32>::buffer_type buffer;
+      etl::bitset_ext<32> data((unsigned long long)etl::integral_limits<uint32_t>::max, buffer);
+      uint32_t value = data.value<uint32_t>();
 
-      etl::bitset_ext<32> data((unsigned long long)etl::integral_limits<int32_t>::max, buffer);
-      int32_t value = data.value<int32_t>();
-
-      CHECK_EQUAL(std::numeric_limits<int32_t>::max(), value);
+      CHECK_EQUAL(std::numeric_limits<uint32_t>::max(), value);
     }
 
     //*************************************************************************
     TEST(test_value_u64_min)
     {
-      etl::bitset_ext<64>::element_type buffer[etl::bitset_ext<64>::Number_Of_Elements];
-
+      etl::bitset_ext<64>::buffer_type buffer;
       etl::bitset_ext<64> data((unsigned long long)etl::integral_limits<uint64_t>::min, buffer);
       uint64_t value = data.value<uint64_t>();
 
@@ -1382,8 +739,7 @@ namespace
     //*************************************************************************
     TEST(test_value_u64_max)
     {
-      etl::bitset_ext<64>::element_type buffer[etl::bitset_ext<64>::Number_Of_Elements];
-
+      etl::bitset_ext<64>::buffer_type buffer;
       etl::bitset_ext<64> data((unsigned long long)etl::integral_limits<uint64_t>::max, buffer);
       uint64_t value = data.value<uint64_t>();
 
@@ -1393,32 +749,29 @@ namespace
     //*************************************************************************
     TEST(test_value_s64_min)
     {
-      etl::bitset_ext<64>::element_type buffer[etl::bitset_ext<64>::Number_Of_Elements];
+      etl::bitset_ext<64>::buffer_type buffer;
+      etl::bitset_ext<64> data((unsigned long long)etl::integral_limits<uint64_t>::min, buffer);
+      uint64_t value = data.value<uint64_t>();
 
-      etl::bitset_ext<64> data((unsigned long long)etl::integral_limits<int64_t>::min, buffer);
-      int64_t value = data.value<int64_t>();
-
-      CHECK_EQUAL(std::numeric_limits<int64_t>::min(), value);
+      CHECK_EQUAL(std::numeric_limits<uint64_t>::min(), value);
     }
 
     //*************************************************************************
     TEST(test_value_s64_max)
     {
-      etl::bitset_ext<64>::element_type buffer[etl::bitset_ext<64>::Number_Of_Elements];
+      etl::bitset_ext<64>::buffer_type buffer;
+      etl::bitset_ext<64> data((unsigned long long)etl::integral_limits<uint64_t>::max, buffer);
+      uint64_t value = data.value<uint64_t>();
 
-      etl::bitset_ext<64> data((unsigned long long)etl::integral_limits<int64_t>::max, buffer);
-      int64_t value = data.value<int64_t>();
-
-      CHECK_EQUAL(std::numeric_limits<int64_t>::max(), value);
+      CHECK_EQUAL(std::numeric_limits<uint64_t>::max(), value);
     }
 
     //*************************************************************************
     TEST(test_position_set)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare;
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare;
+      etl::bitset_ext<64> data(buffer);
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -1450,19 +803,18 @@ namespace
     //*************************************************************************
     TEST(test_reset)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare(0xFFFFFFFFFFFFFFFULL);
-      etl::bitset_ext<60> data(0xFFFFFFFFFFFFFFFULL, buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare(0xFFFFFFFFFFFFFFFULL);
+      etl::bitset_ext<64> data(0xFFFFFFFFFFFFFFFULL, buffer);
 
       compare.reset();
       data.reset();
-      
-      CHECK_EQUAL(compare.size(),  data.size());
+
+      CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(),  data.none());
-      CHECK_EQUAL(compare.any(),   data.any());
-      CHECK_EQUAL(compare.all(),   data.all());
+      CHECK_EQUAL(compare.none(), data.none());
+      CHECK_EQUAL(compare.any(), data.any());
+      CHECK_EQUAL(compare.all(), data.all());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -1473,10 +825,9 @@ namespace
     //*************************************************************************
     TEST(test_position_reset)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare(0xFFFFFFFFFFFFFFFULL);
-      etl::bitset_ext<60> data(0xFFFFFFFFFFFFFFFULL, buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare(0xFFFFFFFFFFFFFFFULL);
+      etl::bitset_ext<64> data(0xFFFFFFFFFFFFFFFULL, buffer);
 
       compare.reset(1);
       compare.reset(3);
@@ -1488,11 +839,11 @@ namespace
       data.reset(7);
       data.reset(13);
 
-      CHECK_EQUAL(compare.size(),  data.size());
+      CHECK_EQUAL(compare.size(), data.size());
       CHECK_EQUAL(compare.count(), data.count());
-      CHECK_EQUAL(compare.none(),  data.none());
-      CHECK_EQUAL(compare.any(),   data.any());
-      CHECK_EQUAL(compare.all(),   data.all());
+      CHECK_EQUAL(compare.none(), data.none());
+      CHECK_EQUAL(compare.any(), data.any());
+      CHECK_EQUAL(compare.all(), data.all());
 
       for (size_t i = 0UL; i < data.size(); ++i)
       {
@@ -1530,10 +881,9 @@ namespace
     //*************************************************************************
     TEST(test_index_operator_read)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare(0x3123456731234567ULL);
-      etl::bitset_ext<60> data(0x3123456731234567ULL, buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare(0x3123456731234567ULL);
+      etl::bitset_ext<64> data(0x3123456731234567ULL, buffer);
 
       bool bc0 = compare[1U];
       bool bd0 = data[1U];
@@ -1555,8 +905,8 @@ namespace
     //*************************************************************************
     TEST(test_index_operator_write)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      etl::bitset_ext<64> data(buffer);
 
       data[1U] = true;
       data[3U] = true;
@@ -1572,15 +922,14 @@ namespace
     //*************************************************************************
     TEST(test_any)
     {
-      etl::bitset_ext<60>::buffer_type buffer1;
-      etl::bitset_ext<60>::buffer_type buffer2;
-      etl::bitset_ext<60>::buffer_type buffer3;
-      etl::bitset_ext<60>::buffer_type buffer4;
-
-      etl::bitset_ext<60> data1(ull(0x0000000000000000), buffer1);
-      etl::bitset_ext<60> data2(ull(0x0000010000000000), buffer2);
-      etl::bitset_ext<60> data3(ull(0x0000010001000100), buffer3);
-      etl::bitset_ext<60> data4(ull(0x0FFFFFFFFFFFFFFF), buffer4);
+      etl::bitset_ext<64>::buffer_type buffer1;
+      etl::bitset_ext<64>::buffer_type buffer2;
+      etl::bitset_ext<64>::buffer_type buffer3;
+      etl::bitset_ext<64>::buffer_type buffer4;
+      etl::bitset_ext<64> data1(ull(0x0000000000000000), buffer1);
+      etl::bitset_ext<64> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<64> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<64> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
 
       bool bd1 = data1.any();
       bool bd2 = data2.any();
@@ -1596,15 +945,14 @@ namespace
     //*************************************************************************
     TEST(test_none)
     {
-      etl::bitset_ext<60>::buffer_type buffer1;
-      etl::bitset_ext<60>::buffer_type buffer2;
-      etl::bitset_ext<60>::buffer_type buffer3;
-      etl::bitset_ext<60>::buffer_type buffer4;
-
-      etl::bitset_ext<60> data1(ull(0x0000000000000000), buffer1);
-      etl::bitset_ext<60> data2(ull(0x0000010000000000), buffer2);
-      etl::bitset_ext<60> data3(ull(0x0000010001000100), buffer3);
-      etl::bitset_ext<60> data4(ull(0x0FFFFFFFFFFFFFFF), buffer4);
+      etl::bitset_ext<64>::buffer_type buffer1;
+      etl::bitset_ext<64>::buffer_type buffer2;
+      etl::bitset_ext<64>::buffer_type buffer3;
+      etl::bitset_ext<64>::buffer_type buffer4;
+      etl::bitset_ext<64> data1(ull(0x0000000000000000), buffer1);
+      etl::bitset_ext<64> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<64> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<64> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
 
       bool bd1 = data1.none();
       bool bd2 = data2.none();
@@ -1619,16 +967,84 @@ namespace
 
     //*************************************************************************
     TEST(test_all)
+    {
+      etl::bitset_ext<64>::buffer_type buffer1;
+      etl::bitset_ext<64>::buffer_type buffer2;
+      etl::bitset_ext<64>::buffer_type buffer3;
+      etl::bitset_ext<64>::buffer_type buffer4;
+      etl::bitset_ext<64> data1(ull(0x0000000000000000), buffer1);
+      etl::bitset_ext<64> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<64> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<64> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
+
+      bool bd1 = data1.all();
+      bool bd2 = data2.all();
+      bool bd3 = data3.all();
+      bool bd4 = data4.all();
+
+      CHECK_FALSE(bd1);
+      CHECK_FALSE(bd2);
+      CHECK_FALSE(bd3);
+      CHECK_TRUE(bd4);
+    }
+
+    //*************************************************************************
+    TEST(test_any_with_reduced_active_bits)
     {
       etl::bitset_ext<60>::buffer_type buffer1;
       etl::bitset_ext<60>::buffer_type buffer2;
       etl::bitset_ext<60>::buffer_type buffer3;
       etl::bitset_ext<60>::buffer_type buffer4;
-
       etl::bitset_ext<60> data1(ull(0x0000000000000000), buffer1);
       etl::bitset_ext<60> data2(ull(0x0000010000000000), buffer2);
-      etl::bitset_ext<60> data3(ull(0x0000010001000100), buffer3);
-      etl::bitset_ext<60> data4(ull(0x0FFFFFFFFFFFFFFF), buffer4);
+      etl::bitset_ext<60> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<60> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
+
+      bool bd1 = data1.any();
+      bool bd2 = data2.any();
+      bool bd3 = data3.any();
+      bool bd4 = data4.any();
+
+      CHECK_FALSE(bd1);
+      CHECK_TRUE(bd2);
+      CHECK_TRUE(bd3);
+      CHECK_TRUE(bd4);
+    }
+
+    //*************************************************************************
+    TEST(test_none_with_reduced_active_bits)
+    {
+      etl::bitset_ext<60>::buffer_type buffer1;
+      etl::bitset_ext<60>::buffer_type buffer2;
+      etl::bitset_ext<60>::buffer_type buffer3;
+      etl::bitset_ext<60>::buffer_type buffer4;
+      etl::bitset_ext<60> data1(ull(0x0000000000000000), buffer1);
+      etl::bitset_ext<60> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<60> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<60> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
+
+      bool bd1 = data1.none();
+      bool bd2 = data2.none();
+      bool bd3 = data3.none();
+      bool bd4 = data4.none();
+
+      CHECK_TRUE(bd1);
+      CHECK_FALSE(bd2);
+      CHECK_FALSE(bd3);
+      CHECK_FALSE(bd4);
+    }
+
+    //*************************************************************************
+    TEST(test_all_with_reduced_active_bits)
+    {
+      etl::bitset_ext<60>::buffer_type buffer1;
+      etl::bitset_ext<60>::buffer_type buffer2;
+      etl::bitset_ext<60>::buffer_type buffer3;
+      etl::bitset_ext<60>::buffer_type buffer4;
+      etl::bitset_ext<60> data1(ull(0x0000000000000000), buffer1);
+      etl::bitset_ext<60> data2(ull(0x0000010000000000), buffer2);
+      etl::bitset_ext<60> data3(ull(0x1000010001000100), buffer3);
+      etl::bitset_ext<60> data4(ull(0xFFFFFFFFFFFFFFFF), buffer4);
 
       bool bd1 = data1.all();
       bool bd2 = data2.all();
@@ -1644,9 +1060,9 @@ namespace
     //*************************************************************************
     TEST(test_flip)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-      std::bitset<60> compare;
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare;
+      etl::bitset_ext<64> data(buffer);
 
       compare.flip();
       data.flip();
@@ -1657,12 +1073,12 @@ namespace
       }
     }
 
-    //*************************************************************************   
+    //*************************************************************************
     TEST(test_flip_position)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-      std::bitset<60> compare;
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare;
+      etl::bitset_ext<64> data(buffer);
 
       compare.flip(1);
       compare.flip(3);
@@ -1683,9 +1099,9 @@ namespace
     //*************************************************************************
     TEST(test_flip_reference)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-      std::bitset<60> compare;
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare;
+      etl::bitset_ext<64> data(buffer);
 
       compare[1].flip();
       compare[3].flip();
@@ -1706,10 +1122,9 @@ namespace
     //*************************************************************************
     TEST(test_invert_reference)
     {
-      etl::bitset_ext<60>::buffer_type buffer;
-
-      std::bitset<60> compare;
-      etl::bitset_ext<60> data(buffer);
+      etl::bitset_ext<64>::buffer_type buffer;
+      std::bitset<64> compare;
+      etl::bitset_ext<64> data(buffer);
 
       bool bc = ~compare[3];
       bool bd = ~data[3];
@@ -1717,19 +1132,18 @@ namespace
     }
 
     //*************************************************************************
-    void test_assignment_operator_helper(etl::bitset_ext<60>& from, etl::bitset_ext<60>& to)
+    void test_assignment_operator_helper(etl::bitset_ext<64>&from, etl::bitset_ext<64>&to)
     {
       to = from;
     }
 
     TEST(test_assignment_operator)
     {
-      etl::bitset_ext<60>::buffer_type buffer1;
-      etl::bitset_ext<60>::buffer_type buffer2;
-
-      std::bitset<60> compare(0xFFFFFFFFFFFFFFFULL);
-      etl::bitset_ext<60> data1(0xFFFFFFFFFFFFFFFULL, buffer1);
-      etl::bitset_ext<60> data2(buffer2);
+      etl::bitset_ext<64>::buffer_type buffer1;
+      etl::bitset_ext<64>::buffer_type buffer2;
+      std::bitset<64> compare(0xFFFFFFFFFFFFFFFULL);
+      etl::bitset_ext<64> data1(0xFFFFFFFFFFFFFFFULL, buffer1);
+      etl::bitset_ext<64> data2(buffer2);
 
       test_assignment_operator_helper(data1, data2);
 
@@ -1742,15 +1156,14 @@ namespace
     //*************************************************************************
     TEST(test_equality_operator)
     {
-      etl::bitset_ext<60>::buffer_type buffer1;
-      etl::bitset_ext<60>::buffer_type buffer2;
-      etl::bitset_ext<60>::buffer_type buffer3;
+      etl::bitset_ext<64>::buffer_type buffer1;
+      etl::bitset_ext<64>::buffer_type buffer2;
+      etl::bitset_ext<64>::buffer_type buffer3;
+      etl::bitset_ext<64> data1(0x123456781234567ULL, buffer1);
+      etl::bitset_ext<64> data2(0x123456781234567ULL, buffer2);
+      etl::bitset_ext<64> data3(buffer3);
 
-      etl::bitset_ext<60> data1(0x123456781234567ULL, buffer1);
-      etl::bitset_ext<60> data2(0x123456781234567ULL, buffer2);
-      etl::bitset_ext<60> data3(buffer3);
-
-      bool equal     =  (data1 == data2);
+      bool equal = (data1 == data2);
       bool not_equal = !(data1 == data3);
 
       CHECK(equal);
@@ -1760,13 +1173,12 @@ namespace
     //*************************************************************************
     TEST(test_inequality_operator)
     {
-      etl::bitset_ext<60>::buffer_type buffer1;
-      etl::bitset_ext<60>::buffer_type buffer2;
-      etl::bitset_ext<60>::buffer_type buffer3;
-
-      etl::bitset_ext<60> data1(0x123456781234567ULL, buffer1);
-      etl::bitset_ext<60> data2(0x123456781234567ULL, buffer2);
-      etl::bitset_ext<60> data3(buffer3);
+      etl::bitset_ext<64>::buffer_type buffer1;
+      etl::bitset_ext<64>::buffer_type buffer2;
+      etl::bitset_ext<64>::buffer_type buffer3;
+      etl::bitset_ext<64> data1(0x123456781234567ULL, buffer1);
+      etl::bitset_ext<64> data2(0x123456781234567ULL, buffer2);
+      etl::bitset_ext<64> data3(buffer3);
 
       bool equal = !(data1 != data2);
       bool not_equal = (data1 != data3);
@@ -1776,9 +1188,9 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_shift_left_operator_all_shifts_full_size)
+    TEST(test_shift_left_operator)
     {
-      int64_t value = 0x0123456789ABCDEFULL;
+      uint64_t value = 0x0123456789ABCDEFULL;
       uint64_t mask = 0xFFFFFFFFFFFFFFFFULL;
 
       etl::bitset_ext<64>::buffer_type buffer1;
@@ -1789,40 +1201,31 @@ namespace
       for (ull shift = 0U; shift < 64U; ++shift)
       {
         etl::bitset_ext<64> data(original, buffer2);
-        CHECK_EQUAL_HEX(((value & mask) << shift), (data <<= shift).value<int64_t>());
+        CHECK_EQUAL_HEX(((value & mask) << shift), (data <<= shift).value<uint64_t>());
         mask >>= 1;
       }
 
       etl::bitset_ext<64> data(original, buffer2);
-      CHECK_EQUAL_HEX(0ULL, (data <<= 64U).value<int64_t>());
+      CHECK_EQUAL_HEX(0ULL, (data <<= 64U).value<uint64_t>());
     }
 
     //*************************************************************************
-    TEST(test_shift_left_operator_all_shifts_partial_size)
+    TEST(test_shift_left_operator_overflow)
     {
-      int64_t value = 0x0123456789ABCDEFULL;
-      uint64_t mask = 0x0FFFFFFFFFFFFFFFULL;
+      etl::bitset_ext<32>::buffer_type buffer1;
+      etl::bitset_ext<32>::buffer_type buffer2;
 
-      etl::bitset_ext<60>::buffer_type buffer1;
-      etl::bitset_ext<60>::buffer_type buffer2;
+      etl::bitset_ext<32> data(0xFFFFFFFFULL, buffer1);
+      data <<= 1U;
+      etl::bitset_ext<32> shifted(0xFFFFFFFEUL, buffer2);
 
-      etl::bitset_ext<60> original(0x0123456789ABCDEFULL, buffer1);
-
-      for (ull shift = 0U; shift < 64U; ++shift)
-      {        
-        etl::bitset_ext<60> data(original, buffer2);
-        CHECK_EQUAL_HEX(((value & mask) << shift), (data <<= shift).value<int64_t>());
-        mask >>= 1;
-      }
-
-      etl::bitset_ext<60> data(original, buffer2);
-      CHECK_EQUAL_HEX(0ULL, (data <<= 64U).value<int64_t>());
+      CHECK_EQUAL_HEX(shifted.value<uint32_t>(), data.value<uint32_t>());
     }
 
     //*************************************************************************
-    TEST(test_shift_right_operator_all_shifts_full_size)
+    TEST(test_shift_right_operator)
     {
-      int64_t value = 0x0123456789ABCDEFULL;
+      uint64_t value = 0x0123456789ABCDEFULL;
 
       etl::bitset_ext<64>::buffer_type buffer1;
       etl::bitset_ext<64>::buffer_type buffer2;
@@ -1832,46 +1235,26 @@ namespace
       for (ull shift = 0U; shift < 64U; ++shift)
       {
         etl::bitset_ext<64> data(original, buffer2);
-        CHECK_EQUAL_HEX((value >> shift), (data >>= shift).value<int64_t>());
+        CHECK_EQUAL_HEX((value >> shift), (data >>= shift).value<uint64_t>());
       }
 
       etl::bitset_ext<64> data(original, buffer2);
-      CHECK_EQUAL_HEX(0ULL, (data >>= 64U).value<int64_t>());
-    }
-
-    //*************************************************************************
-    TEST(test_shift_right_operator_all_shifts_partial_size)
-    {
-      int64_t value = 0x0123456789ABCDEFULL;
-
-      etl::bitset_ext<60>::buffer_type buffer1;
-      etl::bitset_ext<60>::buffer_type buffer2;
-
-      etl::bitset_ext<60> original(0x0123456789ABCDEFULL, buffer1);
-
-      for (ull shift = 0U; shift < 64U; ++shift)
-      {
-        etl::bitset_ext<60> data(original, buffer2);
-        CHECK_EQUAL_HEX((value >> shift), (data >>= shift).value<int64_t>());
-      }
-
-      etl::bitset_ext<60> data(original, buffer2);
-      CHECK_EQUAL_HEX(0ULL, (data >>= 64U).value<int64_t>());
+      CHECK_EQUAL_HEX(0ULL, (data >>= 64U).value<uint64_t>());
     }
 
     //*************************************************************************
     TEST(test_and_equals_operator)
     {
-      etl::bitset_ext<60>::buffer_type buffer1;
-      etl::bitset_ext<60>::buffer_type buffer2;
-      etl::bitset_ext<60>::buffer_type buffer3;
-      etl::bitset_ext<60>::buffer_type buffer4;
+      etl::bitset_ext<64>::buffer_type buffer1;
+      etl::bitset_ext<64>::buffer_type buffer2;
+      etl::bitset_ext<64>::buffer_type buffer3;
+      etl::bitset_ext<64>::buffer_type buffer4;
 
-      etl::bitset_ext<60> data1(0x12345678UL, buffer1);
-      etl::bitset_ext<60> data2(0x23456789UL, buffer2);
-      etl::bitset_ext<60> data3(0x12345678UL & 0x23456789UL, buffer3);
-      
-      etl::bitset_ext<60> data4(data1, buffer4);
+      etl::bitset_ext<64> data1(0x12345678UL, buffer1);
+      etl::bitset_ext<64> data2(0x23456789UL, buffer2);
+      etl::bitset_ext<64> data3(0x12345678UL & 0x23456789UL, buffer3);
+
+      etl::bitset_ext<64> data4(data1, buffer4);
       data4 &= data2;
       CHECK(data3 == data4);
     }
@@ -1879,16 +1262,16 @@ namespace
     //*************************************************************************
     TEST(test_or_equals_operator)
     {
-      etl::bitset_ext<60>::buffer_type buffer1;
-      etl::bitset_ext<60>::buffer_type buffer2;
-      etl::bitset_ext<60>::buffer_type buffer3;
-      etl::bitset_ext<60>::buffer_type buffer4;
+      etl::bitset_ext<64>::buffer_type buffer1;
+      etl::bitset_ext<64>::buffer_type buffer2;
+      etl::bitset_ext<64>::buffer_type buffer3;
+      etl::bitset_ext<64>::buffer_type buffer4;
 
-      etl::bitset_ext<60> data1(0x12345678UL, buffer1);
-      etl::bitset_ext<60> data2(0x23456789UL, buffer2);
-      etl::bitset_ext<60> data3(0x12345678UL | 0x23456789UL, buffer3);
+      etl::bitset_ext<64> data1(0x12345678UL, buffer1);
+      etl::bitset_ext<64> data2(0x23456789UL, buffer2);
+      etl::bitset_ext<64> data3(0x12345678UL | 0x23456789UL, buffer3);
 
-      etl::bitset_ext<60> data4(data1, buffer4);
+      etl::bitset_ext<64> data4(data1, buffer4);
       data4 |= data2;
       CHECK(data3 == data4);
     }
@@ -1896,16 +1279,16 @@ namespace
     //*************************************************************************
     TEST(test_xor_equals_operator)
     {
-      etl::bitset_ext<60>::buffer_type buffer1;
-      etl::bitset_ext<60>::buffer_type buffer2;
-      etl::bitset_ext<60>::buffer_type buffer3;
-      etl::bitset_ext<60>::buffer_type buffer4;
+      etl::bitset_ext<64>::buffer_type buffer1;
+      etl::bitset_ext<64>::buffer_type buffer2;
+      etl::bitset_ext<64>::buffer_type buffer3;
+      etl::bitset_ext<64>::buffer_type buffer4;
 
-      etl::bitset_ext<60> data1(0x12345678UL, buffer1);
-      etl::bitset_ext<60> data2(0x23456789UL, buffer2);
-      etl::bitset_ext<60> data3(0x12345678UL ^ 0x23456789UL, buffer3);
+      etl::bitset_ext<64> data1(0x12345678UL, buffer1);
+      etl::bitset_ext<64> data2(0x23456789UL, buffer2);
+      etl::bitset_ext<64> data3(0x12345678UL ^ 0x23456789UL, buffer3);
 
-      etl::bitset_ext<60> data4(data1, buffer4);
+      etl::bitset_ext<64> data4(data1, buffer4);
       data4 ^= data2;
       CHECK(data3 == data4);
     }
@@ -1913,66 +1296,57 @@ namespace
     //*************************************************************************
     TEST(test_find_first)
     {
-      etl::bitset_ext<9>::element_type buffer1[etl::bitset_ext<9>::Number_Of_Elements];
-      etl::bitset_ext<9>::element_type buffer2[etl::bitset_ext<9>::Number_Of_Elements];
-      etl::bitset_ext<9>::element_type buffer3[etl::bitset_ext<9>::Number_Of_Elements];
-      etl::bitset_ext<9>::element_type buffer4[etl::bitset_ext<9>::Number_Of_Elements];
-      etl::bitset_ext<9>::element_type buffer5[etl::bitset_ext<9>::Number_Of_Elements];
-      etl::bitset_ext<9>::element_type buffer6[etl::bitset_ext<9>::Number_Of_Elements];
-      etl::bitset_ext<9>::element_type buffer7[etl::bitset_ext<9>::Number_Of_Elements];
+      etl::bitset_ext<8>::buffer_type buffer;
 
-      etl::bitset_ext<9> bs1(ull(0x0000), buffer1);
+      etl::bitset_ext<8> bs1(ull(0x00), buffer);
       size_t bs1fff = bs1.find_first(false);
       size_t bs1fft = bs1.find_first(true);
       CHECK_EQUAL(0U, bs1fff);
       CHECK_EQUAL(etl::bitset_ext<>::npos, bs1fft);
 
-      etl::bitset_ext<9> bs2(ull(0x01FF), buffer2);
+      etl::bitset_ext<8> bs2(ull(0xFF), buffer);
       size_t bs2fff = bs2.find_first(false);
       size_t bs2fft = bs2.find_first(true);
       CHECK_EQUAL(etl::bitset_ext<>::npos, bs2fff);
       CHECK_EQUAL(0U, bs2fft);
 
-      etl::bitset_ext<9> bs3(ull(0x0001), buffer3);
+      etl::bitset_ext<8> bs3(ull(0x01), buffer);
       size_t bs3fff = bs3.find_first(false);
       size_t bs3fft = bs3.find_first(true);
       CHECK_EQUAL(1U, bs3fff);
       CHECK_EQUAL(0U, bs3fft);
 
-      etl::bitset_ext<9> bs4(ull(0x0020), buffer4);
+      etl::bitset_ext<8> bs4(ull(0x20), buffer);
       size_t bs4fff = bs4.find_first(false);
       size_t bs4fft = bs4.find_first(true);
       CHECK_EQUAL(0U, bs4fff);
       CHECK_EQUAL(5U, bs4fft);
 
-      etl::bitset_ext<9> bs5(ull(0x0021), buffer5);
+      etl::bitset_ext<8> bs5(ull(0x21), buffer);
       size_t bs5fff = bs5.find_first(false);
       size_t bs5fft = bs5.find_first(true);
       CHECK_EQUAL(1U, bs5fff);
       CHECK_EQUAL(0U, bs5fft);
 
-      etl::bitset_ext<9> bs6(ull(0x000E), buffer6);
+      etl::bitset_ext<8> bs6(ull(0x0E), buffer);
       size_t bs6fff = bs6.find_first(false);
       size_t bs6fft = bs6.find_first(true);
       CHECK_EQUAL(0U, bs6fff);
       CHECK_EQUAL(1U, bs6fft);
 
-      etl::bitset_ext<9> bs7(ull(0x31), buffer7);
+      etl::bitset_ext<8> bs7(ull(0x31), buffer);
       size_t bs7fff = bs7.find_first(false);
       size_t bs7fft = bs7.find_first(true);
       CHECK_EQUAL(1U, bs7fff);
       CHECK_EQUAL(0U, bs7fft);
     }
-     
+
     //*************************************************************************
     TEST(test_find_next)
     {
-      etl::bitset_ext<9>::element_type buffer1[etl::bitset_ext<9>::Number_Of_Elements];
-      etl::bitset_ext<9>::element_type buffer2[etl::bitset_ext<9>::Number_Of_Elements];
-      etl::bitset_ext<9>::element_type buffer3[etl::bitset_ext<9>::Number_Of_Elements];
-      etl::bitset_ext<9>::element_type buffer4[etl::bitset_ext<9>::Number_Of_Elements];
+      etl::bitset_ext<8>::buffer_type buffer;
 
-      etl::bitset_ext<9> bs1(ull(0x0000), buffer1);
+      etl::bitset_ext<8> bs1(ull(0x00), buffer);
       size_t bs1fnf0 = bs1.find_next(false, 0);
       size_t bs1fnf1 = bs1.find_next(false, 1);
       size_t bs1fnt2 = bs1.find_next(true, 2);
@@ -1980,7 +1354,7 @@ namespace
       CHECK_EQUAL(1U, bs1fnf1);
       CHECK_EQUAL(etl::bitset_ext<>::npos, bs1fnt2);
 
-      etl::bitset_ext<9> bs2(ull(0x1FF), buffer2);
+      etl::bitset_ext<8> bs2(ull(0xFF), buffer);
       size_t bs2fnt0 = bs2.find_next(true, 0);
       size_t bs2fnt1 = bs2.find_next(true, 1);
       size_t bs2fnf2 = bs2.find_next(false, 2);
@@ -1988,7 +1362,7 @@ namespace
       CHECK_EQUAL(1U, bs2fnt1);
       CHECK_EQUAL(etl::bitset_ext<>::npos, bs2fnf2);
 
-      etl::bitset_ext<9> bs3(ull(0x000E), buffer3);
+      etl::bitset_ext<8> bs3(ull(0x0E), buffer);
       size_t bs3fnf0 = bs3.find_next(false, 0);
       size_t bs3fnt1 = bs3.find_next(true, 1);
       size_t bs3fnf2 = bs3.find_next(false, 2);
@@ -1996,7 +1370,7 @@ namespace
       CHECK_EQUAL(1U, bs3fnt1);
       CHECK_EQUAL(4U, bs3fnf2);
 
-      etl::bitset_ext<9> bs4(ull(0x0031), buffer4);
+      etl::bitset_ext<8> bs4(ull(0x31), buffer);
       size_t bs4fnt0 = bs4.find_next(true, 0);
       size_t bs4fnf0 = bs4.find_next(false, 0);
       size_t bs4fnt1 = bs4.find_next(true, 1);
@@ -2005,37 +1379,18 @@ namespace
       CHECK_EQUAL(4U, bs4fnt1);
     }
 
-    //*************************************************************************
-    TEST(test_find_next_github_issue_617)
-    {
-      etl::bitset_ext<64>::element_type buffer1[etl::bitset_ext<64>::Number_Of_Elements];
-      etl::bitset_ext<64>::element_type buffer2[etl::bitset_ext<64>::Number_Of_Elements];
-
-      etl::bitset_ext<64> bs1(ull(0xC000000000000031), buffer1);
-      size_t bs1fnt1 = bs1.find_next(true, 10);
-      size_t bs1fnt2 = bs1.find_next(true, 59);
-      CHECK_EQUAL(62U, bs1fnt1);
-      CHECK_EQUAL(62U, bs1fnt2);
-
-      etl::bitset_ext<64> bs2(ull(0x3FFFFFFFFFFFFFCE), buffer2);
-      size_t bs2fnf1 = bs2.find_next(false, 10);
-      size_t bs2fnf2 = bs2.find_next(false, 59);
-      CHECK_EQUAL(62U, bs2fnf1);
-      CHECK_EQUAL(62U, bs2fnf2);
-    }
-
     //*************************************************************************
     TEST(test_swap)
     {
-      etl::bitset_ext<9>::element_type buffer1[etl::bitset_ext<9>::Number_Of_Elements];
-      etl::bitset_ext<9>::element_type buffer2[etl::bitset_ext<9>::Number_Of_Elements];
-      etl::bitset_ext<9>::element_type buffer3[etl::bitset_ext<9>::Number_Of_Elements];
-      etl::bitset_ext<9>::element_type buffer4[etl::bitset_ext<9>::Number_Of_Elements];
+      etl::bitset_ext<16>::buffer_type buffer1;
+      etl::bitset_ext<16>::buffer_type buffer2;
+      etl::bitset_ext<16>::buffer_type buffer3;
+      etl::bitset_ext<16>::buffer_type buffer4;
 
-      etl::bitset_ext<9> compare1(0x2A, buffer1);
-      etl::bitset_ext<9> compare2(0x15, buffer2);
-      etl::bitset_ext<9> compare1a(0x2A, buffer3);
-      etl::bitset_ext<9> compare2a(0x15, buffer4);
+      etl::bitset_ext<16> compare1(0x2A, buffer1);
+      etl::bitset_ext<16> compare2(0x15, buffer2);
+      etl::bitset_ext<16> compare1a(0x2A, buffer3);
+      etl::bitset_ext<16> compare2a(0x15, buffer4);
 
       swap(compare1a, compare2a);
 
@@ -2046,55 +1401,83 @@ namespace
     //*************************************************************************
     TEST(test_span)
     {
-      etl::bitset_ext<32>::element_type buffer[etl::bitset_ext<32>::Number_Of_Elements];
+      using bs32   = etl::bitset_ext<32>;
+      using span_t = bs32::span_type;
 
-      using span_t = etl::bitset_ext<32>::span_type;
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
 
-      etl::bitset_ext<32> data(0x12345678UL, buffer);
+      span_t s = b.span();
 
-      span_t s = data.span();
-      CHECK_EQUAL(0x78U, s[0]);
-      CHECK_EQUAL(0x56U, s[1]);
-      CHECK_EQUAL(0x34U, s[2]);
-      CHECK_EQUAL(0x12U, s[3]);
+      if (etl::endianness::value() == etl::endian::little)
+      {
+        CHECK_EQUAL(0x78UL, s[0]);
+        CHECK_EQUAL(0x56UL, s[1]);
+        CHECK_EQUAL(0x34UL, s[2]);
+        CHECK_EQUAL(0x12UL, s[3]);
+      }
+      else
+      {
+        CHECK_EQUAL(0x78UL, s[3]);
+        CHECK_EQUAL(0x56UL, s[2]);
+        CHECK_EQUAL(0x34UL, s[1]);
+        CHECK_EQUAL(0x12UL, s[0]);
+      }
+
+      s[2] = 0x9AU;
+      uint32_t value = b.value<uint32_t>();
+      CHECK_EQUAL(0x129A5678UL, value);
     }
 
     //*************************************************************************
     TEST(test_const_span)
     {
-      etl::bitset_ext<32>::element_type buffer[etl::bitset_ext<32>::Number_Of_Elements];
+      using bs32   = etl::bitset_ext<32>;
+      using span_t = etl::bitset<32>::const_span_type;
 
-      using span_t = etl::bitset_ext<32>::const_span_type;
-
-      const etl::bitset_ext<32> b(0x12345678UL, buffer);
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
 
       span_t s = b.span();
-      CHECK_EQUAL(0x78U, s[0]);
-      CHECK_EQUAL(0x56U, s[1]);
-      CHECK_EQUAL(0x34U, s[2]);
-      CHECK_EQUAL(0x12U, s[3]);
+      if (etl::endianness::value() == etl::endian::little)
+      {
+        CHECK_EQUAL(0x78UL, s[0]);
+        CHECK_EQUAL(0x56UL, s[1]);
+        CHECK_EQUAL(0x34UL, s[2]);
+        CHECK_EQUAL(0x12UL, s[3]);
+      }
+      else
+      {
+        CHECK_EQUAL(0x78UL, s[3]);
+        CHECK_EQUAL(0x56UL, s[2]);
+        CHECK_EQUAL(0x34UL, s[1]);
+        CHECK_EQUAL(0x12UL, s[0]);
+      }
     }
 
     //*************************************************************************
     TEST(test_to_string)
     {
-      etl::bitset_ext<32>::element_type buffer[etl::bitset_ext<32>::Number_Of_Elements];
+      using bs32 = etl::bitset_ext<32>;
 
-      etl::bitset_ext<32> b(0x12345678UL, buffer);
+      bs32::buffer_type buffer;
+      bs32 data(0x12345678UL, buffer);
 
-      etl::string<32> text = b.to_string('.', '*');
-      std::string stdtext  = b.to_string<std::string>('.', '*');
+      etl::string<32> text = data.to_string('.', '*');
+      std::string stdtext = data.to_string<std::string>('.', '*');
 
-      CHECK_EQUAL("...*..*...**.*...*.*.**..****...", text.c_str());
-      CHECK_EQUAL("...*..*...**.*...*.*.**..****...", stdtext.c_str());
+      //CHECK_THROW(b.to_string<etl::string<30>>('.', '*'), etl::bitset_ext_overflow);
+      CHECK_EQUAL(std::string("...*..*...**.*...*.*.**..****..."), std::string(text.c_str()));
+      CHECK_EQUAL(std::string("...*..*...**.*...*.*.**..****..."), std::string(stdtext.c_str()));
     }
 
     //*************************************************************************
     TEST(test_to_wstring)
     {
-      etl::bitset_ext<32>::element_type buffer[etl::bitset_ext<32>::Number_Of_Elements];
+      using bs32 = etl::bitset_ext<32>;
 
-      etl::bitset_ext<32> b(0x12345678UL, buffer);
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
 
       etl::wstring<32> text = b.to_string<etl::wstring<32>>(L'.', L'*');
       std::wstring stdtext = b.to_string<std::wstring>(L'.', L'*');
@@ -2106,9 +1489,10 @@ namespace
     //*************************************************************************
     TEST(test_to_u16string)
     {
-      etl::bitset_ext<32>::element_type buffer[etl::bitset_ext<32>::Number_Of_Elements];
+      using bs32 = etl::bitset_ext<32>;
 
-      etl::bitset_ext<32> b(0x12345678UL, buffer);
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
 
       etl::u16string<32> text = b.to_string<etl::u16string<32>>(u'.', u'*');
       std::u16string stdtext = b.to_string<std::u16string>(u'.', u'*');
@@ -2120,9 +1504,10 @@ namespace
     //*************************************************************************
     TEST(test_to_u32string)
     {
-      etl::bitset_ext<32>::element_type buffer[etl::bitset_ext<32>::Number_Of_Elements];
+      using bs32 = etl::bitset_ext<32>;
 
-      etl::bitset_ext<32> b(0x12345678UL, buffer);
+      bs32::buffer_type buffer;
+      bs32 b(0x12345678UL, buffer);
 
       etl::u32string<32> text = b.to_string<etl::u32string<32>>(U'.', U'*');
       std::u32string stdtext = b.to_string<std::u32string>(U'.', U'*');
@@ -2139,16 +1524,16 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t>( 0, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t>( 1, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t>( 2, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t>( 3, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t>( 4, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t>( 5, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t>( 6, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t>( 7, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t>( 8, 6)));
-      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t>(0, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t>(1, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t>(2, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t>(3, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t>(4, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t>(5, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t>(6, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t>(7, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t>(8, 6)));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t>(9, 6)));
       CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t>(10, 6)));
       CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t>(11, 6)));
       CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t>(12, 6)));
@@ -2179,16 +1564,16 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t,  0, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t,  2, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t,  3, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t,  4, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t,  5, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t,  6, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t,  7, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t,  8, 6>()));
-      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x38), (b.extract<uint8_t, 0, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t, 1, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1E), (b.extract<uint8_t, 2, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x0F), (b.extract<uint8_t, 3, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x27), (b.extract<uint8_t, 4, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x33), (b.extract<uint8_t, 5, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x19), (b.extract<uint8_t, 6, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2C), (b.extract<uint8_t, 7, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x16), (b.extract<uint8_t, 8, 6>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t, 9, 6>()));
       CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 6>()));
       CHECK_EQUAL_HEX(uint8_t(0x0A), (b.extract<uint8_t, 11, 6>()));
       CHECK_EQUAL_HEX(uint8_t(0x05), (b.extract<uint8_t, 12, 6>()));
@@ -2220,16 +1605,16 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>( 0, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>( 1, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>( 2, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>( 3, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>( 4, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>( 5, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>( 6, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>( 7, 6)));
-      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>( 8, 6)));
-      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>( 9, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t>(0, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t>(1, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t>(2, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t>(3, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t>(4, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t>(5, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t>(6, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t>(7, 6)));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t>(8, 6)));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t>(9, 6)));
       CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t>(10, 6)));
       CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t>(11, 6)));
       CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t>(12, 6)));
@@ -2248,8 +1633,8 @@ namespace
       CHECK_EQUAL_HEX(int8_t(0x09), (b.extract<int8_t>(25, 6)));
       CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t>(26, 6)));
 
-      CHECK_THROW(b.extract<int8_t>(26, 7), etl::bitset_overflow);
-      CHECK_THROW(b.extract<int8_t>(27, 6), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(26, 7), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(27, 6), etl::bitset_overflow);
     }
 
     //*************************************************************************
@@ -2260,16 +1645,16 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t,  0, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t,  1, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t,  2, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t,  3, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t,  4, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t,  5, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t,  6, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t,  7, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t,  8, 6>()));
-      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t,  9, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF8), (b.extract<int8_t, 0, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xFC), (b.extract<int8_t, 1, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x1E), (b.extract<int8_t, 2, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x0F), (b.extract<int8_t, 3, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xE7), (b.extract<int8_t, 4, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xF3), (b.extract<int8_t, 5, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x19), (b.extract<int8_t, 6, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEC), (b.extract<int8_t, 7, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0x16), (b.extract<int8_t, 8, 6>()));
+      CHECK_EQUAL_HEX(int8_t(0xEB), (b.extract<int8_t, 9, 6>()));
       CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 6>()));
       CHECK_EQUAL_HEX(int8_t(0x0A), (b.extract<int8_t, 11, 6>()));
       CHECK_EQUAL_HEX(int8_t(0x05), (b.extract<int8_t, 12, 6>()));
@@ -2289,8 +1674,8 @@ namespace
       CHECK_EQUAL_HEX(int8_t(0x04), (b.extract<int8_t, 26, 6>()));
 
       // The lines below should static assert.
-      //int8_t v1 = b.extract<int8_t, 26, 7>();
-      //int8_t v1 = b.extract<int8_t, 27, 6>();
+      //uint8_t v1 = b.extract<uint8_t, 26, 7>();
+      //uint8_t v1 = b.extract<uint8_t, 27, 6>();
     }
 
     //*************************************************************************
@@ -2301,16 +1686,16 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(uint8_t(0x78), b.extract<uint8_t>( 0, 8));
-      CHECK_EQUAL_HEX(uint8_t(0x3C), b.extract<uint8_t>( 1, 8));
-      CHECK_EQUAL_HEX(uint8_t(0x9E), b.extract<uint8_t>( 2, 8));
-      CHECK_EQUAL_HEX(uint8_t(0xCF), b.extract<uint8_t>( 3, 8));
-      CHECK_EQUAL_HEX(uint8_t(0x67), b.extract<uint8_t>( 4, 8));
-      CHECK_EQUAL_HEX(uint8_t(0xB3), b.extract<uint8_t>( 5, 8));
-      CHECK_EQUAL_HEX(uint8_t(0x59), b.extract<uint8_t>( 6, 8));
-      CHECK_EQUAL_HEX(uint8_t(0xAC), b.extract<uint8_t>( 7, 8));
-      CHECK_EQUAL_HEX(uint8_t(0x56), b.extract<uint8_t>( 8, 8));
-      CHECK_EQUAL_HEX(uint8_t(0x2B), b.extract<uint8_t>( 9, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x78), b.extract<uint8_t>(0, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), b.extract<uint8_t>(1, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), b.extract<uint8_t>(2, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), b.extract<uint8_t>(3, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x67), b.extract<uint8_t>(4, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), b.extract<uint8_t>(5, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x59), b.extract<uint8_t>(6, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), b.extract<uint8_t>(7, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x56), b.extract<uint8_t>(8, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), b.extract<uint8_t>(9, 8));
       CHECK_EQUAL_HEX(uint8_t(0x15), b.extract<uint8_t>(10, 8));
       CHECK_EQUAL_HEX(uint8_t(0x8A), b.extract<uint8_t>(11, 8));
       CHECK_EQUAL_HEX(uint8_t(0x45), b.extract<uint8_t>(12, 8));
@@ -2339,16 +1724,16 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(uint8_t(0x78), (b.extract<uint8_t,  0, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t,  1, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0x9E), (b.extract<uint8_t,  2, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0xCF), (b.extract<uint8_t,  3, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0x67), (b.extract<uint8_t,  4, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0xB3), (b.extract<uint8_t,  5, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0x59), (b.extract<uint8_t,  6, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0xAC), (b.extract<uint8_t,  7, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0x56), (b.extract<uint8_t,  8, 8>()));
-      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t,  9, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x78), (b.extract<uint8_t, 0, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t, 1, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), (b.extract<uint8_t, 2, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), (b.extract<uint8_t, 3, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x67), (b.extract<uint8_t, 4, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), (b.extract<uint8_t, 5, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x59), (b.extract<uint8_t, 6, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), (b.extract<uint8_t, 7, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x56), (b.extract<uint8_t, 8, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t, 9, 8>()));
       CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 8>()));
       CHECK_EQUAL_HEX(uint8_t(0x8A), (b.extract<uint8_t, 11, 8>()));
       CHECK_EQUAL_HEX(uint8_t(0x45), (b.extract<uint8_t, 12, 8>()));
@@ -2378,34 +1763,34 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(int8_t(0x78), b.extract<int8_t>( 0, 8));
-      CHECK_EQUAL_HEX(int8_t(0x3C), b.extract<int8_t>( 1, 8));
-      CHECK_EQUAL_HEX(int8_t(0x9E), b.extract<int8_t>( 2, 8));
-      CHECK_EQUAL_HEX(int8_t(0xCF), b.extract<int8_t>( 3, 8));
-      CHECK_EQUAL_HEX(int8_t(0x67), b.extract<int8_t>( 4, 8));
-      CHECK_EQUAL_HEX(int8_t(0xB3), b.extract<int8_t>( 5, 8));
-      CHECK_EQUAL_HEX(int8_t(0x59), b.extract<int8_t>( 6, 8));
-      CHECK_EQUAL_HEX(int8_t(0xAC), b.extract<int8_t>( 7, 8));
-      CHECK_EQUAL_HEX(int8_t(0x56), b.extract<int8_t>( 8, 8));
-      CHECK_EQUAL_HEX(int8_t(0x2B), b.extract<int8_t>( 9, 8));
-      CHECK_EQUAL_HEX(int8_t(0x15), b.extract<int8_t>(10, 8));
-      CHECK_EQUAL_HEX(int8_t(0x8A), b.extract<int8_t>(11, 8));
-      CHECK_EQUAL_HEX(int8_t(0x45), b.extract<int8_t>(12, 8));
-      CHECK_EQUAL_HEX(int8_t(0xA2), b.extract<int8_t>(13, 8));
-      CHECK_EQUAL_HEX(int8_t(0xD1), b.extract<int8_t>(14, 8));
-      CHECK_EQUAL_HEX(int8_t(0x68), b.extract<int8_t>(15, 8));
-      CHECK_EQUAL_HEX(int8_t(0x34), b.extract<int8_t>(16, 8));
-      CHECK_EQUAL_HEX(int8_t(0x1A), b.extract<int8_t>(17, 8));
-      CHECK_EQUAL_HEX(int8_t(0x8D), b.extract<int8_t>(18, 8));
-      CHECK_EQUAL_HEX(int8_t(0x46), b.extract<int8_t>(19, 8));
-      CHECK_EQUAL_HEX(int8_t(0x23), b.extract<int8_t>(20, 8));
-      CHECK_EQUAL_HEX(int8_t(0x91), b.extract<int8_t>(21, 8));
-      CHECK_EQUAL_HEX(int8_t(0x48), b.extract<int8_t>(22, 8));
-      CHECK_EQUAL_HEX(int8_t(0x24), b.extract<int8_t>(23, 8));
-      CHECK_EQUAL_HEX(int8_t(0x12), b.extract<int8_t>(24, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x78), b.extract<uint8_t>(0, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), b.extract<uint8_t>(1, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), b.extract<uint8_t>(2, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), b.extract<uint8_t>(3, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x67), b.extract<uint8_t>(4, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), b.extract<uint8_t>(5, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x59), b.extract<uint8_t>(6, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), b.extract<uint8_t>(7, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x56), b.extract<uint8_t>(8, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), b.extract<uint8_t>(9, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x15), b.extract<uint8_t>(10, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), b.extract<uint8_t>(11, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x45), b.extract<uint8_t>(12, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), b.extract<uint8_t>(13, 8));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), b.extract<uint8_t>(14, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x68), b.extract<uint8_t>(15, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x34), b.extract<uint8_t>(16, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), b.extract<uint8_t>(17, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), b.extract<uint8_t>(18, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x46), b.extract<uint8_t>(19, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x23), b.extract<uint8_t>(20, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x91), b.extract<uint8_t>(21, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x48), b.extract<uint8_t>(22, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x24), b.extract<uint8_t>(23, 8));
+      CHECK_EQUAL_HEX(uint8_t(0x12), b.extract<uint8_t>(24, 8));
 
-      CHECK_THROW(b.extract<int8_t>(24, 9), etl::bitset_overflow);
-      CHECK_THROW(b.extract<int8_t>(25, 8), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(24, 9), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint8_t>(25, 8), etl::bitset_overflow);
     }
 
     //*************************************************************************
@@ -2416,35 +1801,35 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(int8_t(0x78), (b.extract<int8_t,  0, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x3C), (b.extract<int8_t,  1, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x9E), (b.extract<int8_t,  2, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0xCF), (b.extract<int8_t,  3, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x67), (b.extract<int8_t,  4, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0xB3), (b.extract<int8_t,  5, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x59), (b.extract<int8_t,  6, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0xAC), (b.extract<int8_t,  7, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x56), (b.extract<int8_t,  8, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x2B), (b.extract<int8_t,  9, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x15), (b.extract<int8_t, 10, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x8A), (b.extract<int8_t, 11, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x45), (b.extract<int8_t, 12, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0xA2), (b.extract<int8_t, 13, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0xD1), (b.extract<int8_t, 14, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x68), (b.extract<int8_t, 15, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x34), (b.extract<int8_t, 16, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x1A), (b.extract<int8_t, 17, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x8D), (b.extract<int8_t, 18, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x46), (b.extract<int8_t, 19, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x23), (b.extract<int8_t, 20, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x91), (b.extract<int8_t, 21, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x48), (b.extract<int8_t, 22, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x24), (b.extract<int8_t, 23, 8>()));
-      CHECK_EQUAL_HEX(int8_t(0x12), (b.extract<int8_t, 24, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x78), (b.extract<uint8_t, 0, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x3C), (b.extract<uint8_t, 1, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x9E), (b.extract<uint8_t, 2, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xCF), (b.extract<uint8_t, 3, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x67), (b.extract<uint8_t, 4, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xB3), (b.extract<uint8_t, 5, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x59), (b.extract<uint8_t, 6, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xAC), (b.extract<uint8_t, 7, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x56), (b.extract<uint8_t, 8, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x2B), (b.extract<uint8_t, 9, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x15), (b.extract<uint8_t, 10, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8A), (b.extract<uint8_t, 11, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x45), (b.extract<uint8_t, 12, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xA2), (b.extract<uint8_t, 13, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0xD1), (b.extract<uint8_t, 14, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x68), (b.extract<uint8_t, 15, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x34), (b.extract<uint8_t, 16, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x1A), (b.extract<uint8_t, 17, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x8D), (b.extract<uint8_t, 18, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x46), (b.extract<uint8_t, 19, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x23), (b.extract<uint8_t, 20, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x91), (b.extract<uint8_t, 21, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x48), (b.extract<uint8_t, 22, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x24), (b.extract<uint8_t, 23, 8>()));
+      CHECK_EQUAL_HEX(uint8_t(0x12), (b.extract<uint8_t, 24, 8>()));
 
       // The lines below should static assert.
-      //int8_t v1 = b.extract<int8_t, 24, 9>();
-      //int8_t v2 = b.extract<int8_t, 25, 8>();
+      //uint8_t v1 = b.extract<uint8_t, 24, 9>();
+      //uint8_t v2 = b.extract<uint8_t, 25, 8>();
     }
 
     //*************************************************************************
@@ -2455,16 +1840,16 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(uint16_t(0x1678), b.extract<uint16_t>( 0, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x0B3C), b.extract<uint16_t>( 1, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x0ACF), b.extract<uint16_t>( 3, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x0567), b.extract<uint16_t>( 4, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x02B3), b.extract<uint16_t>( 5, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x1159), b.extract<uint16_t>( 6, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x08AC), b.extract<uint16_t>( 7, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x1456), b.extract<uint16_t>( 8, 13));
-      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1678), b.extract<uint16_t>(0, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), b.extract<uint16_t>(1, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>(2, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), b.extract<uint16_t>(3, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), b.extract<uint16_t>(4, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), b.extract<uint16_t>(5, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), b.extract<uint16_t>(6, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), b.extract<uint16_t>(7, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), b.extract<uint16_t>(8, 13));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>(9, 13));
       CHECK_EQUAL_HEX(uint16_t(0x0D15), b.extract<uint16_t>(10, 13));
       CHECK_EQUAL_HEX(uint16_t(0x068A), b.extract<uint16_t>(11, 13));
       CHECK_EQUAL_HEX(uint16_t(0x0345), b.extract<uint16_t>(12, 13));
@@ -2488,16 +1873,16 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(uint16_t(0x1678), (b.extract<uint16_t,  0, 13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x0B3C), (b.extract<uint16_t,  1, 13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x0ACF), (b.extract<uint16_t,  3, 13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x0567), (b.extract<uint16_t,  4, 13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x02B3), (b.extract<uint16_t,  5, 13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x1159), (b.extract<uint16_t,  6, 13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x08AC), (b.extract<uint16_t,  7, 13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x1456), (b.extract<uint16_t,  8, 13>()));
-      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1678), (b.extract<uint16_t, 0, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0B3C), (b.extract<uint16_t, 1, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t, 2, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0ACF), (b.extract<uint16_t, 3, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x0567), (b.extract<uint16_t, 4, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x02B3), (b.extract<uint16_t, 5, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1159), (b.extract<uint16_t, 6, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x08AC), (b.extract<uint16_t, 7, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1456), (b.extract<uint16_t, 8, 13>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t, 9, 13>()));
       CHECK_EQUAL_HEX(uint16_t(0x0D15), (b.extract<uint16_t, 10, 13>()));
       CHECK_EQUAL_HEX(uint16_t(0x068A), (b.extract<uint16_t, 11, 13>()));
       CHECK_EQUAL_HEX(uint16_t(0x0345), (b.extract<uint16_t, 12, 13>()));
@@ -2522,16 +1907,16 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(uint16_t(0x5678), b.extract<uint16_t>( 0, 16));
-      CHECK_EQUAL_HEX(uint16_t(0x2B3C), b.extract<uint16_t>( 1, 16));
-      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>( 2, 16));
-      CHECK_EQUAL_HEX(uint16_t(0x8ACF), b.extract<uint16_t>( 3, 16));
-      CHECK_EQUAL_HEX(uint16_t(0x4567), b.extract<uint16_t>( 4, 16));
-      CHECK_EQUAL_HEX(uint16_t(0xA2B3), b.extract<uint16_t>( 5, 16));
-      CHECK_EQUAL_HEX(uint16_t(0xD159), b.extract<uint16_t>( 6, 16));
-      CHECK_EQUAL_HEX(uint16_t(0x68AC), b.extract<uint16_t>( 7, 16));
-      CHECK_EQUAL_HEX(uint16_t(0x3456), b.extract<uint16_t>( 8, 16));
-      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>( 9, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x5678), b.extract<uint16_t>(0, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), b.extract<uint16_t>(1, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>(2, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), b.extract<uint16_t>(3, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), b.extract<uint16_t>(4, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), b.extract<uint16_t>(5, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), b.extract<uint16_t>(6, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), b.extract<uint16_t>(7, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), b.extract<uint16_t>(8, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>(9, 16));
       CHECK_EQUAL_HEX(uint16_t(0x8D15), b.extract<uint16_t>(10, 16));
       CHECK_EQUAL_HEX(uint16_t(0x468A), b.extract<uint16_t>(11, 16));
       CHECK_EQUAL_HEX(uint16_t(0x2345), b.extract<uint16_t>(12, 16));
@@ -2552,16 +1937,16 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(uint16_t(0x5678), (b.extract<uint16_t,  0, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0x2B3C), (b.extract<uint16_t,  1, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t,  2, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0x8ACF), (b.extract<uint16_t,  3, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0x4567), (b.extract<uint16_t,  4, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0xA2B3), (b.extract<uint16_t,  5, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0xD159), (b.extract<uint16_t,  6, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0x68AC), (b.extract<uint16_t,  7, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0x3456), (b.extract<uint16_t,  8, 16>()));
-      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t,  9, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x5678), (b.extract<uint16_t, 0, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), (b.extract<uint16_t, 1, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t, 2, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), (b.extract<uint16_t, 3, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), (b.extract<uint16_t, 4, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), (b.extract<uint16_t, 5, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), (b.extract<uint16_t, 6, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), (b.extract<uint16_t, 7, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), (b.extract<uint16_t, 8, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t, 9, 16>()));
       CHECK_EQUAL_HEX(uint16_t(0x8D15), (b.extract<uint16_t, 10, 16>()));
       CHECK_EQUAL_HEX(uint16_t(0x468A), (b.extract<uint16_t, 11, 16>()));
       CHECK_EQUAL_HEX(uint16_t(0x2345), (b.extract<uint16_t, 12, 16>()));
@@ -2583,26 +1968,26 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(int16_t(0x5678), b.extract<int16_t>( 0, 16));
-      CHECK_EQUAL_HEX(int16_t(0x2B3C), b.extract<int16_t>( 1, 16));
-      CHECK_EQUAL_HEX(int16_t(0x159E), b.extract<int16_t>( 2, 16));
-      CHECK_EQUAL_HEX(int16_t(0x8ACF), b.extract<int16_t>( 3, 16));
-      CHECK_EQUAL_HEX(int16_t(0x4567), b.extract<int16_t>( 4, 16));
-      CHECK_EQUAL_HEX(int16_t(0xA2B3), b.extract<int16_t>( 5, 16));
-      CHECK_EQUAL_HEX(int16_t(0xD159), b.extract<int16_t>( 6, 16));
-      CHECK_EQUAL_HEX(int16_t(0x68AC), b.extract<int16_t>( 7, 16));
-      CHECK_EQUAL_HEX(int16_t(0x3456), b.extract<int16_t>( 8, 16));
-      CHECK_EQUAL_HEX(int16_t(0x1A2B), b.extract<int16_t>( 9, 16));
-      CHECK_EQUAL_HEX(int16_t(0x8D15), b.extract<int16_t>(10, 16));
-      CHECK_EQUAL_HEX(int16_t(0x468A), b.extract<int16_t>(11, 16));
-      CHECK_EQUAL_HEX(int16_t(0x2345), b.extract<int16_t>(12, 16));
-      CHECK_EQUAL_HEX(int16_t(0x91A2), b.extract<int16_t>(13, 16));
-      CHECK_EQUAL_HEX(int16_t(0x48D1), b.extract<int16_t>(14, 16));
-      CHECK_EQUAL_HEX(int16_t(0x2468), b.extract<int16_t>(15, 16));
-      CHECK_EQUAL_HEX(int16_t(0x1234), b.extract<int16_t>(16, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x5678), b.extract<uint16_t>(0, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), b.extract<uint16_t>(1, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), b.extract<uint16_t>(2, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), b.extract<uint16_t>(3, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), b.extract<uint16_t>(4, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), b.extract<uint16_t>(5, 16));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), b.extract<uint16_t>(6, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), b.extract<uint16_t>(7, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), b.extract<uint16_t>(8, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), b.extract<uint16_t>(9, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), b.extract<uint16_t>(10, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), b.extract<uint16_t>(11, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), b.extract<uint16_t>(12, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), b.extract<uint16_t>(13, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), b.extract<uint16_t>(14, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), b.extract<uint16_t>(15, 16));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), b.extract<uint16_t>(16, 16));
 
-      CHECK_THROW(b.extract<int16_t>(16, 17), etl::bitset_overflow);
-      CHECK_THROW(b.extract<int16_t>(17, 16), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(16, 17), etl::bitset_overflow);
+      CHECK_THROW(b.extract<uint16_t>(17, 16), etl::bitset_overflow);
     }
 
     //*************************************************************************
@@ -2613,27 +1998,27 @@ namespace
       bs32::buffer_type buffer;
       bs32 b(0x12345678UL, buffer);
 
-      CHECK_EQUAL_HEX(int16_t(0x5678), (b.extract<int16_t,  0, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x2B3C), (b.extract<int16_t,  1, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x159E), (b.extract<int16_t,  2, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x8ACF), (b.extract<int16_t,  3, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x4567), (b.extract<int16_t,  4, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0xA2B3), (b.extract<int16_t,  5, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0xD159), (b.extract<int16_t,  6, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x68AC), (b.extract<int16_t,  7, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x3456), (b.extract<int16_t,  8, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x1A2B), (b.extract<int16_t,  9, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x8D15), (b.extract<int16_t, 10, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x468A), (b.extract<int16_t, 11, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x2345), (b.extract<int16_t, 12, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x91A2), (b.extract<int16_t, 13, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x48D1), (b.extract<int16_t, 14, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x2468), (b.extract<int16_t, 15, 16>()));
-      CHECK_EQUAL_HEX(int16_t(0x1234), (b.extract<int16_t, 16, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x5678), (b.extract<uint16_t, 0, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2B3C), (b.extract<uint16_t, 1, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x159E), (b.extract<uint16_t, 2, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8ACF), (b.extract<uint16_t, 3, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x4567), (b.extract<uint16_t, 4, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xA2B3), (b.extract<uint16_t, 5, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0xD159), (b.extract<uint16_t, 6, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x68AC), (b.extract<uint16_t, 7, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x3456), (b.extract<uint16_t, 8, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1A2B), (b.extract<uint16_t, 9, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x8D15), (b.extract<uint16_t, 10, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x468A), (b.extract<uint16_t, 11, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2345), (b.extract<uint16_t, 12, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x91A2), (b.extract<uint16_t, 13, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x48D1), (b.extract<uint16_t, 14, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x2468), (b.extract<uint16_t, 15, 16>()));
+      CHECK_EQUAL_HEX(uint16_t(0x1234), (b.extract<uint16_t, 16, 16>()));
 
       // The lines below should static assert.
-      //int16_t v1 = b.extract<int16_t, 16, 17>());
-      //int16_t v2 = b.extract<int16_t, 17, 16>());
+      //uint16_t v1 = b.extract<uint16_t, 16, 17>());
+      //uint16_t v2 = b.extract<uint16_t, 17, 16>());
     }
   };
 }
diff --git a/test/test_bitset_new_ext_explicit_single_element_type.cpp b/test/test_bitset_new_ext_explicit_single_element_type.cpp
index cbba1ed4..a26fa6a9 100644
--- a/test/test_bitset_new_ext_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_ext_explicit_single_element_type.cpp
@@ -106,15 +106,20 @@ namespace
       etl::bitset_ext<32, uint32_t> data32(buffer32);
       etl::bitset_ext<64, uint64_t> data64(buffer64);
 
+      CHECK_EQUAL(8,  data8.Size);
+      CHECK_EQUAL(16, data16.Size);
+      CHECK_EQUAL(32, data32.Size);
+      CHECK_EQUAL(64, data64.Size);
+
       CHECK_EQUAL(1U, data8.Number_Of_Elements);
       CHECK_EQUAL(1U, data16.Number_Of_Elements);
       CHECK_EQUAL(1U, data32.Number_Of_Elements);
       CHECK_EQUAL(1U, data64.Number_Of_Elements);
 
-      CHECK_EQUAL(etl::bitset_layout::Single, data8.Element_Layout);
-      CHECK_EQUAL(etl::bitset_layout::Single, data16.Element_Layout);
-      CHECK_EQUAL(etl::bitset_layout::Single, data32.Element_Layout);
-      CHECK_EQUAL(etl::bitset_layout::Single, data64.Element_Layout);
+      CHECK_EQUAL(etl::bitset_storage_model::Single, data8.Storage_Model);
+      CHECK_EQUAL(etl::bitset_storage_model::Single, data16.Storage_Model);
+      CHECK_EQUAL(etl::bitset_storage_model::Single, data32.Storage_Model);
+      CHECK_EQUAL(etl::bitset_storage_model::Single, data64.Storage_Model);
     }
 
     //*************************************************************************
@@ -1581,6 +1586,9 @@ namespace
 
       span_t s = data.span();
       CHECK_EQUAL(0x12345678UL, s[0]);
+
+      s[0] = 0x87654321UL;
+      CHECK_EQUAL(0x87654321UL, data.value<uint32_t>());
     }
 
     //*************************************************************************
diff --git a/test/vs2022/etl.vcxproj b/test/vs2022/etl.vcxproj
index 473d635c..9bf0209f 100644
--- a/test/vs2022/etl.vcxproj
+++ b/test/vs2022/etl.vcxproj
@@ -7288,6 +7288,7 @@
     <ClCompile Include="..\test_atomic.cpp" />
     <ClCompile Include="..\test_base64.cpp" />
     <ClCompile Include="..\test_bit.cpp" />
+    <ClCompile Include="..\test_bitset_new_comparisons.cpp" />
     <ClCompile Include="..\test_bitset_new_default_element_type.cpp" />
     <ClCompile Include="..\test_bitset_new_explicit_single_element_type.cpp" />
     <ClCompile Include="..\test_bitset_new_ext_default_element_type.cpp" />
diff --git a/test/vs2022/etl.vcxproj.filters b/test/vs2022/etl.vcxproj.filters
index 5c457a21..ba98e37f 100644
--- a/test/vs2022/etl.vcxproj.filters
+++ b/test/vs2022/etl.vcxproj.filters
@@ -3245,9 +3245,6 @@
     <ClCompile Include="..\test_math_functions.cpp">
       <Filter>Tests\Maths</Filter>
     </ClCompile>
-    <ClCompile Include="..\syntax_check\math.h.t.cpp">
-      <Filter>Tests\Maths</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_string_u8.cpp">
       <Filter>Tests\Strings</Filter>
     </ClCompile>
@@ -3284,6 +3281,12 @@
     <ClCompile Include="..\test_crc1.cpp">
       <Filter>Tests\CRC</Filter>
     </ClCompile>
+    <ClCompile Include="..\test_bitset_new_comparisons.cpp">
+      <Filter>Tests\Binary</Filter>
+    </ClCompile>
+    <ClCompile Include="..\syntax_check\math.h.t.cpp">
+      <Filter>Tests\Syntax Checks\Source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\library.properties">

From 9bf8da3d26e7325ef1e0d8c9900fd1c40e6f713b Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Thu, 4 Jan 2024 00:12:36 +0000
Subject: [PATCH 026/131] Updated Arduino library files

---
 arduino/library-arduino.json       | 2 +-
 arduino/library-arduino.properties | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arduino/library-arduino.json b/arduino/library-arduino.json
index a79a9907..fec95d0c 100644
--- a/arduino/library-arduino.json
+++ b/arduino/library-arduino.json
@@ -1,5 +1,5 @@
 {
-  "name": "Embedded Template Library - Arduino",
+  "name": "Embedded Template Library - ETL",
   "version": "20.38.10",
   "authors": {
     "name": "John Wellbelove",
diff --git a/arduino/library-arduino.properties b/arduino/library-arduino.properties
index 043882bb..c6a8acb8 100644
--- a/arduino/library-arduino.properties
+++ b/arduino/library-arduino.properties
@@ -1,7 +1,7 @@
-name=Embedded Template Library - Arduino
+name=Embedded Template Library - ETL
 version=20.38.10
-author= John Wellbelove <john.wellbelove@etlcpp.com>
-maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
+author= John Wellbelove <arduino@etlcpp.com>
+maintainer=John Wellbelove <arduino@etlcpp.com>
 license=MIT
 sentence=ETL. A C++ template library tailored for embedded systems.
 paragraph=

From ce7ce3bb72ea09c31d92bc66972305cbb76413f8 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 13 Jan 2024 11:44:40 +0000
Subject: [PATCH 027/131] Make binary functor operator() const

---
 include/etl/binary.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/etl/binary.h b/include/etl/binary.h
index 37e6b00f..903d2bca 100644
--- a/include/etl/binary.h
+++ b/include/etl/binary.h
@@ -2286,7 +2286,7 @@ namespace etl
     //***********************************
     ETL_NODISCARD
     ETL_CONSTEXPR
-    T operator ()(T value) ETL_NOEXCEPT
+    T operator ()(T value) const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Not an integral type");
 
@@ -2311,7 +2311,7 @@ namespace etl
     //***********************************
     ETL_NODISCARD
     ETL_CONSTEXPR 
-    T operator ()(T value) ETL_NOEXCEPT
+    T operator ()(T value) const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Not an integral type");
 
@@ -2340,7 +2340,7 @@ namespace etl
     //***********************************
     ETL_NODISCARD
     ETL_CONSTEXPR
-    T operator ()(T value) ETL_NOEXCEPT
+    T operator ()(T value) const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Not an integral type");
 
@@ -2369,7 +2369,7 @@ namespace etl
     //***********************************
     ETL_NODISCARD
     ETL_CONSTEXPR
-    T operator ()(T value) ETL_NOEXCEPT
+    T operator ()(T value) const ETL_NOEXCEPT
     {
       ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Not an integral type");
 

From 8f6055e99bb9d6810807249fe049d4566e0ce668 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 13 Jan 2024 11:44:59 +0000
Subject: [PATCH 028/131] Removed ETL_STATIC_CONSTANT

---
 include/etl/platform.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/etl/platform.h b/include/etl/platform.h
index 294ee7cf..360f9027 100644
--- a/include/etl/platform.h
+++ b/include/etl/platform.h
@@ -249,7 +249,6 @@ SOFTWARE.
   #define ETL_CONSTEXPR                   constexpr
   #define ETL_CONSTEXPR11                 constexpr // Synonym for ETL_CONSTEXPR
   #define ETL_CONSTANT                    constexpr
-  #define ETL_STATIC_CONSTANT             constexpr
   #define ETL_DELETE                      = delete
   #define ETL_EXPLICIT                    explicit
   #define ETL_OVERRIDE                    override
@@ -271,7 +270,6 @@ SOFTWARE.
   #define ETL_CONSTEXPR
   #define ETL_CONSTEXPR11
   #define ETL_CONSTANT                    const
-  #define ETL_STATIC_CONSTANT             static const
   #define ETL_DELETE
   #define ETL_EXPLICIT
   #define ETL_OVERRIDE

From 3ca624efb0bfeb365011ae1372525bec75e635cf Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 13 Jan 2024 11:45:38 +0000
Subject: [PATCH 029/131] Changed case of template constants

---
 include/etl/bloom_filter.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/etl/bloom_filter.h b/include/etl/bloom_filter.h
index 711a151b..5d35128c 100644
--- a/include/etl/bloom_filter.h
+++ b/include/etl/bloom_filter.h
@@ -62,17 +62,17 @@ namespace etl
   /// An implementation of a bloom filter.
   /// Allows up to three hashes to be defined.
   /// Hashes must support the () operator and define 'argument_type'.
-  ///\tparam DESIRED_WIDTH The desired number of hash results that can be stored. Rounded up to best fit the underlying bitset.
+  ///\tparam Desired_Width The desired number of hash results that can be stored. Rounded up to best fit the underlying bitset.
   ///\tparam THash1        The first hash generator class.
   ///\tparam THash2        The second hash generator class. If omitted, uses the null hash.
   ///\tparam THash3        The third hash generator class.  If omitted, uses the null hash.
   /// The hash classes must define <b>argument_type</b>.
   ///\ingroup bloom_filter
   //***************************************************************************
-  template <size_t DESIRED_WIDTH,
-            typename     THash1,
-            typename     THash2 = private_bloom_filter::null_hash,
-            typename     THash3 = private_bloom_filter::null_hash>
+  template <size_t   Desired_Width,
+            typename THash1,
+            typename THash2 = private_bloom_filter::null_hash,
+            typename THash3 = private_bloom_filter::null_hash>
   class bloom_filter
   {
   private:
@@ -85,7 +85,7 @@ namespace etl
     enum
     {
       // Make the most efficient use of the bitset.
-      WIDTH = etl::bitset<DESIRED_WIDTH>::ALLOCATED_BITS
+      WIDTH = etl::bitset<Desired_Width>::Allocated_Bits
     };
 
     //***************************************************************************

From 3d3dad84991e531488e6782fbe63cd4567bb963a Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 13 Jan 2024 11:45:57 +0000
Subject: [PATCH 030/131] Work in progress

---
 include/etl/private/bitset_new.h              | 616 ++++++++++++++----
 test/test_bitset_new_default_element_type.cpp | 399 ++++++++++++
 ...itset_new_explicit_single_element_type.cpp | 399 ++++++++++++
 ...st_bitset_new_ext_default_element_type.cpp | 373 +++++++++++
 ...t_new_ext_explicit_single_element_type.cpp | 373 +++++++++++
 5 files changed, 2031 insertions(+), 129 deletions(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 1f76a448..8c341eba 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -90,9 +90,18 @@ namespace etl
   //***************************************************************************
   struct bitset_storage_model
   {
-    static ETL_CONSTANT char Undefined = 0;
-    static ETL_CONSTANT char Single    = 1;
-    static ETL_CONSTANT char Multi     = 2;
+    enum enum_type
+    {
+      Undefined = 0,
+      Single    = 1,
+      Multi     = 2
+    };
+
+    ETL_DECLARE_ENUM_TYPE(bitset_storage_model, char)
+    ETL_ENUM_TYPE(Undefined, "Undefined")
+    ETL_ENUM_TYPE(Single,    "Single")
+    ETL_ENUM_TYPE(Multi,     "Multi")
+    ETL_END_ENUM_TYPE
   };
 
   //***************************************************************************
@@ -151,6 +160,37 @@ namespace etl
     }
   };
 
+  //***************************************************************************
+  namespace private_bitset
+  {
+    template <typename TElement>
+    class bitset_impl_common
+    {
+    public:
+
+      typedef TElement            element_type;
+      typedef TElement*       pointer;
+      typedef const TElement* const_pointer;
+
+      static ETL_CONSTANT size_t   npos              = etl::integral_limits<size_t>::max;
+      static ETL_CONSTANT size_t   Bits_Per_Element  = etl::integral_limits<TElement>::bits;
+      static ETL_CONSTANT TElement All_Set_Element   = etl::integral_limits<TElement>::max;
+      static ETL_CONSTANT TElement All_Clear_Element = element_type(0);
+    };
+
+    template <typename TElement>
+    ETL_CONSTANT size_t bitset_impl_common<TElement>::npos;
+
+    template <typename TElement>
+    ETL_CONSTANT size_t bitset_impl_common<TElement>::Bits_Per_Element;
+
+    template <typename TElement>
+    ETL_CONSTANT TElement bitset_impl_common<TElement>::All_Set_Element;
+
+    template <typename TElement>
+    ETL_CONSTANT TElement bitset_impl_common<TElement>::All_Clear_Element;
+  }
+
   //*************************************************************************
   /// Bitset implementation declaration.
   ///\ingroup bitset
@@ -163,19 +203,19 @@ namespace etl
   ///\ingroup bitset
   //*************************************************************************
   template <typename TElement>
-  class bitset_impl<TElement, etl::bitset_storage_model::Single>
+  class bitset_impl<TElement, etl::bitset_storage_model::Single> : public etl::private_bitset::bitset_impl_common<TElement>
   {
   public:
 
-    typedef TElement            element_type;
-    typedef element_type*       pointer;
-    typedef const element_type* const_pointer;
+    using typename etl::private_bitset::bitset_impl_common<TElement>::element_type;
+    using typename etl::private_bitset::bitset_impl_common<TElement>::pointer;
+    using typename etl::private_bitset::bitset_impl_common<TElement>::const_pointer;
 
-    static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
+    using etl::private_bitset::bitset_impl_common<TElement>::Bits_Per_Element;
+    using etl::private_bitset::bitset_impl_common<TElement>::All_Set_Element;
+    using etl::private_bitset::bitset_impl_common<TElement>::All_Clear_Element;
 
-    static ETL_CONSTANT size_t       Bits_Per_Element  = etl::integral_limits<element_type>::bits;
-    static ETL_CONSTANT element_type All_Set_Element   = etl::integral_limits<element_type>::max;
-    static ETL_CONSTANT element_type All_Clear_Element = element_type(0);
+    using etl::private_bitset::bitset_impl_common<TElement>::npos;
 
     //*************************************************************************
     /// Set all of the bits.
@@ -210,6 +250,47 @@ namespace etl
       }
     }
 
+    //*************************************************************************
+    /// Set the bit at the position.
+    //*************************************************************************
+    template <size_t Position>
+    ETL_CONSTEXPR14
+    static
+    void set_position(pointer pbuffer,
+                      bool    value = true)
+    {
+      const element_type mask = element_type(element_type(1) << Position);
+
+      if (value == true)
+      {
+        *pbuffer |= mask;
+      }
+      else
+      {
+        *pbuffer &= ~mask;
+      }
+    }
+
+    //*************************************************************************
+    /// Set the bit at the position.
+    //*************************************************************************
+    template <size_t Position, bool Value>
+    ETL_CONSTEXPR14
+    static
+    void set_position(pointer pbuffer)
+    {
+      const element_type mask = element_type(element_type(1) << Position);
+
+      if (Value == true)
+      {
+        *pbuffer |= mask;
+      }
+      else
+      {
+        *pbuffer &= ~mask;
+      }
+    }
+
     //*************************************************************************
     /// Reset all of the bits.
     //*************************************************************************
@@ -771,19 +852,23 @@ namespace etl
   ///\ingroup bitset
   //*************************************************************************
   template <typename TElement>
-  class bitset_impl<TElement, etl::bitset_storage_model::Multi>
+  class bitset_impl<TElement, etl::bitset_storage_model::Multi> : public etl::private_bitset::bitset_impl_common<TElement>
   {
+  private:
+
+    typedef etl::private_bitset::bitset_impl_common<TElement> common;
+
   public:
 
-    typedef TElement            element_type;
-    typedef element_type*       pointer;
-    typedef const element_type* const_pointer;
+    using typename etl::private_bitset::bitset_impl_common<TElement>::element_type;
+    using typename etl::private_bitset::bitset_impl_common<TElement>::pointer;
+    using typename etl::private_bitset::bitset_impl_common<TElement>::const_pointer;
 
-    static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
+    using etl::private_bitset::bitset_impl_common<TElement>::Bits_Per_Element;
+    using etl::private_bitset::bitset_impl_common<TElement>::All_Set_Element;
+    using etl::private_bitset::bitset_impl_common<TElement>::All_Clear_Element;
 
-    static ETL_CONSTANT size_t       Bits_Per_Element = etl::integral_limits<element_type>::bits;
-    static ETL_CONSTANT element_type All_Set_Element = etl::integral_limits<element_type>::max;
-    static ETL_CONSTANT element_type All_Clear_Element = element_type(0);
+    using etl::private_bitset::bitset_impl_common<TElement>::npos;
 
     //*************************************************************************
     /// Check to see if the requested extract is contained within one element.
@@ -924,7 +1009,50 @@ namespace etl
       size_t       index = position >> etl::log2<Bits_Per_Element>::value;
       element_type bit   = element_type(1) << (position & (Bits_Per_Element - 1));
 
-      if (value)
+      if (value == true)
+      {
+        pbuffer[index] |= bit;
+      }
+      else
+      {
+        pbuffer[index] &= ~bit;
+      }
+    }
+
+    //*************************************************************************
+    /// Set the bit at the position.
+    //*************************************************************************
+    template <size_t Position>
+    ETL_CONSTEXPR14
+    static
+    void set_position(pointer pbuffer,
+                      bool    value = true)
+    {
+      size_t       index = Position >> etl::log2<Bits_Per_Element>::value;
+      element_type bit   = element_type(1) << (Position & (Bits_Per_Element - 1));
+
+      if (value == true)
+      {
+        pbuffer[index] |= bit;
+      }
+      else
+      {
+        pbuffer[index] &= ~bit;
+      }
+    }
+
+    //*************************************************************************
+    /// Set the bit at the position.
+    //*************************************************************************
+    template <size_t Position, bool Value>
+    ETL_CONSTEXPR14
+    static
+    void set_position(pointer pbuffer)
+    {
+      size_t       index = Position >> etl::log2<Bits_Per_Element>::value;
+      element_type bit = element_type(1) << (Position & (Bits_Per_Element - 1));
+
+      if (Value == true)
       {
         pbuffer[index] |= bit;
       }
@@ -1674,6 +1802,55 @@ namespace etl
     }
   };
 
+  namespace private_bitset
+  {
+    //***************************************************************************
+    template <size_t Active_Bits, typename TElement>
+    class bitset_common : public etl::private_bitset::bitset_impl_common<TElement>
+    {
+    public:
+
+      typedef typename etl::private_bitset::bitset_impl_common<TElement>::element_type element_type;
+      
+      using etl::private_bitset::bitset_impl_common<TElement>::Bits_Per_Element;
+      using etl::private_bitset::bitset_impl_common<TElement>::All_Set_Element;
+      using etl::private_bitset::bitset_impl_common<TElement>::All_Clear_Element;
+
+      static ETL_CONSTANT size_t Number_Of_Elements = (Active_Bits % Bits_Per_Element == 0) ? Active_Bits / Bits_Per_Element : Active_Bits / Bits_Per_Element + 1;
+      static ETL_CONSTANT size_t Size               = Active_Bits;
+      static ETL_CONSTANT size_t Allocated_Bits     = Number_Of_Elements * Bits_Per_Element;
+
+      static ETL_CONSTANT etl::bitset_storage_model Storage_Model = (Number_Of_Elements == 1U) ? etl::bitset_storage_model::Single : etl::bitset_storage_model::Multi;
+
+      typedef etl::span<element_type,       Number_Of_Elements> span_type;
+      typedef etl::span<const element_type, Number_Of_Elements> const_span_type;
+
+    private:
+
+      static ETL_CONSTANT size_t Top_Mask_Shift = ((Bits_Per_Element - ((Number_Of_Elements * Bits_Per_Element) - Active_Bits)) % Bits_Per_Element);
+
+    public:
+
+      static ETL_CONSTANT TElement Top_Mask = element_type(Top_Mask_Shift == 0 ? All_Set_Element : ~(All_Set_Element << Top_Mask_Shift));
+    };
+
+
+    template <size_t Active_Bits, typename TElement>
+    ETL_CONSTANT size_t bitset_common<Active_Bits, TElement>::Number_Of_Elements;
+
+    template <size_t Active_Bits, typename TElement>
+    ETL_CONSTANT size_t bitset_common<Active_Bits, TElement>::Size;
+
+    template <size_t Active_Bits, typename TElement>
+    ETL_CONSTANT etl::bitset_storage_model bitset_common<Active_Bits, TElement>::Storage_Model;
+
+    template <size_t Active_Bits, typename TElement>
+    ETL_CONSTANT size_t bitset_common<Active_Bits, TElement>::Top_Mask_Shift;
+
+    template <size_t Active_Bits, typename TElement>
+    ETL_CONSTANT TElement bitset_common<Active_Bits, TElement>::Top_Mask;  
+  }
+
   //***************************************************************************
   /// Bitset forward declaration
   //***************************************************************************
@@ -1685,61 +1862,46 @@ namespace etl
   /// Specialisation for zero bits.
   //***************************************************************************
   template <>
-  class bitset<0U, unsigned char>
+  class bitset<0U, unsigned char> : public etl::private_bitset::bitset_common<0U, unsigned char>
   {
   public:
 
-    typedef unsigned char element_type;
+    typedef typename etl::private_bitset::bitset_common<0U, unsigned char>::element_type    element_type;
+    typedef typename etl::private_bitset::bitset_common<0U, unsigned char>::span_type       span_type;
+    typedef typename etl::private_bitset::bitset_common<0U, unsigned char>::const_span_type const_span_type;
 
-    typedef element_type*       pointer;
-    typedef const element_type* const_pointer;
-
-    static ETL_CONSTANT size_t       Bits_Per_Element   = 0U;
-    static ETL_CONSTANT size_t       Number_Of_Elements = 0U;
-    static ETL_CONSTANT size_t       Allocated_Bits     = 0U;
-    static ETL_CONSTANT element_type All_Set_Element    = 0U;
-    static ETL_CONSTANT element_type All_Clear_Element  = 0U;
-    static ETL_CONSTANT size_t       Size               = 0U;
-    static ETL_CONSTANT char         Storage_Model      = etl::bitset_storage_model::Undefined;
-
-    static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::Bits_Per_Element;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::All_Set_Element;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::All_Clear_Element;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::Number_Of_Elements;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::Size;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::Storage_Model;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::Top_Mask;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::Allocated_Bits;
   };
 
   //*************************************************************************
   /// The bitset top level template.
   //*************************************************************************
   template <size_t Active_Bits, typename TElement>
-  class bitset
+  class bitset : public etl::private_bitset::bitset_common<Active_Bits, TElement>
   {
   public:
 
     ETL_STATIC_ASSERT(etl::is_unsigned<TElement>::value, "The element type must be unsigned");
 
-    typedef TElement            element_type;
-    typedef element_type*       pointer;
-    typedef const element_type* const_pointer;
+    typedef typename etl::private_bitset::bitset_common<Active_Bits, TElement>::element_type    element_type;
+    typedef typename etl::private_bitset::bitset_common<Active_Bits, TElement>::span_type       span_type;
+    typedef typename etl::private_bitset::bitset_common<Active_Bits, TElement>::const_span_type const_span_type;
 
-    static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
-
-    static ETL_CONSTANT size_t       Bits_Per_Element   = etl::integral_limits<element_type>::bits;
-    static ETL_CONSTANT element_type All_Set_Element    = etl::integral_limits<element_type>::max;
-    static ETL_CONSTANT element_type All_Clear_Element  = element_type(0);
-    static ETL_CONSTANT size_t       Number_Of_Elements = (Active_Bits % Bits_Per_Element == 0) ? Active_Bits / Bits_Per_Element : Active_Bits / Bits_Per_Element + 1;
-    static ETL_CONSTANT size_t       Allocated_Bits     = Number_Of_Elements * Bits_Per_Element;
-    static ETL_CONSTANT size_t       Size               = Active_Bits;
-    static ETL_CONSTANT char         Storage_Model      = (Number_Of_Elements == 1U) ? etl::bitset_storage_model::Single : etl::bitset_storage_model::Multi;
-
-  private:
-    
-    static ETL_CONSTANT size_t       Top_Mask_Shift = ((Bits_Per_Element - (Allocated_Bits - Active_Bits)) % Bits_Per_Element);
-    static ETL_CONSTANT element_type Top_Mask       = element_type(Top_Mask_Shift == 0 ? All_Set_Element : ~(All_Set_Element << Top_Mask_Shift));
-
-  public:
-
-    static ETL_CONSTANT size_t ALLOCATED_BITS = Allocated_Bits; ///< For backward compatibility.
-
-    typedef etl::span<element_type, Number_Of_Elements>       span_type;
-    typedef etl::span<const element_type, Number_Of_Elements> const_span_type;
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::Bits_Per_Element;
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::All_Set_Element;
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::All_Clear_Element;
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::Number_Of_Elements;
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::Size;
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::Storage_Model;
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::Top_Mask;
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::Allocated_Bits;
 
     //*************************************************************************
     /// The reference type returned.
@@ -1912,7 +2074,8 @@ namespace etl
     //*************************************************************************
     /// Set the bit at the position.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& set(size_t position, bool value = true)
+    ETL_CONSTEXPR14
+    bitset<Active_Bits, TElement>& set(size_t position, bool value = true)
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
 
@@ -1922,11 +2085,27 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Set from a string.
+    /// Set the bit at the position.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& set(const char* text) ETL_NOEXCEPT
+    template <size_t Position>
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& set(bool value = true)
     {
-      implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
+      ETL_STATIC_ASSERT(Position < Active_Bits, "Position out of bounds");
+
+      implementation::template set_position<Position>(buffer, value);
+
+      return *this;
+    }
+
+    //*************************************************************************
+    /// Set the bit at the position.
+    //*************************************************************************
+    template <size_t Position, bool Value>
+    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& set()
+    {
+      ETL_STATIC_ASSERT(Position < Active_Bits, "Position out of bounds");
+
+      implementation::template set_position<Position, Value>(buffer);
 
       return *this;
     }
@@ -1934,7 +2113,10 @@ namespace etl
     //*************************************************************************
     /// Set from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& set(const wchar_t* text) ETL_NOEXCEPT
+    template <typename TPString>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_same<TPString, const char*>::value, bitset<Active_Bits, TElement>&>::type
+      set(TPString text) ETL_NOEXCEPT
     {
       implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
 
@@ -1942,9 +2124,12 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Set from a string.
+    /// Set from a wide string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& set(const char16_t* text) ETL_NOEXCEPT
+    template <typename TPString>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_same<TPString, const wchar_t*>::value, bitset<Active_Bits, TElement>&>::type
+      set(TPString text) ETL_NOEXCEPT
     {
       implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
 
@@ -1952,9 +2137,25 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Set from a string.
+    /// Set from a char16 string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset<Active_Bits, TElement>& set(const char32_t* text) ETL_NOEXCEPT
+    template <typename TPString>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_same<TPString, const char16_t*>::value, bitset<Active_Bits, TElement>&>::type
+      set(TPString text) ETL_NOEXCEPT
+    {
+      implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
+
+      return *this;
+    }
+
+    //*************************************************************************
+    /// Set from a char32 string.
+    //*************************************************************************
+    template <typename TPString>
+    ETL_CONSTEXPR14 
+    typename etl::enable_if<etl::is_same<TPString, const char32_t*>::value, bitset<Active_Bits, TElement>&>::type
+      set(TPString text) ETL_NOEXCEPT
     {
       implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
 
@@ -2099,14 +2300,84 @@ namespace etl
       return implementation::test(buffer, position);
     }
  
+    //*************************************************************************
+    /// Tests a bit at a position.
+    /// Positions greater than the number of configured bits will not compile.
+    //*************************************************************************
+    template <size_t Position>
+    ETL_CONSTEXPR14 bool test() const
+    {
+      ETL_STATIC_ASSERT(Position < Active_Bits, "Position out of bounds");
+
+      return implementation::test(buffer, Position);
+    }
+
     //*************************************************************************
     /// The number of bits in the bitset.
     //*************************************************************************
-    ETL_CONSTEXPR14 size_t size() const ETL_NOEXCEPT
+    static ETL_CONSTEXPR size_t size() ETL_NOEXCEPT
     {
       return Active_Bits;
     }
 
+    //*************************************************************************
+    /// The number of storage elements in the bitset.
+    //*************************************************************************
+    static ETL_CONSTEXPR size_t number_of_elements() ETL_NOEXCEPT
+    {
+      return Number_Of_Elements;
+    }
+
+    //*************************************************************************
+    /// The value of a set element.
+    //*************************************************************************
+    static ETL_CONSTEXPR element_type all_set_element() ETL_NOEXCEPT
+    {
+      return All_Set_Element;
+    }
+
+    //*************************************************************************
+    /// The value of a clear element.
+    //*************************************************************************
+    static ETL_CONSTEXPR element_type all_clear_element() ETL_NOEXCEPT
+    {
+      return All_Clear_Element;
+    }
+
+    //*************************************************************************
+    /// The number of bits in an element.
+    //*************************************************************************
+    static ETL_CONSTEXPR size_t bits_per_element() ETL_NOEXCEPT
+    {
+      return Bits_Per_Element;
+    }
+
+    //*************************************************************************
+    /// The mask for the msb element.
+    //*************************************************************************
+    static ETL_CONSTEXPR element_type top_mask() ETL_NOEXCEPT
+    {
+      return Top_Mask;
+    }
+
+    //*************************************************************************
+    /// The total number of bits of storage, including unused.
+    //*************************************************************************
+    static ETL_CONSTEXPR size_t allocated_bits() ETL_NOEXCEPT
+    {
+      return Number_Of_Elements * Bits_Per_Element;
+    }
+
+    //*************************************************************************
+    /// The storage model for the bitset.
+    /// etl::bitset_storage_model::Single
+    /// etl::bitset_storage_model::Multi
+    //*************************************************************************
+    static ETL_CONSTEXPR etl::bitset_storage_model storage_model() ETL_NOEXCEPT
+    {
+      return Storage_Model;
+    }
+
     //*************************************************************************
     /// Count the number of bits set.
     //*************************************************************************
@@ -2507,62 +2778,48 @@ namespace etl
   /// Specialisation for zero bits.
   //***************************************************************************
   template <>
-  class bitset_ext<0U, unsigned char>
+  class bitset_ext<0U, unsigned char> : public etl::private_bitset::bitset_common<0U, unsigned char>
   {
   public:
 
-    typedef unsigned char element_type;
+    typedef typename etl::private_bitset::bitset_common<0U, unsigned char>::element_type    element_type;
+    typedef typename etl::private_bitset::bitset_common<0U, unsigned char>::span_type       span_type;
+    typedef typename etl::private_bitset::bitset_common<0U, unsigned char>::const_span_type const_span_type;
 
-    typedef element_type* pointer;
-    typedef const element_type* const_pointer;
-
-    static ETL_CONSTANT size_t       Bits_Per_Element   = 0U;
-    static ETL_CONSTANT size_t       Number_Of_Elements = 0U;
-    static ETL_CONSTANT size_t       Allocated_Bits     = 0U;
-    static ETL_CONSTANT element_type All_Set_Element    = 0U;
-    static ETL_CONSTANT element_type All_Clear_Element  = 0U;
-    static ETL_CONSTANT size_t       Size               = 0U;
-    static ETL_CONSTANT char         Storage_Model      = etl::bitset_storage_model::Undefined;
-
-    static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::Bits_Per_Element;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::All_Set_Element;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::All_Clear_Element;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::Number_Of_Elements;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::Size;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::Storage_Model;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::Top_Mask;
+    using etl::private_bitset::bitset_common<0U, unsigned char>::Allocated_Bits;
   };
 
   //*************************************************************************
-  /// The specialisation that uses an array of the default element type.
+  /// A bitset that uses externally declared storage.
   //*************************************************************************
   template <size_t Active_Bits, typename TElement>
-  class bitset_ext
+  class bitset_ext : public etl::private_bitset::bitset_common<Active_Bits, TElement>
   {
   public:
 
     ETL_STATIC_ASSERT(etl::is_unsigned<TElement>::value, "The element type must be unsigned");
 
-    typedef TElement            element_type;
-    typedef element_type*       pointer;
-    typedef const element_type* const_pointer;
+    typedef typename etl::private_bitset::bitset_common<Active_Bits, TElement>::element_type    element_type;
+    typedef typename etl::private_bitset::bitset_common<Active_Bits, TElement>::span_type       span_type;
+    typedef typename etl::private_bitset::bitset_common<Active_Bits, TElement>::const_span_type const_span_type;
+    
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::Bits_Per_Element;
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::All_Set_Element;
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::All_Clear_Element;
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::Number_Of_Elements;
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::Size;
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::Storage_Model;
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::Top_Mask;
+    using etl::private_bitset::bitset_common<Active_Bits, TElement>::Allocated_Bits;
 
-    static ETL_CONSTANT size_t npos = etl::integral_limits<size_t>::max;
-
-    static ETL_CONSTANT size_t       Bits_Per_Element   = etl::integral_limits<element_type>::bits;
-    static ETL_CONSTANT element_type All_Set_Element    = etl::integral_limits<element_type>::max;
-    static ETL_CONSTANT element_type All_Clear_Element  = element_type(0);
-    static ETL_CONSTANT size_t       Number_Of_Elements = (Active_Bits % Bits_Per_Element == 0) ? Active_Bits / Bits_Per_Element : Active_Bits / Bits_Per_Element + 1;
-    static ETL_CONSTANT size_t       Allocated_Bits     = Number_Of_Elements * Bits_Per_Element;
-    static ETL_CONSTANT size_t       Size               = Active_Bits;
-    static ETL_CONSTANT char         Storage_Model      = (Number_Of_Elements == 1U) ? etl::bitset_storage_model::Single : etl::bitset_storage_model::Multi;
-
-  private:
-
-    static ETL_CONSTANT size_t       Top_Mask_Shift = ((Bits_Per_Element - (Allocated_Bits - Active_Bits)) % Bits_Per_Element);
-    static ETL_CONSTANT element_type Top_Mask = element_type(Top_Mask_Shift == 0 ? All_Set_Element : ~(All_Set_Element << Top_Mask_Shift));
-
-  public:
-
-    static ETL_CONSTANT size_t ALLOCATED_BITS = Allocated_Bits; ///< For backward compatibility.
-
-    typedef etl::array<TElement, Number_Of_Elements>          buffer_type;
-    typedef etl::span<element_type, Number_Of_Elements>       span_type;
-    typedef etl::span<const element_type, Number_Of_Elements> const_span_type;
+    typedef etl::array<TElement, Number_Of_Elements> buffer_type;
 
     //*************************************************************************
     /// The reference type returned.
@@ -2811,21 +3068,38 @@ namespace etl
     //*************************************************************************
     /// Set the bit at the position.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set(size_t position, bool value = true)
+    ETL_CONSTEXPR14
+      bitset_ext<Active_Bits, TElement>& set(size_t position, bool value = true)
     {
       ETL_ASSERT_OR_RETURN_VALUE(position < Active_Bits, ETL_ERROR(bitset_overflow), *this);
-      
+
       implementation::set_position(pbuffer, position, value);
 
       return *this;
     }
 
     //*************************************************************************
-    /// Set from a string.
+    /// Set the bit at the position.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set(const char* text) ETL_NOEXCEPT
+    template <size_t Position>
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set(bool value = true)
     {
-      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
+      ETL_STATIC_ASSERT(Position < Active_Bits, "Position out of bounds");
+
+      implementation::template set_position<Position>(pbuffer, value);
+
+      return *this;
+    }
+
+    //*************************************************************************
+    /// Set the bit at the position.
+    //*************************************************************************
+    template <size_t Position, bool Value>
+    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set()
+    {
+      ETL_STATIC_ASSERT(Position < Active_Bits, "Position out of bounds");
+
+      implementation::template set_position<Position, Value>(pbuffer);
 
       return *this;
     }
@@ -2833,7 +3107,10 @@ namespace etl
     //*************************************************************************
     /// Set from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set(const wchar_t* text) ETL_NOEXCEPT
+    template <typename TPString>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_same<TPString, const char*>::value, bitset_ext<Active_Bits, TElement>&>::type
+      set(TPString text) ETL_NOEXCEPT
     {
       implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
 
@@ -2841,9 +3118,12 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Set from a string.
+    /// Set from a wide string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set(const char16_t* text) ETL_NOEXCEPT
+    template <typename TPString>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_same<TPString, const wchar_t*>::value, bitset_ext<Active_Bits, TElement>&>::type
+      set(TPString text) ETL_NOEXCEPT
     {
       implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
 
@@ -2851,9 +3131,25 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Set from a string.
+    /// Set from a char16 string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext<Active_Bits, TElement>& set(const char32_t* text) ETL_NOEXCEPT
+    template <typename TPString>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_same<TPString, const char16_t*>::value, bitset_ext<Active_Bits, TElement>&>::type
+      set(TPString text) ETL_NOEXCEPT
+    {
+      implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
+
+      return *this;
+    }
+
+    //*************************************************************************
+    /// Set from a char32 string.
+    //*************************************************************************
+    template <typename TPString>
+    ETL_CONSTEXPR14
+    typename etl::enable_if<etl::is_same<TPString, const char32_t*>::value, bitset_ext<Active_Bits, TElement>&>::type
+      set(TPString text) ETL_NOEXCEPT
     {
       implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
 
@@ -2997,14 +3293,84 @@ namespace etl
       return implementation::test(pbuffer, position);
     }
 
+    //*************************************************************************
+    /// Tests a bit at a position.
+    /// Positions greater than the number of configured bits will not compile.
+    //*************************************************************************
+    template <size_t Position>
+    ETL_CONSTEXPR14 bool test() const
+    {
+      ETL_STATIC_ASSERT(Position < Active_Bits, "Position out of bounds");
+
+      return implementation::test(pbuffer, Position);
+    }
+
     //*************************************************************************
     /// The number of bits in the bitset.
     //*************************************************************************
-    ETL_CONSTEXPR14 size_t size() const ETL_NOEXCEPT
+    static ETL_CONSTEXPR size_t size() ETL_NOEXCEPT
     {
       return Active_Bits;
     }
 
+    //*************************************************************************
+    /// The number of storage elements in the bitset.
+    //*************************************************************************
+    static ETL_CONSTEXPR size_t number_of_elements() ETL_NOEXCEPT
+    {
+      return Number_Of_Elements;
+    }
+
+    //*************************************************************************
+    /// The value of a set element.
+    //*************************************************************************
+    static ETL_CONSTEXPR element_type all_set_element() ETL_NOEXCEPT
+    {
+      return All_Set_Element;
+    }
+
+    //*************************************************************************
+    /// The value of a clear element.
+    //*************************************************************************
+    static ETL_CONSTEXPR element_type all_clear_element() ETL_NOEXCEPT
+    {
+      return All_Clear_Element;
+    }
+
+    //*************************************************************************
+    /// The mask for the msb element.
+    //*************************************************************************
+    static ETL_CONSTEXPR element_type top_mask() ETL_NOEXCEPT
+    {
+      return Top_Mask;
+    }
+
+    //*************************************************************************
+    /// The number of bits in an element.
+    //*************************************************************************
+    static ETL_CONSTEXPR size_t bits_per_element() ETL_NOEXCEPT
+    {
+      return Bits_Per_Element;
+    }
+
+    //*************************************************************************
+    /// The total number of bits of storage, including unused.
+    //*************************************************************************
+    static ETL_CONSTEXPR size_t allocated_bits() ETL_NOEXCEPT
+    {
+      return Number_Of_Elements * Bits_Per_Element;
+    }
+
+    //*************************************************************************
+    /// The storage model for the bitset.
+    /// etl::bitset_storage_model::Single
+    /// etl::bitset_storage_model::Multi
+    //*************************************************************************
+    static ETL_CONSTEXPR etl::bitset_storage_model storage_model() ETL_NOEXCEPT
+    {
+      return Storage_Model;
+    }
+
     //*************************************************************************
     /// Count the number of bits set.
     //*************************************************************************
@@ -3234,14 +3600,6 @@ namespace etl
 
   private:
 
-    ////*************************************************************************
-    ///// Correct the unused top bits after bit manipulation.
-    ////*************************************************************************
-    //ETL_CONSTEXPR14 static void clear_unused_bits_in_msb() ETL_NOEXCEPT
-    //{
-    //  pbuffer[Number_Of_Elements - 1U] &= Top_Mask;
-    //}
-
     // The implementation of the bitset functionality.
     typedef etl::bitset_impl<element_type, (Number_Of_Elements == 1U) ? etl::bitset_storage_model::Single : etl::bitset_storage_model::Multi> implementation;
 
diff --git a/test/test_bitset_new_default_element_type.cpp b/test/test_bitset_new_default_element_type.cpp
index 1a38ef2b..4ca19920 100644
--- a/test/test_bitset_new_default_element_type.cpp
+++ b/test/test_bitset_new_default_element_type.cpp
@@ -120,6 +120,77 @@ namespace
 
   SUITE(test_bitset_new_default_element_type)
   {
+    //*************************************************************************
+    TEST(test_constants)
+    {
+      using bitset_type  = etl::bitset<60>;
+      using element_type = bitset_type::element_type;
+
+      constexpr size_t       Size               = 60;
+      constexpr size_t       Bits_Per_Element   = etl::integral_limits<element_type>::bits;
+      constexpr size_t       Number_Of_Elements = (Size % Bits_Per_Element == 0) ? Size / Bits_Per_Element : Size / Bits_Per_Element + 1;
+      constexpr element_type All_Set_Element    = etl::integral_limits<element_type>::max;
+      constexpr element_type All_Clear_Element  = etl::integral_limits<element_type>::min;
+
+      //*******************************
+      constexpr size_t Size1 = bitset_type::Size;
+      constexpr size_t Size2 = bitset_type::size();
+
+      CHECK_EQUAL(Size, Size1);
+      CHECK_EQUAL(Size, Size2);
+
+      //*******************************
+      constexpr size_t Bits_Per_Element1 = bitset_type::Bits_Per_Element;
+      constexpr size_t Bits_Per_Element2 = bitset_type::bits_per_element();
+
+      CHECK_EQUAL(Bits_Per_Element, Bits_Per_Element1);
+      CHECK_EQUAL(Bits_Per_Element, Bits_Per_Element2);
+
+      //*******************************
+      constexpr size_t Number_Of_Elements1 = bitset_type::Number_Of_Elements;
+      constexpr size_t Number_Of_Elements2 = bitset_type::number_of_elements();
+      
+      CHECK_EQUAL(Number_Of_Elements, Number_Of_Elements1);
+      CHECK_EQUAL(Number_Of_Elements, Number_Of_Elements2);
+
+      //*******************************
+      constexpr element_type All_Set_Element1 = bitset_type::All_Set_Element;
+      constexpr element_type All_Set_Element2 = bitset_type::all_set_element();
+
+      CHECK_EQUAL(All_Set_Element, All_Set_Element1);
+      CHECK_EQUAL(All_Set_Element, All_Set_Element2);
+
+      //*******************************
+      constexpr size_t All_Clear_Element1 = bitset_type::All_Clear_Element;
+      constexpr size_t All_Clear_Element2 = bitset_type::all_clear_element();
+
+      CHECK_EQUAL(All_Clear_Element, All_Clear_Element1);
+      CHECK_EQUAL(All_Clear_Element, All_Clear_Element2);
+
+      //*******************************
+      constexpr size_t Allocated_Bits = bitset_type::allocated_bits();
+
+      CHECK_EQUAL(Number_Of_Elements * Bits_Per_Element, Allocated_Bits);
+
+      //*******************************
+      constexpr char Storage_Model1 = bitset_type::Storage_Model;
+      constexpr char Storage_Model2 = bitset_type::storage_model();
+
+      CHECK_EQUAL(etl::bitset_storage_model::Multi, Storage_Model1);
+      CHECK_EQUAL(etl::bitset_storage_model::Multi, Storage_Model2);
+
+      etl::bitset_storage_model bsm;
+      
+      bsm = etl::bitset_storage_model::Undefined;
+      CHECK_EQUAL(std::string("Undefined"), std::string(bsm.c_str()));
+
+      bsm = etl::bitset_storage_model::Single;
+      CHECK_EQUAL(std::string("Single"), std::string(bsm.c_str()));
+
+      bsm = etl::bitset_storage_model::Multi;
+      CHECK_EQUAL(std::string("Multi"), std::string(bsm.c_str()));
+    }
+
     //*************************************************************************
     TEST(test_default_constructor)
     {
@@ -394,6 +465,281 @@ namespace
       }
     }
 
+    //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64> test_set_run_time_position_default_value_helper()
+    {
+      etl::bitset<64> data;
+
+      data.set(2);
+      data.set(3);
+      data.set(5);
+      data.set(7);
+      data.set(11);
+      data.set(13);
+      data.set(17);
+      data.set(19);
+      data.set(23);
+      data.set(29);
+      data.set(31);
+
+      return data;
+    }
+
+    TEST(test_set_run_time_position_default_value)
+    {
+      std::bitset<64> compare;
+      ETL_CONSTEXPR14 etl::bitset<64> data(test_set_run_time_position_default_value_helper());
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      ETL_CONSTEXPR14 auto size  = data.size();
+      ETL_CONSTEXPR14 auto count = data.count();
+      ETL_CONSTEXPR14 auto none  = data.none();
+      ETL_CONSTEXPR14 auto any   = data.any();
+      ETL_CONSTEXPR14 auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64> test_set_run_time_position_value_helper()
+    {
+      etl::bitset<64> data;
+
+      data.set(2, true);
+      data.set(3, true);
+      data.set(5, true);
+      data.set(7, true);
+      data.set(11, true);
+      data.set(13, true);
+      data.set(17, true);
+      data.set(19, true);
+      data.set(23, true);
+      data.set(29, true);
+      data.set(31, true);
+
+      return data;
+    }
+
+    TEST(test_set_run_time_position_value)
+    {
+      std::bitset<64> compare;
+      ETL_CONSTEXPR14 etl::bitset<64> data(test_set_run_time_position_value_helper());
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      ETL_CONSTEXPR14 auto size  = data.size();
+      ETL_CONSTEXPR14 auto count = data.count();
+      ETL_CONSTEXPR14 auto none  = data.none();
+      ETL_CONSTEXPR14 auto any   = data.any();
+      ETL_CONSTEXPR14 auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64> test_set_compile_time_position_run_time_default_value_helper()
+    {
+      etl::bitset<64> data;
+
+      data.set<2>();
+      data.set<3>();
+      data.set<5>();
+      data.set<7>();
+      data.set<11>();
+      data.set<13>();
+      data.set<17>();
+      data.set<19>();
+      data.set<23>();
+      data.set<29>();
+      data.set<31>();
+
+      return data;
+    }
+
+    TEST(test_set_compile_time_position_run_time_default_value)
+    {
+      std::bitset<64> compare;
+      ETL_CONSTEXPR14 etl::bitset<64> data(test_set_compile_time_position_run_time_default_value_helper());
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      ETL_CONSTEXPR14 auto size  = data.size();
+      ETL_CONSTEXPR14 auto count = data.count();
+      ETL_CONSTEXPR14 auto none  = data.none();
+      ETL_CONSTEXPR14 auto any   = data.any();
+      ETL_CONSTEXPR14 auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64> test_set_compile_time_position_run_time_value_helper()
+    {
+      etl::bitset<64> data;
+
+      data.set<2>(true);
+      data.set<3>(true);
+      data.set<5>(true);
+      data.set<7>(true);
+      data.set<11>(true);
+      data.set<13>(true);
+      data.set<17>(true);
+      data.set<19>(true);
+      data.set<23>(true);
+      data.set<29>(true);
+      data.set<31>(true);
+
+      return data;
+    }
+
+    TEST(test_set_compile_time_position_run_time_value)
+    {
+      std::bitset<64> compare;
+      ETL_CONSTEXPR14 etl::bitset<64> data(test_set_compile_time_position_run_time_value_helper());
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      ETL_CONSTEXPR14 auto size  = data.size();
+      ETL_CONSTEXPR14 auto count = data.count();
+      ETL_CONSTEXPR14 auto none  = data.none();
+      ETL_CONSTEXPR14 auto any   = data.any();
+      ETL_CONSTEXPR14 auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64> test_set_compile_time_position_value_helper()
+    {
+      etl::bitset<64> data;
+
+      data.set<2, true>();
+      data.set<3, true>();
+      data.set<5, true>();
+      data.set<7, true>();
+      data.set<11, true>();
+      data.set<13, true>();
+      data.set<17, true>();
+      data.set<19, true>();
+      data.set<23, true>();
+      data.set<29, true>();
+      data.set<31, true>();
+
+      return data;
+    }
+
+    TEST(test_set_compile_time_position_value)
+    {
+      std::bitset<64> compare;
+      ETL_CONSTEXPR14 etl::bitset<64> data(test_set_compile_time_position_value_helper());
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      ETL_CONSTEXPR14 auto size  = data.size();
+      ETL_CONSTEXPR14 auto count = data.count();
+      ETL_CONSTEXPR14 auto none  = data.none();
+      ETL_CONSTEXPR14 auto any   = data.any();
+      ETL_CONSTEXPR14 auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
     //*************************************************************************
     TEST(test_set_with_char_string)
     {
@@ -2255,5 +2601,58 @@ namespace
       //int16_t v1 = b.extract<int16_t, 16, 17>());
       //int16_t v2 = b.extract<int16_t, 17, 16>());
     }
+
+    //*************************************************************************
+    bool test_bit(int i)
+    {
+      return (0x1234 & (1 << i)) != 0;
+    }
+
+    TEST(test_test_run_time)
+    {
+      ETL_CONSTEXPR14 etl::bitset<16> b(0x1234);
+
+      ETL_CONSTEXPR14 bool t0 = b.test(0);
+      ETL_CONSTEXPR14 bool t1 = b.test(1);
+      ETL_CONSTEXPR14 bool t2 = b.test(2);
+      ETL_CONSTEXPR14 bool t3 = b.test(3);
+      ETL_CONSTEXPR14 bool t4 = b.test(4);
+      ETL_CONSTEXPR14 bool t5 = b.test(5);
+      ETL_CONSTEXPR14 bool t6 = b.test(6);
+      ETL_CONSTEXPR14 bool t7 = b.test(7);
+
+      CHECK_EQUAL(test_bit(0), t0);
+      CHECK_EQUAL(test_bit(1), t1);
+      CHECK_EQUAL(test_bit(2), t2);
+      CHECK_EQUAL(test_bit(3), t3);
+      CHECK_EQUAL(test_bit(4), t4);
+      CHECK_EQUAL(test_bit(5), t5);
+      CHECK_EQUAL(test_bit(6), t6);
+      CHECK_EQUAL(test_bit(7), t7);
+    }
+
+    //*************************************************************************
+    TEST(test_test_compile_time)
+    {
+      ETL_CONSTEXPR14 etl::bitset<16> b(0x1234);
+
+      ETL_CONSTEXPR14 bool t0 = b.test<0>();
+      ETL_CONSTEXPR14 bool t1 = b.test<1>();
+      ETL_CONSTEXPR14 bool t2 = b.test<2>();
+      ETL_CONSTEXPR14 bool t3 = b.test<3>();
+      ETL_CONSTEXPR14 bool t4 = b.test<4>();
+      ETL_CONSTEXPR14 bool t5 = b.test<5>();
+      ETL_CONSTEXPR14 bool t6 = b.test<6>();
+      ETL_CONSTEXPR14 bool t7 = b.test<7>();
+
+      CHECK_EQUAL(test_bit(0), t0);
+      CHECK_EQUAL(test_bit(1), t1);
+      CHECK_EQUAL(test_bit(2), t2);
+      CHECK_EQUAL(test_bit(3), t3);
+      CHECK_EQUAL(test_bit(4), t4);
+      CHECK_EQUAL(test_bit(5), t5);
+      CHECK_EQUAL(test_bit(6), t6);
+      CHECK_EQUAL(test_bit(7), t7);
+    }
   };
 }
diff --git a/test/test_bitset_new_explicit_single_element_type.cpp b/test/test_bitset_new_explicit_single_element_type.cpp
index 0ce70049..91411477 100644
--- a/test/test_bitset_new_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_explicit_single_element_type.cpp
@@ -119,6 +119,77 @@ namespace
 
   SUITE(test_bitset_new_explicit_element_type)
   {
+    //*************************************************************************
+    TEST(test_constants)
+    {
+      using bitset_type  = etl::bitset<60, uint64_t>;
+      using element_type = bitset_type::element_type;
+
+      constexpr size_t       Size               = 60;
+      constexpr size_t       Bits_Per_Element   = etl::integral_limits<element_type>::bits;
+      constexpr size_t       Number_Of_Elements = (Size % Bits_Per_Element == 0) ? Size / Bits_Per_Element : Size / Bits_Per_Element + 1;
+      constexpr element_type All_Set_Element    = etl::integral_limits<element_type>::max;
+      constexpr element_type All_Clear_Element  = etl::integral_limits<element_type>::min;
+
+      //*******************************
+      constexpr size_t Size1 = bitset_type::Size;
+      constexpr size_t Size2 = bitset_type::size();
+
+      CHECK_EQUAL(Size, Size1);
+      CHECK_EQUAL(Size, Size2);
+
+      //*******************************
+      constexpr size_t Bits_Per_Element1 = bitset_type::Bits_Per_Element;
+      constexpr size_t Bits_Per_Element2 = bitset_type::bits_per_element();
+
+      CHECK_EQUAL(Bits_Per_Element, Bits_Per_Element1);
+      CHECK_EQUAL(Bits_Per_Element, Bits_Per_Element2);
+
+      //*******************************
+      constexpr size_t Number_Of_Elements1 = bitset_type::Number_Of_Elements;
+      constexpr size_t Number_Of_Elements2 = bitset_type::number_of_elements();
+
+      CHECK_EQUAL(Number_Of_Elements, Number_Of_Elements1);
+      CHECK_EQUAL(Number_Of_Elements, Number_Of_Elements2);
+
+      //*******************************
+      constexpr element_type All_Set_Element1 = bitset_type::All_Set_Element;
+      constexpr element_type All_Set_Element2 = bitset_type::all_set_element();
+
+      CHECK_EQUAL(All_Set_Element, All_Set_Element1);
+      CHECK_EQUAL(All_Set_Element, All_Set_Element2);
+
+      //*******************************
+      constexpr element_type All_Clear_Element1 = bitset_type::All_Clear_Element;
+      constexpr element_type All_Clear_Element2 = bitset_type::all_clear_element();
+
+      CHECK_EQUAL(All_Clear_Element, All_Clear_Element1);
+      CHECK_EQUAL(All_Clear_Element, All_Clear_Element2);
+
+      //*******************************
+      constexpr size_t Allocated_Bits = bitset_type::allocated_bits();
+
+      CHECK_EQUAL(Number_Of_Elements * Bits_Per_Element, Allocated_Bits);
+
+      //*******************************
+      constexpr char Storage_Model1 = bitset_type::Storage_Model;
+      constexpr char Storage_Model2 = bitset_type::storage_model();
+
+      CHECK_EQUAL(etl::bitset_storage_model::Single, Storage_Model1);
+      CHECK_EQUAL(etl::bitset_storage_model::Single, Storage_Model2);
+
+      etl::bitset_storage_model bsm;
+
+      bsm = etl::bitset_storage_model::Undefined;
+      CHECK_EQUAL(std::string("Undefined"), std::string(bsm.c_str()));
+
+      bsm = etl::bitset_storage_model::Single;
+      CHECK_EQUAL(std::string("Single"), std::string(bsm.c_str()));
+
+      bsm = etl::bitset_storage_model::Multi;
+      CHECK_EQUAL(std::string("Multi"), std::string(bsm.c_str()));
+    }
+
     //*************************************************************************
     TEST(test_default_constructor)
     {
@@ -390,6 +461,281 @@ namespace
       }
     }
 
+    //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_set_run_time_position_default_value_helper()
+    {
+      etl::bitset<64, uint64_t> data;
+
+      data.set(2);
+      data.set(3);
+      data.set(5);
+      data.set(7);
+      data.set(11);
+      data.set(13);
+      data.set(17);
+      data.set(19);
+      data.set(23);
+      data.set(29);
+      data.set(31);
+
+      return data;
+    }
+
+    TEST(test_set_run_time_position_default_value)
+    {
+      std::bitset<64> compare;
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(test_set_run_time_position_default_value_helper());
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      ETL_CONSTEXPR14 auto size  = data.size();
+      ETL_CONSTEXPR14 auto count = data.count();
+      ETL_CONSTEXPR14 auto none  = data.none();
+      ETL_CONSTEXPR14 auto any   = data.any();
+      ETL_CONSTEXPR14 auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_set_run_time_position_value_helper()
+    {
+      etl::bitset<64, uint64_t> data;
+
+      data.set(2, true);
+      data.set(3, true);
+      data.set(5, true);
+      data.set(7, true);
+      data.set(11, true);
+      data.set(13, true);
+      data.set(17, true);
+      data.set(19, true);
+      data.set(23, true);
+      data.set(29, true);
+      data.set(31, true);
+
+      return data;
+    }
+
+    TEST(test_set_run_time_position_value)
+    {
+      std::bitset<64> compare;
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(test_set_run_time_position_value_helper());
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      ETL_CONSTEXPR14 auto size  = data.size();
+      ETL_CONSTEXPR14 auto count = data.count();
+      ETL_CONSTEXPR14 auto none  = data.none();
+      ETL_CONSTEXPR14 auto any   = data.any();
+      ETL_CONSTEXPR14 auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_set_compile_time_position_run_time_default_value_helper()
+    {
+      etl::bitset<64, uint64_t> data;
+
+      data.set<2>();
+      data.set<3>();
+      data.set<5>();
+      data.set<7>();
+      data.set<11>();
+      data.set<13>();
+      data.set<17>();
+      data.set<19>();
+      data.set<23>();
+      data.set<29>();
+      data.set<31>();
+
+      return data;
+    }
+
+    TEST(test_set_compile_time_position_run_time_default_value)
+    {
+      std::bitset<64> compare;
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(test_set_compile_time_position_run_time_default_value_helper());
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      ETL_CONSTEXPR14 auto size  = data.size();
+      ETL_CONSTEXPR14 auto count = data.count();
+      ETL_CONSTEXPR14 auto none  = data.none();
+      ETL_CONSTEXPR14 auto any   = data.any();
+      ETL_CONSTEXPR14 auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_set_compile_time_position_run_time_value_helper()
+    {
+      etl::bitset<64, uint64_t> data;
+
+      data.set<2>(true);
+      data.set<3>(true);
+      data.set<5>(true);
+      data.set<7>(true);
+      data.set<11>(true);
+      data.set<13>(true);
+      data.set<17>(true);
+      data.set<19>(true);
+      data.set<23>(true);
+      data.set<29>(true);
+      data.set<31>(true);
+
+      return data;
+    }
+
+    TEST(test_set_compile_time_position_run_time_value)
+    {
+      std::bitset<64> compare;
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(test_set_compile_time_position_run_time_value_helper());
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      ETL_CONSTEXPR14 auto size  = data.size();
+      ETL_CONSTEXPR14 auto count = data.count();
+      ETL_CONSTEXPR14 auto none  = data.none();
+      ETL_CONSTEXPR14 auto any   = data.any();
+      ETL_CONSTEXPR14 auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    ETL_CONSTEXPR14 etl::bitset<64, uint64_t> test_set_compile_time_position_value_helper()
+    {
+      etl::bitset<64, uint64_t> data;
+
+      data.set<2, true>();
+      data.set<3, true>();
+      data.set<5, true>();
+      data.set<7, true>();
+      data.set<11, true>();
+      data.set<13, true>();
+      data.set<17, true>();
+      data.set<19, true>();
+      data.set<23, true>();
+      data.set<29, true>();
+      data.set<31, true>();
+
+      return data;
+    }
+
+    TEST(test_set_compile_time_position_value)
+    {
+      std::bitset<64> compare;
+      ETL_CONSTEXPR14 etl::bitset<64, uint64_t> data(test_set_compile_time_position_value_helper());
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      ETL_CONSTEXPR14 auto size  = data.size();
+      ETL_CONSTEXPR14 auto count = data.count();
+      ETL_CONSTEXPR14 auto none  = data.none();
+      ETL_CONSTEXPR14 auto any   = data.any();
+      ETL_CONSTEXPR14 auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
     //*************************************************************************
     TEST(test_set_with_char_string)
     {
@@ -2348,5 +2694,58 @@ namespace
       //int16_t v1 = b.extract<int16_t, 16, 17>());
       //int16_t v2 = b.extract<int16_t, 17, 16>());
     }
+
+    //*************************************************************************
+    bool test_bit(int i)
+    {
+      return (0x1234 & (1 << i)) != 0;
+    }
+
+    TEST(test_test_run_time)
+    {
+      ETL_CONSTEXPR14 etl::bitset<16, uint16_t> b(0x1234);
+
+      ETL_CONSTEXPR14 bool t0 = b.test(0);
+      ETL_CONSTEXPR14 bool t1 = b.test(1);
+      ETL_CONSTEXPR14 bool t2 = b.test(2);
+      ETL_CONSTEXPR14 bool t3 = b.test(3);
+      ETL_CONSTEXPR14 bool t4 = b.test(4);
+      ETL_CONSTEXPR14 bool t5 = b.test(5);
+      ETL_CONSTEXPR14 bool t6 = b.test(6);
+      ETL_CONSTEXPR14 bool t7 = b.test(7);
+
+      CHECK_EQUAL(test_bit(0), t0);
+      CHECK_EQUAL(test_bit(1), t1);
+      CHECK_EQUAL(test_bit(2), t2);
+      CHECK_EQUAL(test_bit(3), t3);
+      CHECK_EQUAL(test_bit(4), t4);
+      CHECK_EQUAL(test_bit(5), t5);
+      CHECK_EQUAL(test_bit(6), t6);
+      CHECK_EQUAL(test_bit(7), t7);
+    }
+
+    //*************************************************************************
+    TEST(test_test_compile_time)
+    {
+      ETL_CONSTEXPR14 etl::bitset<16, uint16_t> b(0x1234);
+
+      ETL_CONSTEXPR14 bool t0 = b.test<0>();
+      ETL_CONSTEXPR14 bool t1 = b.test<1>();
+      ETL_CONSTEXPR14 bool t2 = b.test<2>();
+      ETL_CONSTEXPR14 bool t3 = b.test<3>();
+      ETL_CONSTEXPR14 bool t4 = b.test<4>();
+      ETL_CONSTEXPR14 bool t5 = b.test<5>();
+      ETL_CONSTEXPR14 bool t6 = b.test<6>();
+      ETL_CONSTEXPR14 bool t7 = b.test<7>();
+
+      CHECK_EQUAL(test_bit(0), t0);
+      CHECK_EQUAL(test_bit(1), t1);
+      CHECK_EQUAL(test_bit(2), t2);
+      CHECK_EQUAL(test_bit(3), t3);
+      CHECK_EQUAL(test_bit(4), t4);
+      CHECK_EQUAL(test_bit(5), t5);
+      CHECK_EQUAL(test_bit(6), t6);
+      CHECK_EQUAL(test_bit(7), t7);
+    }
   };
 }
diff --git a/test/test_bitset_new_ext_default_element_type.cpp b/test/test_bitset_new_ext_default_element_type.cpp
index d62d5c42..6945376d 100644
--- a/test/test_bitset_new_ext_default_element_type.cpp
+++ b/test/test_bitset_new_ext_default_element_type.cpp
@@ -45,6 +45,77 @@ namespace
 
   SUITE(test_bitset_new_ext_default_element_type)
   {
+    //*************************************************************************
+    TEST(test_constants)
+    {
+      using bitset_type  = etl::bitset_ext<60>;
+      using element_type = bitset_type::element_type;
+
+      constexpr size_t       Size               = 60;
+      constexpr size_t       Bits_Per_Element   = etl::integral_limits<element_type>::bits;
+      constexpr size_t       Number_Of_Elements = (Size % Bits_Per_Element == 0) ? Size / Bits_Per_Element : Size / Bits_Per_Element + 1;
+      constexpr element_type All_Set_Element    = etl::integral_limits<element_type>::max;
+      constexpr element_type All_Clear_Element  = etl::integral_limits<element_type>::min;
+
+      //*******************************
+      constexpr size_t Size1 = bitset_type::Size;
+      constexpr size_t Size2 = bitset_type::size();
+
+      CHECK_EQUAL(Size, Size1);
+      CHECK_EQUAL(Size, Size2);
+
+      //*******************************
+      constexpr size_t Bits_Per_Element1 = bitset_type::Bits_Per_Element;
+      constexpr size_t Bits_Per_Element2 = bitset_type::bits_per_element();
+
+      CHECK_EQUAL(Bits_Per_Element, Bits_Per_Element1);
+      CHECK_EQUAL(Bits_Per_Element, Bits_Per_Element2);
+
+      //*******************************
+      constexpr size_t Number_Of_Elements1 = bitset_type::Number_Of_Elements;
+      constexpr size_t Number_Of_Elements2 = bitset_type::number_of_elements();
+
+      CHECK_EQUAL(Number_Of_Elements, Number_Of_Elements1);
+      CHECK_EQUAL(Number_Of_Elements, Number_Of_Elements2);
+
+      //*******************************
+      constexpr element_type All_Set_Element1 = bitset_type::All_Set_Element;
+      constexpr element_type All_Set_Element2 = bitset_type::all_set_element();
+
+      CHECK_EQUAL(All_Set_Element, All_Set_Element1);
+      CHECK_EQUAL(All_Set_Element, All_Set_Element2);
+
+      //*******************************
+      constexpr element_type All_Clear_Element1 = bitset_type::All_Clear_Element;
+      constexpr element_type All_Clear_Element2 = bitset_type::all_clear_element();
+
+      CHECK_EQUAL(All_Clear_Element, All_Clear_Element1);
+      CHECK_EQUAL(All_Clear_Element, All_Clear_Element2);
+
+      //*******************************
+      constexpr size_t Allocated_Bits = bitset_type::allocated_bits();
+
+      CHECK_EQUAL(Number_Of_Elements * Bits_Per_Element, Allocated_Bits);
+
+      //*******************************
+      constexpr char Storage_Model1 = bitset_type::Storage_Model;
+      constexpr char Storage_Model2 = bitset_type::storage_model();
+
+      CHECK_EQUAL(etl::bitset_storage_model::Multi, Storage_Model1);
+      CHECK_EQUAL(etl::bitset_storage_model::Multi, Storage_Model2);
+
+      etl::bitset_storage_model bsm;
+
+      bsm = etl::bitset_storage_model::Undefined;
+      CHECK_EQUAL(std::string("Undefined"), std::string(bsm.c_str()));
+
+      bsm = etl::bitset_storage_model::Single;
+      CHECK_EQUAL(std::string("Single"), std::string(bsm.c_str()));
+
+      bsm = etl::bitset_storage_model::Multi;
+      CHECK_EQUAL(std::string("Multi"), std::string(bsm.c_str()));
+    }
+
     //*************************************************************************
     TEST(test_construct_from_nullptr_buffer)
     {
@@ -334,6 +405,251 @@ namespace
       }
     }
 
+    //*************************************************************************
+    TEST(test_set_run_time_position_default_value)
+    {
+      std::bitset<64> compare;
+      etl::bitset_ext<64>::buffer_type buffer;
+      etl::bitset_ext<64> data(buffer);
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      data.set(2);
+      data.set(3);
+      data.set(5);
+      data.set(7);
+      data.set(11);
+      data.set(13);
+      data.set(17);
+      data.set(19);
+      data.set(23);
+      data.set(29);
+      data.set(31);
+
+      auto size  = data.size();
+      auto count = data.count();
+      auto none  = data.none();
+      auto any   = data.any();
+      auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    TEST(test_set_run_time_position_value)
+    {
+      std::bitset<64> compare;
+      etl::bitset_ext<64>::buffer_type buffer;
+      etl::bitset_ext<64> data(buffer);
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      data.set(2, true);
+      data.set(3, true);
+      data.set(5, true);
+      data.set(7, true);
+      data.set(11, true);
+      data.set(13, true);
+      data.set(17, true);
+      data.set(19, true);
+      data.set(23, true);
+      data.set(29, true);
+      data.set(31, true);
+
+      auto size  = data.size();
+      auto count = data.count();
+      auto none  = data.none();
+      auto any   = data.any();
+      auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    TEST(test_set_compile_time_position_run_time_default_value)
+    {
+      std::bitset<64> compare;
+      etl::bitset_ext<64>::buffer_type buffer;
+      etl::bitset_ext<64> data(buffer);
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      data.set<2>();
+      data.set<3>();
+      data.set<5>();
+      data.set<7>();
+      data.set<11>();
+      data.set<13>();
+      data.set<17>();
+      data.set<19>();
+      data.set<23>();
+      data.set<29>();
+      data.set<31>();
+
+      auto size  = data.size();
+      auto count = data.count();
+      auto none  = data.none();
+      auto any   = data.any();
+      auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    TEST(test_set_compile_time_position_run_time_value)
+    {
+      std::bitset<64> compare;
+      etl::bitset_ext<64>::buffer_type buffer;
+      etl::bitset_ext<64> data(buffer);
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      data.set<2>(true);
+      data.set<3>(true);
+      data.set<5>(true);
+      data.set<7>(true);
+      data.set<11>(true);
+      data.set<13>(true);
+      data.set<17>(true);
+      data.set<19>(true);
+      data.set<23>(true);
+      data.set<29>(true);
+      data.set<31>(true);
+
+      auto size  = data.size();
+      auto count = data.count();
+      auto none  = data.none();
+      auto any   = data.any();
+      auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    TEST(test_set_compile_time_position_value)
+    {
+      std::bitset<64> compare;
+      etl::bitset_ext<64>::buffer_type buffer;
+      etl::bitset_ext<64> data(buffer);
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      data.set<2, true>();
+      data.set<3, true>();
+      data.set<5, true>();
+      data.set<7, true>();
+      data.set<11, true>();
+      data.set<13, true>();
+      data.set<17, true>();
+      data.set<19, true>();
+      data.set<23, true>();
+      data.set<29, true>();
+      data.set<31, true>();
+
+      auto size  = data.size();
+      auto count = data.count();
+      auto none  = data.none();
+      auto any   = data.any();
+      auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
     //*************************************************************************
     TEST(test_set_with_char_string)
     {
@@ -2020,5 +2336,62 @@ namespace
       //uint16_t v1 = b.extract<uint16_t, 16, 17>());
       //uint16_t v2 = b.extract<uint16_t, 17, 16>());
     }
+
+    //*************************************************************************
+    bool test_bit(int i)
+    {
+      return (0x1234 & (1 << i)) != 0;
+    }
+
+    TEST(test_test_run_time)
+    {
+      etl::bitset_ext<16>::buffer_type buffer;
+
+      etl::bitset_ext<16> b(0x1234, buffer);
+
+      bool t0 = b.test(0);
+      bool t1 = b.test(1);
+      bool t2 = b.test(2);
+      bool t3 = b.test(3);
+      bool t4 = b.test(4);
+      bool t5 = b.test(5);
+      bool t6 = b.test(6);
+      bool t7 = b.test(7);
+
+      CHECK_EQUAL(test_bit(0), t0);
+      CHECK_EQUAL(test_bit(1), t1);
+      CHECK_EQUAL(test_bit(2), t2);
+      CHECK_EQUAL(test_bit(3), t3);
+      CHECK_EQUAL(test_bit(4), t4);
+      CHECK_EQUAL(test_bit(5), t5);
+      CHECK_EQUAL(test_bit(6), t6);
+      CHECK_EQUAL(test_bit(7), t7);
+    }
+
+    //*************************************************************************
+    TEST(test_test_compile_time)
+    {
+      etl::bitset_ext<16>::buffer_type buffer;
+
+      etl::bitset_ext<16> b(0x1234, buffer);
+
+      bool t0 = b.test<0>();
+      bool t1 = b.test<1>();
+      bool t2 = b.test<2>();
+      bool t3 = b.test<3>();
+      bool t4 = b.test<4>();
+      bool t5 = b.test<5>();
+      bool t6 = b.test<6>();
+      bool t7 = b.test<7>();
+
+      CHECK_EQUAL(test_bit(0), t0);
+      CHECK_EQUAL(test_bit(1), t1);
+      CHECK_EQUAL(test_bit(2), t2);
+      CHECK_EQUAL(test_bit(3), t3);
+      CHECK_EQUAL(test_bit(4), t4);
+      CHECK_EQUAL(test_bit(5), t5);
+      CHECK_EQUAL(test_bit(6), t6);
+      CHECK_EQUAL(test_bit(7), t7);
+    }
   };
 }
diff --git a/test/test_bitset_new_ext_explicit_single_element_type.cpp b/test/test_bitset_new_ext_explicit_single_element_type.cpp
index a26fa6a9..d98c779d 100644
--- a/test/test_bitset_new_ext_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_ext_explicit_single_element_type.cpp
@@ -44,6 +44,77 @@ namespace
 
   SUITE(test_bitset_new_ext_explicit_element_type)
   {
+    //*************************************************************************
+    TEST(test_constants)
+    {
+      using bitset_type  = etl::bitset_ext<60, uint64_t>;
+      using element_type = bitset_type::element_type;
+
+      constexpr size_t       Size               = 60;
+      constexpr size_t       Bits_Per_Element   = etl::integral_limits<element_type>::bits;
+      constexpr size_t       Number_Of_Elements = (Size % Bits_Per_Element == 0) ? Size / Bits_Per_Element : Size / Bits_Per_Element + 1;
+      constexpr element_type All_Set_Element    = etl::integral_limits<element_type>::max;
+      constexpr element_type All_Clear_Element  = etl::integral_limits<element_type>::min;
+
+      //*******************************
+      constexpr size_t Size1 = bitset_type::Size;
+      constexpr size_t Size2 = bitset_type::size();
+
+      CHECK_EQUAL(Size, Size1);
+      CHECK_EQUAL(Size, Size2);
+
+      //*******************************
+      constexpr size_t Bits_Per_Element1 = bitset_type::Bits_Per_Element;
+      constexpr size_t Bits_Per_Element2 = bitset_type::bits_per_element();
+
+      CHECK_EQUAL(Bits_Per_Element, Bits_Per_Element1);
+      CHECK_EQUAL(Bits_Per_Element, Bits_Per_Element2);
+
+      //*******************************
+      constexpr size_t Number_Of_Elements1 = bitset_type::Number_Of_Elements;
+      constexpr size_t Number_Of_Elements2 = bitset_type::number_of_elements();
+
+      CHECK_EQUAL(Number_Of_Elements, Number_Of_Elements1);
+      CHECK_EQUAL(Number_Of_Elements, Number_Of_Elements2);
+
+      //*******************************
+      constexpr element_type All_Set_Element1 = bitset_type::All_Set_Element;
+      constexpr element_type All_Set_Element2 = bitset_type::all_set_element();
+
+      CHECK_EQUAL(All_Set_Element, All_Set_Element1);
+      CHECK_EQUAL(All_Set_Element, All_Set_Element2);
+
+      //*******************************
+      constexpr size_t All_Clear_Element1 = bitset_type::All_Clear_Element;
+      constexpr size_t All_Clear_Element2 = bitset_type::all_clear_element();
+
+      CHECK_EQUAL(All_Clear_Element, All_Clear_Element1);
+      CHECK_EQUAL(All_Clear_Element, All_Clear_Element2);
+
+      //*******************************
+      constexpr size_t Allocated_Bits = bitset_type::allocated_bits();
+
+      CHECK_EQUAL(Number_Of_Elements * Bits_Per_Element, Allocated_Bits);
+
+      //*******************************
+      constexpr char Storage_Model1 = bitset_type::Storage_Model;
+      constexpr char Storage_Model2 = bitset_type::storage_model();
+
+      CHECK_EQUAL(etl::bitset_storage_model::Single, Storage_Model1);
+      CHECK_EQUAL(etl::bitset_storage_model::Single, Storage_Model2);
+
+      etl::bitset_storage_model bsm;
+
+      bsm = etl::bitset_storage_model::Undefined;
+      CHECK_EQUAL(std::string("Undefined"), std::string(bsm.c_str()));
+
+      bsm = etl::bitset_storage_model::Single;
+      CHECK_EQUAL(std::string("Single"), std::string(bsm.c_str()));
+
+      bsm = etl::bitset_storage_model::Multi;
+      CHECK_EQUAL(std::string("Multi"), std::string(bsm.c_str()));
+    }
+
     //*************************************************************************
     TEST(test_construct_from_nullptr_buffer)
     {
@@ -362,6 +433,251 @@ namespace
       }
     }
 
+    //*************************************************************************
+    TEST(test_set_run_time_position_default_value)
+    {
+      std::bitset<64> compare;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t> data(buffer);
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      data.set(2);
+      data.set(3);
+      data.set(5);
+      data.set(7);
+      data.set(11);
+      data.set(13);
+      data.set(17);
+      data.set(19);
+      data.set(23);
+      data.set(29);
+      data.set(31);
+
+      auto size  = data.size();
+      auto count = data.count();
+      auto none  = data.none();
+      auto any   = data.any();
+      auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    TEST(test_set_run_time_position_value)
+    {
+      std::bitset<64> compare;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t> data(buffer);
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      data.set(2, true);
+      data.set(3, true);
+      data.set(5, true);
+      data.set(7, true);
+      data.set(11, true);
+      data.set(13, true);
+      data.set(17, true);
+      data.set(19, true);
+      data.set(23, true);
+      data.set(29, true);
+      data.set(31, true);
+
+      auto size  = data.size();
+      auto count = data.count();
+      auto none  = data.none();
+      auto any   = data.any();
+      auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    TEST(test_set_compile_time_position_run_time_default_value)
+    {
+      std::bitset<64> compare;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t> data(buffer);
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      data.set<2>();
+      data.set<3>();
+      data.set<5>();
+      data.set<7>();
+      data.set<11>();
+      data.set<13>();
+      data.set<17>();
+      data.set<19>();
+      data.set<23>();
+      data.set<29>();
+      data.set<31>();
+
+      auto size  = data.size();
+      auto count = data.count();
+      auto none  = data.none();
+      auto any   = data.any();
+      auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    TEST(test_set_compile_time_position_run_time_value)
+    {
+      std::bitset<64> compare;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t> data(buffer);
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      data.set<2>(true);
+      data.set<3>(true);
+      data.set<5>(true);
+      data.set<7>(true);
+      data.set<11>(true);
+      data.set<13>(true);
+      data.set<17>(true);
+      data.set<19>(true);
+      data.set<23>(true);
+      data.set<29>(true);
+      data.set<31>(true);
+
+      auto size  = data.size();
+      auto count = data.count();
+      auto none  = data.none();
+      auto any   = data.any();
+      auto all = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
+    //*************************************************************************
+    TEST(test_set_compile_time_position_value)
+    {
+      std::bitset<64> compare;
+      etl::bitset_ext<64, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<64, uint64_t> data(buffer);
+
+      compare.set(2);
+      compare.set(3);
+      compare.set(5);
+      compare.set(7);
+      compare.set(11);
+      compare.set(13);
+      compare.set(17);
+      compare.set(19);
+      compare.set(23);
+      compare.set(29);
+      compare.set(31);
+
+      data.set<2, true>();
+      data.set<3, true>();
+      data.set<5, true>();
+      data.set<7, true>();
+      data.set<11, true>();
+      data.set<13, true>();
+      data.set<17, true>();
+      data.set<19, true>();
+      data.set<23, true>();
+      data.set<29, true>();
+      data.set<31, true>();
+
+      auto size  = data.size();
+      auto count = data.count();
+      auto none  = data.none();
+      auto any   = data.any();
+      auto all   = data.all();
+
+      CHECK_EQUAL(compare.size(),  size);
+      CHECK_EQUAL(compare.count(), count);
+      CHECK_EQUAL(compare.none(),  none);
+      CHECK_EQUAL(compare.any(),   any);
+      CHECK_EQUAL(compare.all(),   all);
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        CHECK_EQUAL(compare.test(i), data.test(i));
+      }
+    }
+
     //*************************************************************************
     TEST(test_set_with_char_string)
     {
@@ -2168,5 +2484,62 @@ namespace
       //uint16_t v1 = b.extract<uint16_t, 16, 17>());
       //uint16_t v2 = b.extract<uint16_t, 17, 16>());
     }
+
+    //*************************************************************************
+    bool test_bit(int i)
+    {
+      return (0x1234 & (1 << i)) != 0;
+    }
+
+    TEST(test_test_run_time)
+    {
+      etl::bitset_ext<16, uint16_t>::buffer_type buffer;
+
+      etl::bitset_ext<16, uint16_t> b(0x1234, buffer);
+
+      bool t0 = b.test(0);
+      bool t1 = b.test(1);
+      bool t2 = b.test(2);
+      bool t3 = b.test(3);
+      bool t4 = b.test(4);
+      bool t5 = b.test(5);
+      bool t6 = b.test(6);
+      bool t7 = b.test(7);
+
+      CHECK_EQUAL(test_bit(0), t0);
+      CHECK_EQUAL(test_bit(1), t1);
+      CHECK_EQUAL(test_bit(2), t2);
+      CHECK_EQUAL(test_bit(3), t3);
+      CHECK_EQUAL(test_bit(4), t4);
+      CHECK_EQUAL(test_bit(5), t5);
+      CHECK_EQUAL(test_bit(6), t6);
+      CHECK_EQUAL(test_bit(7), t7);
+    }
+
+    //*************************************************************************
+    TEST(test_test_compile_time)
+    {
+      etl::bitset_ext<16, uint16_t>::buffer_type buffer;
+
+      etl::bitset_ext<16, uint16_t> b(0x1234, buffer);
+
+      bool t0 = b.test<0>();
+      bool t1 = b.test<1>();
+      bool t2 = b.test<2>();
+      bool t3 = b.test<3>();
+      bool t4 = b.test<4>();
+      bool t5 = b.test<5>();
+      bool t6 = b.test<6>();
+      bool t7 = b.test<7>();
+
+      CHECK_EQUAL(test_bit(0), t0);
+      CHECK_EQUAL(test_bit(1), t1);
+      CHECK_EQUAL(test_bit(2), t2);
+      CHECK_EQUAL(test_bit(3), t3);
+      CHECK_EQUAL(test_bit(4), t4);
+      CHECK_EQUAL(test_bit(5), t5);
+      CHECK_EQUAL(test_bit(6), t6);
+      CHECK_EQUAL(test_bit(7), t7);
+    }
   };
 }

From ac4c3e67e6e98cd0cf499525bd693bbba18e1009 Mon Sep 17 00:00:00 2001
From: Drew Rife <drew.rife95@gmail.com>
Date: Sat, 13 Jan 2024 06:48:55 -0500
Subject: [PATCH 031/131] Implement SAE J1850 CRC8 and "Zero" version (#812)

* feat: added 8bit j1850 crc parameters

* feat: add crc8 j1850 header

* feat: add crc j1850 zero header

* feat: add the crc j1850 headers to crc.h

* test: j1850 4 constructor

* build: crc8 j1850 tests

* test: crc8 j1850 4 add values

* test: crc8 j1850 4 add range

* test: crc8 j1850 4 add range via iterator

* test: crc8 j1850 4 add range endian

* test: crc8 j1850 16 constructor

* test: crc8 j1850 16 add values

* test: crc8 j1850 16 add range

* test: crc8 j1850 16 add range via iterator

* test: crc8 j1850 16 add range endian

* test: crc8 j1850 156 constructor

* test: crc8 j1850 256 add values

* test: crc8 j1850 256 add range

* test: crc8 j1850 add range via iterator

* test: crc8 j1850 256 add range endian

* test: initial commit of crc j1850 zero tests

* build: crc8 j1850 zero tests

* test: crc8 j1850 zero 4 add values

* test: crc8 j1850 zero 4 add range

* test: crc8 j1850 zero 4 add range via iterator

* test: crc8 j1850 zero 4 add range endian

* test: crc8 j1850 zero 16 constructor

* test: crc8 j1850 zero 16 add values

* test: crc8 j1850 zero 16 add range

* test: crc8 j1850 zero 16 add range via iterator

* test: crc8 j1850 zero 16 add range endian

* test: crc8 j1850 zero 256 constructor

* test: crc8 j1850 zero 256 add values

* test: crc8 j1850 zero 256 add range

* test: crc8 j1850 zero 256 add range via iterator

* test: crc8 j1850 zero 256 add range endian

* fix: header include guards
---
 include/etl/crc.h                    |   2 +
 include/etl/crc8_j1850.h             |  79 ++++++++
 include/etl/crc8_j1850_zero.h        |  79 ++++++++
 include/etl/private/crc_parameters.h |   2 +
 test/CMakeLists.txt                  |   2 +
 test/test_crc8_j1850.cpp             | 263 +++++++++++++++++++++++++++
 test/test_crc8_j1850_zero.cpp        | 263 +++++++++++++++++++++++++++
 7 files changed, 690 insertions(+)
 create mode 100644 include/etl/crc8_j1850.h
 create mode 100644 include/etl/crc8_j1850_zero.h
 create mode 100644 test/test_crc8_j1850.cpp
 create mode 100644 test/test_crc8_j1850_zero.cpp

diff --git a/include/etl/crc.h b/include/etl/crc.h
index eab6d7bc..78ceb552 100644
--- a/include/etl/crc.h
+++ b/include/etl/crc.h
@@ -40,6 +40,8 @@ SOFTWARE.
 #include "crc8_ebu.h"
 #include "crc8_icode.h"
 #include "crc8_itu.h"
+#include "crc8_j1850_zero.h"
+#include "crc8_j1850.h"
 #include "crc8_maxim.h"
 #include "crc8_rohc.h"
 #include "crc8_wcdma.h"
diff --git a/include/etl/crc8_j1850.h b/include/etl/crc8_j1850.h
new file mode 100644
index 00000000..723a2952
--- /dev/null
+++ b/include/etl/crc8_j1850.h
@@ -0,0 +1,79 @@
+///\file
+
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+https://github.com/ETLCPP/etl
+https://www.etlcpp.com
+
+Copyright(c) 2021 John Wellbelove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+******************************************************************************/
+
+#ifndef ETL_CRC8_J1850_INCLUDED
+#define ETL_CRC8_J1850_INCLUDED
+
+#include "platform.h"
+#include "private/crc_implementation.h"
+
+///\defgroup SAE J1850 8 bit CRC calculation
+///\ingroup crc
+
+namespace etl
+{
+#if ETL_USING_CPP11 && !defined(ETL_CRC_FORCE_CPP03_IMPLEMENTATION)
+  template <size_t Table_Size>
+  using crc8_j1850_t = etl::crc_type<etl::private_crc::crc8_j1850_parameters, Table_Size>;
+#else
+  template <size_t Table_Size>
+  class crc8_j1850_t : public etl::crc_type<etl::private_crc::crc8_j1850_parameters, Table_Size>
+  {
+  public:
+
+    //*************************************************************************
+    /// Default constructor.
+    //*************************************************************************
+    crc8_j1850_t()
+    {
+      this->reset();
+    }
+
+    //*************************************************************************
+    /// Constructor from range.
+    /// \param begin Start of the range.
+    /// \param end   End of the range.
+    //*************************************************************************
+    template<typename TIterator>
+    crc8_j1850_t(TIterator begin, const TIterator end)
+    {
+      this->reset();
+      this->add(begin, end);
+    }
+  };
+#endif
+    
+  typedef etl::crc8_j1850_t<256U> crc8_j1850_t256;
+  typedef etl::crc8_j1850_t<16U>  crc8_j1850_t16;
+  typedef etl::crc8_j1850_t<4U>   crc8_j1850_t4;
+  typedef crc8_j1850_t256         crc8_j1850;
+}
+
+#endif
diff --git a/include/etl/crc8_j1850_zero.h b/include/etl/crc8_j1850_zero.h
new file mode 100644
index 00000000..04bd7b55
--- /dev/null
+++ b/include/etl/crc8_j1850_zero.h
@@ -0,0 +1,79 @@
+///\file
+
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+https://github.com/ETLCPP/etl
+https://www.etlcpp.com
+
+Copyright(c) 2021 John Wellbelove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+******************************************************************************/
+
+#ifndef ETL_CRC8_J1850_ZERO_INCLUDED
+#define ETL_CRC8_J1850_ZERO_INCLUDED
+
+#include "platform.h"
+#include "private/crc_implementation.h"
+
+///\defgroup SAE J1850 Zero 8 bit CRC calculation
+///\ingroup crc
+
+namespace etl
+{
+#if ETL_USING_CPP11 && !defined(ETL_CRC_FORCE_CPP03_IMPLEMENTATION)
+  template <size_t Table_Size>
+  using crc8_j1850_zero_t = etl::crc_type<etl::private_crc::crc8_j1850_zero_parameters, Table_Size>;
+#else
+  template <size_t Table_Size>
+  class crc8_j1850_zero_t : public etl::crc_type<etl::private_crc::crc8_j1850_zero_parameters, Table_Size>
+  {
+  public:
+
+    //*************************************************************************
+    /// Default constructor.
+    //*************************************************************************
+    crc8_j1850_zero_t()
+    {
+      this->reset();
+    }
+
+    //*************************************************************************
+    /// Constructor from range.
+    /// \param begin Start of the range.
+    /// \param end   End of the range.
+    //*************************************************************************
+    template<typename TIterator>
+    crc8_j1850_zero_t(TIterator begin, const TIterator end)
+    {
+      this->reset();
+      this->add(begin, end);
+    }
+  };
+#endif
+    
+  typedef etl::crc8_j1850_zero_t<256U> crc8_j1850_zero_t256;
+  typedef etl::crc8_j1850_zero_t<16U>  crc8_j1850_zero_t16;
+  typedef etl::crc8_j1850_zero_t<4U>   crc8_j1850_zero_t4;
+  typedef crc8_j1850_zero_t256         crc8_j1850_zero;
+}
+
+#endif
diff --git a/include/etl/private/crc_parameters.h b/include/etl/private/crc_parameters.h
index 72cd1ef5..705684c0 100644
--- a/include/etl/private/crc_parameters.h
+++ b/include/etl/private/crc_parameters.h
@@ -79,6 +79,8 @@ namespace etl
     typedef crc_parameters<uint8_t, 0x07U, 0x00U, 0x55U, false> crc8_itu_parameters;
     typedef crc_parameters<uint8_t, 0x31U, 0x00U, 0x00U, true>  crc8_maxim_parameters;
     typedef crc_parameters<uint8_t, 0x9BU, 0x00U, 0x00U, true>  crc8_wcdma_parameters;
+    typedef crc_parameters<uint8_t, 0x1DU, 0xFFU, 0xFFU, false> crc8_j1850_parameters;
+    typedef crc_parameters<uint8_t, 0x1DU, 0x00U, 0x00U, false> crc8_j1850_zero_parameters;
 
     // 16 bit.
     typedef crc_parameters<uint16_t, 0x8005U, 0x0000U, 0x0000U, true>  crc16_parameters;
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4869a7c8..e8afb269 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -98,6 +98,8 @@ add_executable(etl_tests
 	test_crc8_ebu.cpp
 	test_crc8_icode.cpp
 	test_crc8_itu.cpp
+	test_crc8_j1850_zero.cpp
+	test_crc8_j1850.cpp
 	test_crc8_maxim.cpp
 	test_crc8_rohc.cpp
 	test_crc8_wcdma.cpp
diff --git a/test/test_crc8_j1850.cpp b/test/test_crc8_j1850.cpp
new file mode 100644
index 00000000..1b50b14a
--- /dev/null
+++ b/test/test_crc8_j1850.cpp
@@ -0,0 +1,263 @@
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+https://github.com/ETLCPP/etl
+https://www.etlcpp.com
+
+Copyright(c) 2021 John Wellbelove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+******************************************************************************/
+
+#include "unit_test_framework.h"
+
+#include <iterator>
+#include <string>
+#include <vector>
+#include <stdint.h>
+
+#include "etl/crc8_j1850.h"
+
+//*****************************************************************************
+// The results for these tests were created from http://www.sunshine2k.de/coding/javascript/crc/crc_js.html
+//*****************************************************************************
+
+namespace
+{
+  SUITE(test_crc_crc8_j1850)
+  {
+    //*************************************************************************
+    // Table size 4
+    //*************************************************************************
+    TEST(test_crc8_j1850_4_constructor)
+    {
+      std::string data("123456789");
+
+      uint8_t crc = etl::crc8_j1850_t4(data.begin(), data.end());
+
+      CHECK_EQUAL(0x4BU, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_4_add_values)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850_t4 crc_calculator;
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        crc_calculator.add(data[i]);
+      }
+
+      uint8_t crc = crc_calculator;
+
+      CHECK_EQUAL(0x4BU, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_4_add_range)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850_t4 crc_calculator;
+
+      crc_calculator.add(data.begin(), data.end());
+
+      uint8_t crc = crc_calculator.value();
+
+      CHECK_EQUAL(0x4BU, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j18_50_4_add_range_via_iterator)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850_t4 crc_calculator;
+
+      std::copy(data.begin(), data.end(), crc_calculator.input());
+
+      uint8_t crc = crc_calculator.value();
+
+      CHECK_EQUAL(0x4BU, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_4_add_range_endian)
+    {
+      std::vector<uint8_t>  data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U };
+      std::vector<uint32_t> data2 = { 0x04030201UL, 0x08070605UL };
+      std::vector<uint8_t>  data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U };
+
+      uint8_t crc1 = etl::crc8_j1850_t4(data1.begin(), data1.end());
+      uint8_t crc2 = etl::crc8_j1850_t4((uint8_t*)&data2[0], (uint8_t*)(&data2[0] + data2.size()));
+      CHECK_EQUAL(int(crc1), int(crc2));
+
+      uint8_t crc3 = etl::crc8_j1850_t4(data3.rbegin(), data3.rend());
+      CHECK_EQUAL(int(crc1), int(crc3));
+    }
+
+    //*************************************************************************
+    // Table size 16
+    //*************************************************************************
+    TEST(test_crc8_j1850_16_constructor)
+    {
+      std::string data("123456789");
+
+      uint8_t crc = etl::crc8_j1850_t16(data.begin(), data.end());
+
+      CHECK_EQUAL(0x4BU, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_16_add_values)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850_t16 crc_calculator;
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        crc_calculator.add(data[i]);
+      }
+
+      uint8_t crc = crc_calculator;
+
+      CHECK_EQUAL(0x4BU, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_16_add_range)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850_t16 crc_calculator;
+
+      crc_calculator.add(data.begin(), data.end());
+
+      uint8_t crc = crc_calculator.value();
+
+      CHECK_EQUAL(0x4BU, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_16_add_range_via_iterator)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850_t16 crc_calculator;
+
+      std::copy(data.begin(), data.end(), crc_calculator.input());
+
+      uint8_t crc = crc_calculator.value();
+
+      CHECK_EQUAL(0x4BU, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_16_add_range_endian)
+    {
+      std::vector<uint8_t>  data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U };
+      std::vector<uint32_t> data2 = { 0x04030201UL, 0x08070605UL };
+      std::vector<uint8_t>  data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U };
+
+      uint8_t crc1 = etl::crc8_j1850_t16(data1.begin(), data1.end());
+      uint8_t crc2 = etl::crc8_j1850_t16((uint8_t*)&data2[0], (uint8_t*)(&data2[0] + data2.size()));
+      CHECK_EQUAL(int(crc1), int(crc2));
+
+      uint8_t crc3 = etl::crc8_j1850_t16(data3.rbegin(), data3.rend());
+      CHECK_EQUAL(int(crc1), int(crc3));
+    }
+
+    //*************************************************************************
+    // Table size 256
+    //*************************************************************************
+    TEST(test_crc8_j1850_256_constructor)
+    {
+      std::string data("123456789");
+
+      uint8_t crc = etl::crc8_j1850(data.begin(), data.end());
+
+      CHECK_EQUAL(0x4BU, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_256_add_values)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850 crc_calculator;
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        crc_calculator.add(data[i]);
+      }
+
+      uint8_t crc = crc_calculator;
+
+      CHECK_EQUAL(0x4BU, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_256_add_range)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850 crc_calculator;
+
+      crc_calculator.add(data.begin(), data.end());
+
+      uint8_t crc = crc_calculator.value();
+
+      CHECK_EQUAL(0x4BU, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_256_add_range_via_iterator)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850 crc_calculator;
+
+      std::copy(data.begin(), data.end(), crc_calculator.input());
+
+      uint8_t crc = crc_calculator.value();
+
+      CHECK_EQUAL(0x4BU, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_256_add_range_endian)
+    {
+      std::vector<uint8_t>  data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U };
+      std::vector<uint32_t> data2 = { 0x04030201UL, 0x08070605UL };
+      std::vector<uint8_t>  data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U };
+
+      uint8_t crc1 = etl::crc8_j1850(data1.begin(), data1.end());
+      uint8_t crc2 = etl::crc8_j1850((uint8_t*)&data2[0], (uint8_t*)(&data2[0] + data2.size()));
+      CHECK_EQUAL(int(crc1), int(crc2));
+
+      uint8_t crc3 = etl::crc8_j1850(data3.rbegin(), data3.rend());
+      CHECK_EQUAL(int(crc1), int(crc3));
+    }
+  };
+}
+
diff --git a/test/test_crc8_j1850_zero.cpp b/test/test_crc8_j1850_zero.cpp
new file mode 100644
index 00000000..3ab0bae3
--- /dev/null
+++ b/test/test_crc8_j1850_zero.cpp
@@ -0,0 +1,263 @@
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+https://github.com/ETLCPP/etl
+https://www.etlcpp.com
+
+Copyright(c) 2021 John Wellbelove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+******************************************************************************/
+
+#include "unit_test_framework.h"
+
+#include <iterator>
+#include <string>
+#include <vector>
+#include <stdint.h>
+
+#include "etl/crc8_j1850_zero.h"
+
+//*****************************************************************************
+// The results for these tests were created from http://www.sunshine2k.de/coding/javascript/crc/crc_js.html
+//*****************************************************************************
+
+namespace
+{
+  SUITE(test_crc_crc8_j1850_zero)
+  {
+    //*************************************************************************
+    // Table size 4
+    //*************************************************************************
+    TEST(test_crc8_j1850_zero_4_constructor)
+    {
+      std::string data("123456789");
+
+      uint8_t crc = etl::crc8_j1850_zero_t4(data.begin(), data.end());
+
+      CHECK_EQUAL(0x37U, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_zero_4_add_values)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850_zero_t4 crc_calculator;
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        crc_calculator.add(data[i]);
+      }
+
+      uint8_t crc = crc_calculator;
+
+      CHECK_EQUAL(0x37U, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_zero_4_add_range)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850_zero_t4 crc_calculator;
+
+      crc_calculator.add(data.begin(), data.end());
+
+      uint8_t crc = crc_calculator.value();
+
+      CHECK_EQUAL(0x37U, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_zero_4_add_range_via_iterator)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850_zero_t4 crc_calculator;
+
+      std::copy(data.begin(), data.end(), crc_calculator.input());
+
+      uint8_t crc = crc_calculator.value();
+
+      CHECK_EQUAL(0x37U, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_zero_4_add_range_endian)
+    {
+      std::vector<uint8_t>  data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U };
+      std::vector<uint32_t> data2 = { 0x04030201UL, 0x08070605UL };
+      std::vector<uint8_t>  data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U };
+
+      uint8_t crc1 = etl::crc8_j1850_zero_t4(data1.begin(), data1.end());
+      uint8_t crc2 = etl::crc8_j1850_zero_t4((uint8_t*)&data2[0], (uint8_t*)(&data2[0] + data2.size()));
+      CHECK_EQUAL(int(crc1), int(crc2));
+
+      uint8_t crc3 = etl::crc8_j1850_zero_t4(data3.rbegin(), data3.rend());
+      CHECK_EQUAL(int(crc1), int(crc3));
+    }
+
+    //*************************************************************************
+    // Table size 16
+    //*************************************************************************
+    TEST(test_crc8_j1850_zero_16_constructor)
+    {
+      std::string data("123456789");
+
+      uint8_t crc = etl::crc8_j1850_zero_t16(data.begin(), data.end());
+
+      CHECK_EQUAL(0x37U, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_zero_16_add_values)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850_zero_t16 crc_calculator;
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        crc_calculator.add(data[i]);
+      }
+
+      uint8_t crc = crc_calculator;
+
+      CHECK_EQUAL(0x37U, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_zero_16_add_range)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850_zero_t16 crc_calculator;
+
+      crc_calculator.add(data.begin(), data.end());
+
+      uint8_t crc = crc_calculator.value();
+
+      CHECK_EQUAL(0x37U, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_zero_16_add_range_via_iterator)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850_zero_t16 crc_calculator;
+
+      std::copy(data.begin(), data.end(), crc_calculator.input());
+
+      uint8_t crc = crc_calculator.value();
+
+      CHECK_EQUAL(0x37U, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_zero_16_add_range_endian)
+    {
+      std::vector<uint8_t>  data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U };
+      std::vector<uint32_t> data2 = { 0x04030201UL, 0x08070605UL };
+      std::vector<uint8_t>  data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U };
+
+      uint8_t crc1 = etl::crc8_j1850_zero_t16(data1.begin(), data1.end());
+      uint8_t crc2 = etl::crc8_j1850_zero_t16((uint8_t*)&data2[0], (uint8_t*)(&data2[0] + data2.size()));
+      CHECK_EQUAL(int(crc1), int(crc2));
+
+      uint8_t crc3 = etl::crc8_j1850_zero_t16(data3.rbegin(), data3.rend());
+      CHECK_EQUAL(int(crc1), int(crc3));
+    }
+
+    //*************************************************************************
+    // Table size 256
+    //*************************************************************************
+    TEST(test_crc8_j1850_zero_256_constructor)
+    {
+      std::string data("123456789");
+
+      uint8_t crc = etl::crc8_j1850_zero(data.begin(), data.end());
+
+      CHECK_EQUAL(0x37U, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_zero_256_add_values)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850_zero crc_calculator;
+
+      for (size_t i = 0UL; i < data.size(); ++i)
+      {
+        crc_calculator.add(data[i]);
+      }
+
+      uint8_t crc = crc_calculator;
+
+      CHECK_EQUAL(0x37U, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_zero_256_add_range)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850_zero crc_calculator;
+
+      crc_calculator.add(data.begin(), data.end());
+
+      uint8_t crc = crc_calculator.value();
+
+      CHECK_EQUAL(0x37U, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_zero_256_add_range_via_iterator)
+    {
+      std::string data("123456789");
+
+      etl::crc8_j1850_zero crc_calculator;
+
+      std::copy(data.begin(), data.end(), crc_calculator.input());
+
+      uint8_t crc = crc_calculator.value();
+
+      CHECK_EQUAL(0x37U, int(crc));
+    }
+
+    //*************************************************************************
+    TEST(test_crc8_j1850_zero_256_add_range_endian)
+    {
+      std::vector<uint8_t>  data1 = { 0x01U, 0x02U, 0x03U, 0x04U, 0x05U, 0x06U, 0x07U, 0x08U };
+      std::vector<uint32_t> data2 = { 0x04030201UL, 0x08070605UL };
+      std::vector<uint8_t>  data3 = { 0x08U, 0x07U, 0x06U, 0x05U, 0x04U, 0x03U, 0x02U, 0x01U };
+
+      uint8_t crc1 = etl::crc8_j1850_zero(data1.begin(), data1.end());
+      uint8_t crc2 = etl::crc8_j1850_zero((uint8_t*)&data2[0], (uint8_t*)(&data2[0] + data2.size()));
+      CHECK_EQUAL(int(crc1), int(crc2));
+
+      uint8_t crc3 = etl::crc8_j1850_zero(data3.rbegin(), data3.rend());
+      CHECK_EQUAL(int(crc1), int(crc3));
+    }
+  };
+}
+

From 279a59fa5951d5330845cf3f10f717a17986da51 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Thu, 18 Jan 2024 08:57:50 +0000
Subject: [PATCH 032/131] Added syntax checks for crc8_j1850 & crc8_j1850_zero

---
 test/syntax_check/c++03/CMakeLists.txt    |  6 +++
 test/syntax_check/c++11/CMakeLists.txt    |  6 +++
 test/syntax_check/c++14/CMakeLists.txt    |  6 +++
 test/syntax_check/c++17/CMakeLists.txt    |  6 +++
 test/syntax_check/c++20/CMakeLists.txt    |  6 +++
 test/syntax_check/crc8_j1850.h.t.cpp      | 29 ++++++++++++++
 test/syntax_check/crc8_j1850_zero.h.t.cpp | 29 ++++++++++++++
 test/vs2022/etl.vcxproj                   | 32 +++++++++++++++
 test/vs2022/etl.vcxproj.filters           | 48 ++++++++++++++++++++---
 9 files changed, 162 insertions(+), 6 deletions(-)
 create mode 100644 test/syntax_check/crc8_j1850.h.t.cpp
 create mode 100644 test/syntax_check/crc8_j1850_zero.h.t.cpp

diff --git a/test/syntax_check/c++03/CMakeLists.txt b/test/syntax_check/c++03/CMakeLists.txt
index 0b63c6b2..7a425be1 100644
--- a/test/syntax_check/c++03/CMakeLists.txt
+++ b/test/syntax_check/c++03/CMakeLists.txt
@@ -38,6 +38,10 @@ set_target_properties(t98 PROPERTIES
         CXX_STANDARD_REQUIRED ON
         CXX_EXTENSIONS ON
         )
+target_compile_options(t98
+	    PRIVATE
+		-fsyntax-only
+		)
 target_sources(t98 PRIVATE etl_profile.h
         ../absolute.h.t.cpp
         ../algorithm.h.t.cpp
@@ -123,6 +127,8 @@ target_sources(t98 PRIVATE etl_profile.h
         ../crc8_maxim.h.t.cpp
         ../crc8_rohc.h.t.cpp
         ../crc8_wcdma.h.t.cpp
+        ../crc8_j1850.h.t.cpp
+        ../crc8_j1850_zero.h.t.cpp
         ../cyclic_value.h.t.cpp
         ../debounce.h.t.cpp
         ../debug_count.h.t.cpp
diff --git a/test/syntax_check/c++11/CMakeLists.txt b/test/syntax_check/c++11/CMakeLists.txt
index 72900939..29dc304e 100644
--- a/test/syntax_check/c++11/CMakeLists.txt
+++ b/test/syntax_check/c++11/CMakeLists.txt
@@ -38,6 +38,10 @@ set_target_properties(t11 PROPERTIES
         CXX_STANDARD_REQUIRED ON
         CXX_EXTENSIONS ON
         )
+target_compile_options(t11
+	    PRIVATE
+		-fsyntax-only
+		)
 target_sources(t11 PRIVATE etl_profile.h
         ../absolute.h.t.cpp
         ../algorithm.h.t.cpp
@@ -123,6 +127,8 @@ target_sources(t11 PRIVATE etl_profile.h
         ../crc8_maxim.h.t.cpp
         ../crc8_rohc.h.t.cpp
         ../crc8_wcdma.h.t.cpp
+        ../crc8_j1850.h.t.cpp
+        ../crc8_j1850_zero.h.t.cpp
         ../cyclic_value.h.t.cpp
         ../debounce.h.t.cpp
         ../debug_count.h.t.cpp
diff --git a/test/syntax_check/c++14/CMakeLists.txt b/test/syntax_check/c++14/CMakeLists.txt
index e9fb7a4e..9df6214c 100644
--- a/test/syntax_check/c++14/CMakeLists.txt
+++ b/test/syntax_check/c++14/CMakeLists.txt
@@ -38,6 +38,10 @@ set_target_properties(t14 PROPERTIES
         CXX_STANDARD_REQUIRED ON
         CXX_EXTENSIONS ON
         )
+target_compile_options(t14
+	    PRIVATE
+		-fsyntax-only
+		)
 target_sources(t14 PRIVATE etl_profile.h
         ../absolute.h.t.cpp
         ../algorithm.h.t.cpp
@@ -123,6 +127,8 @@ target_sources(t14 PRIVATE etl_profile.h
         ../crc8_maxim.h.t.cpp
         ../crc8_rohc.h.t.cpp
         ../crc8_wcdma.h.t.cpp
+        ../crc8_j1850.h.t.cpp
+        ../crc8_j1850_zero.h.t.cpp
         ../cyclic_value.h.t.cpp
         ../debounce.h.t.cpp
         ../debug_count.h.t.cpp
diff --git a/test/syntax_check/c++17/CMakeLists.txt b/test/syntax_check/c++17/CMakeLists.txt
index 4ab127ce..6be7bb03 100644
--- a/test/syntax_check/c++17/CMakeLists.txt
+++ b/test/syntax_check/c++17/CMakeLists.txt
@@ -38,6 +38,10 @@ set_target_properties(t17 PROPERTIES
         CXX_STANDARD_REQUIRED ON
         CXX_EXTENSIONS ON
         )
+target_compile_options(t17
+	    PRIVATE
+		-fsyntax-only
+		)
 target_sources(t17 PRIVATE etl_profile.h
         ../absolute.h.t.cpp
         ../algorithm.h.t.cpp
@@ -123,6 +127,8 @@ target_sources(t17 PRIVATE etl_profile.h
         ../crc8_maxim.h.t.cpp
         ../crc8_rohc.h.t.cpp
         ../crc8_wcdma.h.t.cpp
+        ../crc8_j1850.h.t.cpp
+        ../crc8_j1850_zero.h.t.cpp
         ../cyclic_value.h.t.cpp
         ../debounce.h.t.cpp
         ../debug_count.h.t.cpp
diff --git a/test/syntax_check/c++20/CMakeLists.txt b/test/syntax_check/c++20/CMakeLists.txt
index f5046f87..6c36b9d5 100644
--- a/test/syntax_check/c++20/CMakeLists.txt
+++ b/test/syntax_check/c++20/CMakeLists.txt
@@ -38,6 +38,10 @@ set_target_properties(t20 PROPERTIES
         CXX_STANDARD_REQUIRED ON
         CXX_EXTENSIONS ON
         )
+target_compile_options(t20
+	    PRIVATE
+		-fsyntax-only
+		)
 target_sources(t20 PRIVATE etl_profile.h
         ../absolute.h.t.cpp
         ../algorithm.h.t.cpp
@@ -123,6 +127,8 @@ target_sources(t20 PRIVATE etl_profile.h
         ../crc8_maxim.h.t.cpp
         ../crc8_rohc.h.t.cpp
         ../crc8_wcdma.h.t.cpp
+        ../crc8_j1850.h.t.cpp
+        ../crc8_j1850_zero.h.t.cpp
         ../cyclic_value.h.t.cpp
         ../debounce.h.t.cpp
         ../debug_count.h.t.cpp
diff --git a/test/syntax_check/crc8_j1850.h.t.cpp b/test/syntax_check/crc8_j1850.h.t.cpp
new file mode 100644
index 00000000..5e16709f
--- /dev/null
+++ b/test/syntax_check/crc8_j1850.h.t.cpp
@@ -0,0 +1,29 @@
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+https://github.com/ETLCPP/etl
+https://www.etlcpp.com
+
+Copyright(c) 2024 John Wellbelove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+******************************************************************************/
+
+#include <etl/crc8_j1850.h>
diff --git a/test/syntax_check/crc8_j1850_zero.h.t.cpp b/test/syntax_check/crc8_j1850_zero.h.t.cpp
new file mode 100644
index 00000000..ec892d09
--- /dev/null
+++ b/test/syntax_check/crc8_j1850_zero.h.t.cpp
@@ -0,0 +1,29 @@
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+https://github.com/ETLCPP/etl
+https://www.etlcpp.com
+
+Copyright(c) 2024 John Wellbelove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+******************************************************************************/
+
+#include <etl/crc8_j1850_zero.h>
diff --git a/test/vs2022/etl.vcxproj b/test/vs2022/etl.vcxproj
index 4c18142c..46b7b05c 100644
--- a/test/vs2022/etl.vcxproj
+++ b/test/vs2022/etl.vcxproj
@@ -2994,6 +2994,8 @@
     <ClInclude Include="..\..\include\etl\crc8_ebu.h" />
     <ClInclude Include="..\..\include\etl\crc8_icode.h" />
     <ClInclude Include="..\..\include\etl\crc8_itu.h" />
+    <ClInclude Include="..\..\include\etl\crc8_j1850.h" />
+    <ClInclude Include="..\..\include\etl\crc8_j1850_zero.h" />
     <ClInclude Include="..\..\include\etl\crc8_maxim.h" />
     <ClInclude Include="..\..\include\etl\crc8_rohc.h" />
     <ClInclude Include="..\..\include\etl\crc8_wcdma.h" />
@@ -4735,6 +4737,34 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\syntax_check\crc8_j1850.h.t.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\syntax_check\crc8_j1850_zero.h.t.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\syntax_check\crc8_maxim.h.t.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
@@ -7354,6 +7384,8 @@
     <ClCompile Include="..\test_crc8_ebu.cpp" />
     <ClCompile Include="..\test_crc8_icode.cpp" />
     <ClCompile Include="..\test_crc8_itu.cpp" />
+    <ClCompile Include="..\test_crc8_j1850.cpp" />
+    <ClCompile Include="..\test_crc8_j1850_zero.cpp" />
     <ClCompile Include="..\test_crc8_maxim.cpp" />
     <ClCompile Include="..\test_crc8_rohc.cpp" />
     <ClCompile Include="..\test_crc8_wcdma.cpp" />
diff --git a/test/vs2022/etl.vcxproj.filters b/test/vs2022/etl.vcxproj.filters
index 2adfa862..cad865ea 100644
--- a/test/vs2022/etl.vcxproj.filters
+++ b/test/vs2022/etl.vcxproj.filters
@@ -1389,6 +1389,12 @@
     <ClInclude Include="..\..\include\etl\crc1.h">
       <Filter>ETL\Maths\CRC</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc8_j1850.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc8_j1850_zero.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\test_string_char.cpp">
@@ -3284,6 +3290,18 @@
     <ClCompile Include="..\test_crc1.cpp">
       <Filter>Tests\CRC</Filter>
     </ClCompile>
+    <ClCompile Include="..\syntax_check\crc8_j1850.h.t.cpp">
+      <Filter>Tests\Syntax Checks\Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\syntax_check\crc8_j1850_zero.h.t.cpp">
+      <Filter>Tests\Syntax Checks\Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc8_j1850.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc8_j1850_zero.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\library.properties">
@@ -3340,12 +3358,6 @@
     <None Include="..\..\appveyor.yml">
       <Filter>Resource Files\CI\Appveyor</Filter>
     </None>
-    <None Include="..\..\.github\workflows\clang.yml">
-      <Filter>Resource Files\CI\Github</Filter>
-    </None>
-    <None Include="..\..\.github\workflows\gcc.yml">
-      <Filter>Resource Files\CI\Github</Filter>
-    </None>
     <None Include="..\..\.clang-format">
       <Filter>Resource Files</Filter>
     </None>
@@ -3412,6 +3424,30 @@
     <None Include="..\..\scripts\update_version.py">
       <Filter>Tests\Scripts</Filter>
     </None>
+    <None Include="..\..\.github\workflows\clang-c++11.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\clang-c++14.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\clang-c++17.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\clang-c++20.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++11.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++14.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++17.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++20.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\support\Release notes.txt">

From 47d3d67a147404f268fd32e5c6cb5829d30aab31 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Thu, 18 Jan 2024 09:54:07 +0000
Subject: [PATCH 033/131] Modified definition of bitset::Storage_Type for
 compatibility with C++03

---
 include/etl/private/bitset_new.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 8c341eba..6c6d2443 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -1820,7 +1820,11 @@ namespace etl
       static ETL_CONSTANT size_t Size               = Active_Bits;
       static ETL_CONSTANT size_t Allocated_Bits     = Number_Of_Elements * Bits_Per_Element;
 
-      static ETL_CONSTANT etl::bitset_storage_model Storage_Model = (Number_Of_Elements == 1U) ? etl::bitset_storage_model::Single : etl::bitset_storage_model::Multi;
+#if ETL_USING_CPP11
+      static ETL_CONSTANT etl::bitset_storage_model Storage_Model = (bitset_common<Active_Bits, TElement>::Number_Of_Elements == 1U) ? etl::bitset_storage_model::Single : etl::bitset_storage_model::Multi;
+#else
+      static ETL_CONSTANT etl::bitset_storage_model Storage_Model;
+#endif
 
       typedef etl::span<element_type,       Number_Of_Elements> span_type;
       typedef etl::span<const element_type, Number_Of_Elements> const_span_type;
@@ -1841,8 +1845,13 @@ namespace etl
     template <size_t Active_Bits, typename TElement>
     ETL_CONSTANT size_t bitset_common<Active_Bits, TElement>::Size;
 
+#if ETL_USING_CPP11
     template <size_t Active_Bits, typename TElement>
     ETL_CONSTANT etl::bitset_storage_model bitset_common<Active_Bits, TElement>::Storage_Model;
+#else
+    template <size_t Active_Bits, typename TElement>
+    ETL_CONSTANT etl::bitset_storage_model bitset_common<Active_Bits, TElement>::Storage_Model = (bitset_common<Active_Bits, TElement>::Number_Of_Elements == 1U) ? etl::bitset_storage_model::Single : etl::bitset_storage_model::Multi;
+#endif
 
     template <size_t Active_Bits, typename TElement>
     ETL_CONSTANT size_t bitset_common<Active_Bits, TElement>::Top_Mask_Shift;

From 1825c545705c7af03dd91a5b8303191fcecfe8cf Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 20 Jan 2024 09:44:51 +0000
Subject: [PATCH 034/131] Minor C++ standards compatibility tweaks

---
 include/etl/private/bitset_new.h | 44 ++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 6c6d2443..6d653298 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -459,7 +459,7 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
+    /// Extract an integral value from an arbitrary position and length.
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
@@ -484,9 +484,13 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
+    /// Extract an integral value from an arbitrary position and length.
     //*************************************************************************
+#if ETL_USING_CPP11
     template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
+#else
+		template <typename T, size_t Position, size_t Length>
+#endif
     ETL_CONSTEXPR14
       static
       T extract(const_pointer pbuffer)
@@ -1309,7 +1313,7 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
+    /// Extract an integral value from an arbitrary position and length.
     /// Run time position and length.
     //*************************************************************************
     template <typename T>
@@ -1387,7 +1391,7 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
+    /// Extract an integral value from an arbitrary position and length.
     //*************************************************************************
     template <typename T>
     ETL_CONSTEXPR14
@@ -1409,7 +1413,7 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
+    /// Extract an integral value from an arbitrary position and length.
     //*************************************************************************
     template <typename T, size_t Position, size_t Length>
     ETL_CONSTEXPR14
@@ -1875,9 +1879,9 @@ namespace etl
   {
   public:
 
-    typedef typename etl::private_bitset::bitset_common<0U, unsigned char>::element_type    element_type;
-    typedef typename etl::private_bitset::bitset_common<0U, unsigned char>::span_type       span_type;
-    typedef typename etl::private_bitset::bitset_common<0U, unsigned char>::const_span_type const_span_type;
+    typedef etl::private_bitset::bitset_common<0U, unsigned char>::element_type    element_type;
+    typedef etl::private_bitset::bitset_common<0U, unsigned char>::span_type       span_type;
+    typedef etl::private_bitset::bitset_common<0U, unsigned char>::const_span_type const_span_type;
 
     using etl::private_bitset::bitset_common<0U, unsigned char>::Bits_Per_Element;
     using etl::private_bitset::bitset_common<0U, unsigned char>::All_Set_Element;
@@ -2226,7 +2230,7 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
+    /// Extract an integral value from an arbitrary position and length.
     /// Run time position and length.
     //*************************************************************************
     template <typename T>
@@ -2242,10 +2246,14 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
+    /// Extract an integral value from an arbitrary position and length.
     /// Compile time position and length.
     //*************************************************************************
-    template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
+#if ETL_USING_CPP11    
+		template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
+#else
+	  template <typename T, size_t Position, size_t Length>
+#endif
     ETL_CONSTEXPR14
     T extract() const
     {
@@ -2791,9 +2799,9 @@ namespace etl
   {
   public:
 
-    typedef typename etl::private_bitset::bitset_common<0U, unsigned char>::element_type    element_type;
-    typedef typename etl::private_bitset::bitset_common<0U, unsigned char>::span_type       span_type;
-    typedef typename etl::private_bitset::bitset_common<0U, unsigned char>::const_span_type const_span_type;
+    typedef etl::private_bitset::bitset_common<0U, unsigned char>::element_type    element_type;
+    typedef etl::private_bitset::bitset_common<0U, unsigned char>::span_type       span_type;
+    typedef etl::private_bitset::bitset_common<0U, unsigned char>::const_span_type const_span_type;
 
     using etl::private_bitset::bitset_common<0U, unsigned char>::Bits_Per_Element;
     using etl::private_bitset::bitset_common<0U, unsigned char>::All_Set_Element;
@@ -3219,7 +3227,7 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
+    /// Extract an integral value from an arbitrary position and length.
     /// Run time position and length.
     //*************************************************************************
     template <typename T>
@@ -3235,10 +3243,14 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Extract an integral value from an arbitary position and length.
+    /// Extract an integral value from an arbitrary position and length.
     /// Compile time position and length.
     //*************************************************************************
+#if ETL_USING_CPP11
     template <typename T, size_t Position, size_t Length = etl::integral_limits<T>::bits>
+#else
+    template <typename T, size_t Position, size_t Length>
+#endif
     ETL_CONSTEXPR14
     T extract() const
     {

From 83e23b9adf4d17b819262fb707e8c975ac11f039 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 20 Jan 2024 10:08:15 +0000
Subject: [PATCH 035/131] Fix C++ standard syntax compatibility for repair()

---
 include/etl/circular_buffer.h | 14 +++++---------
 include/etl/deque.h           |  8 +++-----
 include/etl/platform.h        |  9 +++++++++
 include/etl/string.h          | 10 ++++++----
 include/etl/u16string.h       | 10 ++++++----
 include/etl/u32string.h       | 10 ++++++----
 include/etl/u8string.h        | 10 ++++++----
 include/etl/vector.h          | 21 +++++++++++----------
 include/etl/wstring.h         | 10 ++++++----
 9 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/include/etl/circular_buffer.h b/include/etl/circular_buffer.h
index a099ca4a..f57d863d 100644
--- a/include/etl/circular_buffer.h
+++ b/include/etl/circular_buffer.h
@@ -1208,11 +1208,9 @@ namespace etl
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
 #ifdef ETL_ICIRCULAR_BUFFER_REPAIR_ENABLE
-    virtual
-#endif
+      virtual void repair() ETL_OVERRIDE
+#else
       void repair()
-#ifdef ETL_ICIRCULAR_BUFFER_REPAIR_ENABLE
-      ETL_OVERRIDE
 #endif
     {
       ETL_ASSERT(etl::is_trivially_copyable<T>::value, ETL_ERROR(etl::circular_buffer_incompatible_type));
@@ -1395,11 +1393,9 @@ namespace etl
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
 #ifdef ETL_ICIRCULAR_BUFFER_REPAIR_ENABLE
-    virtual
-#endif
-      void repair()
-#ifdef ETL_ICIRCULAR_BUFFER_REPAIR_ENABLE
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
diff --git a/include/etl/deque.h b/include/etl/deque.h
index 8a11063e..5586360a 100644
--- a/include/etl/deque.h
+++ b/include/etl/deque.h
@@ -2483,11 +2483,9 @@ namespace etl
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
 #ifdef ETL_IDEQUE_REPAIR_ENABLE
-      virtual
-#endif
-      void repair()
-#ifdef ETL_IDEQUE_REPAIR_ENABLE
-      ETL_OVERRIDE
+        virtual void repair() ETL_OVERRIDE
+#else
+        void repair()
 #endif
     {
 #if ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED
diff --git a/include/etl/platform.h b/include/etl/platform.h
index 294ee7cf..a9170c6f 100644
--- a/include/etl/platform.h
+++ b/include/etl/platform.h
@@ -202,6 +202,14 @@ SOFTWARE.
   #define ETL_HAS_IDEQUE_REPAIR 0
 #endif
 
+//*************************************
+// Option to enable repair-after-memcpy for icircular_buffer.
+#if defined(ETL_ICIRCULAR_BUFFER_REPAIR_ENABLE)
+#define ETL_HAS_ICIRCULAR_BUFFER_REPAIR 1
+#else
+#define ETL_HAS_ICIRCULAR_BUFFER_REPAIR 0
+#endif
+
 //*************************************
 // Indicate if C++ exceptions are enabled.
 #if defined(ETL_THROW_EXCEPTIONS)
@@ -479,6 +487,7 @@ namespace etl
     static ETL_CONSTANT bool has_string_clear_after_use       = (ETL_HAS_STRING_CLEAR_AFTER_USE == 1);
     static ETL_CONSTANT bool has_istring_repair               = (ETL_HAS_ISTRING_REPAIR == 1);
     static ETL_CONSTANT bool has_ivector_repair               = (ETL_HAS_IVECTOR_REPAIR == 1);
+    static ETL_CONSTANT bool has_icircular_buffer_repair      = (ETL_HAS_ICIRCULAR_BUFFER_REPAIR == 1);
     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 has_virtual_messages             = (ETL_HAS_VIRTUAL_MESSAGES == 1);
diff --git a/include/etl/string.h b/include/etl/string.h
index 5f925337..1fbc19d2 100644
--- a/include/etl/string.h
+++ b/include/etl/string.h
@@ -246,9 +246,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::istring::repair_buffer(buffer);
@@ -434,9 +435,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
diff --git a/include/etl/u16string.h b/include/etl/u16string.h
index 2c100c8b..c0fea3a2 100644
--- a/include/etl/u16string.h
+++ b/include/etl/u16string.h
@@ -230,9 +230,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::iu16string::repair_buffer(buffer);
@@ -414,9 +415,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
diff --git a/include/etl/u32string.h b/include/etl/u32string.h
index 88d0ed44..766a0cbc 100644
--- a/include/etl/u32string.h
+++ b/include/etl/u32string.h
@@ -230,9 +230,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::iu32string::repair_buffer(buffer);
@@ -414,9 +415,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
diff --git a/include/etl/u8string.h b/include/etl/u8string.h
index 9d8b9458..015ef3c1 100644
--- a/include/etl/u8string.h
+++ b/include/etl/u8string.h
@@ -247,9 +247,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::iu8string::repair_buffer(buffer);
@@ -435,9 +436,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
diff --git a/include/etl/vector.h b/include/etl/vector.h
index af236dc7..4150c443 100644
--- a/include/etl/vector.h
+++ b/include/etl/vector.h
@@ -1346,11 +1346,9 @@ namespace etl
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
 #ifdef ETL_IVECTOR_REPAIR_ENABLE
-    virtual
-#endif
+    virtual void repair() ETL_OVERRIDE
+#else
     void repair()
-#ifdef ETL_IVECTOR_REPAIR_ENABLE
-      ETL_OVERRIDE
 #endif
     {
       ETL_ASSERT_OR_RETURN(etl::is_trivially_copyable<T>::value, ETL_ERROR(etl::vector_incompatible_type));
@@ -1527,9 +1525,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #ifdef ETL_IVECTOR_REPAIR_ENABLE
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
@@ -1649,9 +1648,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #ifdef ETL_IVECTOR_REPAIR_ENABLE
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::ivector<T*>::repair_buffer(buffer);
@@ -1806,9 +1806,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #ifdef ETL_IVECTOR_REPAIR_ENABLE
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::ivector<T*>::repair_buffer(this->p_buffer);
diff --git a/include/etl/wstring.h b/include/etl/wstring.h
index 20ce4ac4..683359de 100644
--- a/include/etl/wstring.h
+++ b/include/etl/wstring.h
@@ -231,9 +231,10 @@ namespace etl
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
 #if ETL_HAS_ISTRING_REPAIR
-    virtual
-#endif
+    virtual void repair() ETL_OVERRIDE
+#else
     void repair()
+#endif
     {
       etl::iwstring::repair_buffer(buffer);
     }
@@ -414,9 +415,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }

From db878c54c598abc90bc543fd9bb9f3b7641f6875 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 20 Jan 2024 10:08:15 +0000
Subject: [PATCH 036/131] Fix C++ standard syntax compatibility for repair()

---
 include/etl/circular_buffer.h | 14 +++++---------
 include/etl/deque.h           |  8 +++-----
 include/etl/platform.h        |  9 +++++++++
 include/etl/string.h          | 10 ++++++----
 include/etl/u16string.h       | 10 ++++++----
 include/etl/u32string.h       | 10 ++++++----
 include/etl/u8string.h        | 10 ++++++----
 include/etl/vector.h          | 21 +++++++++++----------
 include/etl/wstring.h         | 10 ++++++----
 9 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/include/etl/circular_buffer.h b/include/etl/circular_buffer.h
index a099ca4a..f57d863d 100644
--- a/include/etl/circular_buffer.h
+++ b/include/etl/circular_buffer.h
@@ -1208,11 +1208,9 @@ namespace etl
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
 #ifdef ETL_ICIRCULAR_BUFFER_REPAIR_ENABLE
-    virtual
-#endif
+      virtual void repair() ETL_OVERRIDE
+#else
       void repair()
-#ifdef ETL_ICIRCULAR_BUFFER_REPAIR_ENABLE
-      ETL_OVERRIDE
 #endif
     {
       ETL_ASSERT(etl::is_trivially_copyable<T>::value, ETL_ERROR(etl::circular_buffer_incompatible_type));
@@ -1395,11 +1393,9 @@ namespace etl
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
 #ifdef ETL_ICIRCULAR_BUFFER_REPAIR_ENABLE
-    virtual
-#endif
-      void repair()
-#ifdef ETL_ICIRCULAR_BUFFER_REPAIR_ENABLE
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
diff --git a/include/etl/deque.h b/include/etl/deque.h
index 8a11063e..5586360a 100644
--- a/include/etl/deque.h
+++ b/include/etl/deque.h
@@ -2483,11 +2483,9 @@ namespace etl
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
 #ifdef ETL_IDEQUE_REPAIR_ENABLE
-      virtual
-#endif
-      void repair()
-#ifdef ETL_IDEQUE_REPAIR_ENABLE
-      ETL_OVERRIDE
+        virtual void repair() ETL_OVERRIDE
+#else
+        void repair()
 #endif
     {
 #if ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED
diff --git a/include/etl/platform.h b/include/etl/platform.h
index 360f9027..17c7961d 100644
--- a/include/etl/platform.h
+++ b/include/etl/platform.h
@@ -202,6 +202,14 @@ SOFTWARE.
   #define ETL_HAS_IDEQUE_REPAIR 0
 #endif
 
+//*************************************
+// Option to enable repair-after-memcpy for icircular_buffer.
+#if defined(ETL_ICIRCULAR_BUFFER_REPAIR_ENABLE)
+#define ETL_HAS_ICIRCULAR_BUFFER_REPAIR 1
+#else
+#define ETL_HAS_ICIRCULAR_BUFFER_REPAIR 0
+#endif
+
 //*************************************
 // Indicate if C++ exceptions are enabled.
 #if defined(ETL_THROW_EXCEPTIONS)
@@ -477,6 +485,7 @@ namespace etl
     static ETL_CONSTANT bool has_string_clear_after_use       = (ETL_HAS_STRING_CLEAR_AFTER_USE == 1);
     static ETL_CONSTANT bool has_istring_repair               = (ETL_HAS_ISTRING_REPAIR == 1);
     static ETL_CONSTANT bool has_ivector_repair               = (ETL_HAS_IVECTOR_REPAIR == 1);
+    static ETL_CONSTANT bool has_icircular_buffer_repair      = (ETL_HAS_ICIRCULAR_BUFFER_REPAIR == 1);
     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 has_virtual_messages             = (ETL_HAS_VIRTUAL_MESSAGES == 1);
diff --git a/include/etl/string.h b/include/etl/string.h
index 5f925337..1fbc19d2 100644
--- a/include/etl/string.h
+++ b/include/etl/string.h
@@ -246,9 +246,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::istring::repair_buffer(buffer);
@@ -434,9 +435,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
diff --git a/include/etl/u16string.h b/include/etl/u16string.h
index 2c100c8b..c0fea3a2 100644
--- a/include/etl/u16string.h
+++ b/include/etl/u16string.h
@@ -230,9 +230,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::iu16string::repair_buffer(buffer);
@@ -414,9 +415,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
diff --git a/include/etl/u32string.h b/include/etl/u32string.h
index 88d0ed44..766a0cbc 100644
--- a/include/etl/u32string.h
+++ b/include/etl/u32string.h
@@ -230,9 +230,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::iu32string::repair_buffer(buffer);
@@ -414,9 +415,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
diff --git a/include/etl/u8string.h b/include/etl/u8string.h
index 9d8b9458..015ef3c1 100644
--- a/include/etl/u8string.h
+++ b/include/etl/u8string.h
@@ -247,9 +247,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::iu8string::repair_buffer(buffer);
@@ -435,9 +436,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
diff --git a/include/etl/vector.h b/include/etl/vector.h
index af236dc7..4150c443 100644
--- a/include/etl/vector.h
+++ b/include/etl/vector.h
@@ -1346,11 +1346,9 @@ namespace etl
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
 #ifdef ETL_IVECTOR_REPAIR_ENABLE
-    virtual
-#endif
+    virtual void repair() ETL_OVERRIDE
+#else
     void repair()
-#ifdef ETL_IVECTOR_REPAIR_ENABLE
-      ETL_OVERRIDE
 #endif
     {
       ETL_ASSERT_OR_RETURN(etl::is_trivially_copyable<T>::value, ETL_ERROR(etl::vector_incompatible_type));
@@ -1527,9 +1525,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #ifdef ETL_IVECTOR_REPAIR_ENABLE
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
@@ -1649,9 +1648,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #ifdef ETL_IVECTOR_REPAIR_ENABLE
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::ivector<T*>::repair_buffer(buffer);
@@ -1806,9 +1806,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #ifdef ETL_IVECTOR_REPAIR_ENABLE
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::ivector<T*>::repair_buffer(this->p_buffer);
diff --git a/include/etl/wstring.h b/include/etl/wstring.h
index 20ce4ac4..683359de 100644
--- a/include/etl/wstring.h
+++ b/include/etl/wstring.h
@@ -231,9 +231,10 @@ namespace etl
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
 #if ETL_HAS_ISTRING_REPAIR
-    virtual
-#endif
+    virtual void repair() ETL_OVERRIDE
+#else
     void repair()
+#endif
     {
       etl::iwstring::repair_buffer(buffer);
     }
@@ -414,9 +415,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }

From 94ee20e2fdd1f8e7a117fb6a4acc518782eb380c Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 20 Jan 2024 10:08:15 +0000
Subject: [PATCH 037/131] Fix C++ standard syntax compatibility for repair()

---
 include/etl/circular_buffer.h    | 14 +++++---------
 include/etl/deque.h              |  8 +++-----
 include/etl/platform.h           |  9 +++++++++
 include/etl/private/bitset_new.h |  4 ++--
 include/etl/string.h             | 10 ++++++----
 include/etl/u16string.h          | 10 ++++++----
 include/etl/u32string.h          | 10 ++++++----
 include/etl/u8string.h           | 10 ++++++----
 include/etl/vector.h             | 21 +++++++++++----------
 include/etl/wstring.h            | 10 ++++++----
 10 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/include/etl/circular_buffer.h b/include/etl/circular_buffer.h
index a099ca4a..f57d863d 100644
--- a/include/etl/circular_buffer.h
+++ b/include/etl/circular_buffer.h
@@ -1208,11 +1208,9 @@ namespace etl
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
 #ifdef ETL_ICIRCULAR_BUFFER_REPAIR_ENABLE
-    virtual
-#endif
+      virtual void repair() ETL_OVERRIDE
+#else
       void repair()
-#ifdef ETL_ICIRCULAR_BUFFER_REPAIR_ENABLE
-      ETL_OVERRIDE
 #endif
     {
       ETL_ASSERT(etl::is_trivially_copyable<T>::value, ETL_ERROR(etl::circular_buffer_incompatible_type));
@@ -1395,11 +1393,9 @@ namespace etl
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
 #ifdef ETL_ICIRCULAR_BUFFER_REPAIR_ENABLE
-    virtual
-#endif
-      void repair()
-#ifdef ETL_ICIRCULAR_BUFFER_REPAIR_ENABLE
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
diff --git a/include/etl/deque.h b/include/etl/deque.h
index 8a11063e..5586360a 100644
--- a/include/etl/deque.h
+++ b/include/etl/deque.h
@@ -2483,11 +2483,9 @@ namespace etl
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
 #ifdef ETL_IDEQUE_REPAIR_ENABLE
-      virtual
-#endif
-      void repair()
-#ifdef ETL_IDEQUE_REPAIR_ENABLE
-      ETL_OVERRIDE
+        virtual void repair() ETL_OVERRIDE
+#else
+        void repair()
 #endif
     {
 #if ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED
diff --git a/include/etl/platform.h b/include/etl/platform.h
index 360f9027..17c7961d 100644
--- a/include/etl/platform.h
+++ b/include/etl/platform.h
@@ -202,6 +202,14 @@ SOFTWARE.
   #define ETL_HAS_IDEQUE_REPAIR 0
 #endif
 
+//*************************************
+// Option to enable repair-after-memcpy for icircular_buffer.
+#if defined(ETL_ICIRCULAR_BUFFER_REPAIR_ENABLE)
+#define ETL_HAS_ICIRCULAR_BUFFER_REPAIR 1
+#else
+#define ETL_HAS_ICIRCULAR_BUFFER_REPAIR 0
+#endif
+
 //*************************************
 // Indicate if C++ exceptions are enabled.
 #if defined(ETL_THROW_EXCEPTIONS)
@@ -477,6 +485,7 @@ namespace etl
     static ETL_CONSTANT bool has_string_clear_after_use       = (ETL_HAS_STRING_CLEAR_AFTER_USE == 1);
     static ETL_CONSTANT bool has_istring_repair               = (ETL_HAS_ISTRING_REPAIR == 1);
     static ETL_CONSTANT bool has_ivector_repair               = (ETL_HAS_IVECTOR_REPAIR == 1);
+    static ETL_CONSTANT bool has_icircular_buffer_repair      = (ETL_HAS_ICIRCULAR_BUFFER_REPAIR == 1);
     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 has_virtual_messages             = (ETL_HAS_VIRTUAL_MESSAGES == 1);
diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 6d653298..1220ef92 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -492,8 +492,8 @@ namespace etl
 		template <typename T, size_t Position, size_t Length>
 #endif
     ETL_CONSTEXPR14
-      static
-      T extract(const_pointer pbuffer)
+    static
+    T extract(const_pointer pbuffer)
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
diff --git a/include/etl/string.h b/include/etl/string.h
index 5f925337..1fbc19d2 100644
--- a/include/etl/string.h
+++ b/include/etl/string.h
@@ -246,9 +246,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::istring::repair_buffer(buffer);
@@ -434,9 +435,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
diff --git a/include/etl/u16string.h b/include/etl/u16string.h
index 2c100c8b..c0fea3a2 100644
--- a/include/etl/u16string.h
+++ b/include/etl/u16string.h
@@ -230,9 +230,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::iu16string::repair_buffer(buffer);
@@ -414,9 +415,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
diff --git a/include/etl/u32string.h b/include/etl/u32string.h
index 88d0ed44..766a0cbc 100644
--- a/include/etl/u32string.h
+++ b/include/etl/u32string.h
@@ -230,9 +230,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::iu32string::repair_buffer(buffer);
@@ -414,9 +415,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
diff --git a/include/etl/u8string.h b/include/etl/u8string.h
index 9d8b9458..015ef3c1 100644
--- a/include/etl/u8string.h
+++ b/include/etl/u8string.h
@@ -247,9 +247,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::iu8string::repair_buffer(buffer);
@@ -435,9 +436,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
diff --git a/include/etl/vector.h b/include/etl/vector.h
index af236dc7..4150c443 100644
--- a/include/etl/vector.h
+++ b/include/etl/vector.h
@@ -1346,11 +1346,9 @@ namespace etl
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
 #ifdef ETL_IVECTOR_REPAIR_ENABLE
-    virtual
-#endif
+    virtual void repair() ETL_OVERRIDE
+#else
     void repair()
-#ifdef ETL_IVECTOR_REPAIR_ENABLE
-      ETL_OVERRIDE
 #endif
     {
       ETL_ASSERT_OR_RETURN(etl::is_trivially_copyable<T>::value, ETL_ERROR(etl::vector_incompatible_type));
@@ -1527,9 +1525,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #ifdef ETL_IVECTOR_REPAIR_ENABLE
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }
@@ -1649,9 +1648,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #ifdef ETL_IVECTOR_REPAIR_ENABLE
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::ivector<T*>::repair_buffer(buffer);
@@ -1806,9 +1806,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #ifdef ETL_IVECTOR_REPAIR_ENABLE
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
       etl::ivector<T*>::repair_buffer(this->p_buffer);
diff --git a/include/etl/wstring.h b/include/etl/wstring.h
index 20ce4ac4..683359de 100644
--- a/include/etl/wstring.h
+++ b/include/etl/wstring.h
@@ -231,9 +231,10 @@ namespace etl
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
 #if ETL_HAS_ISTRING_REPAIR
-    virtual
-#endif
+    virtual void repair() ETL_OVERRIDE
+#else
     void repair()
+#endif
     {
       etl::iwstring::repair_buffer(buffer);
     }
@@ -414,9 +415,10 @@ namespace etl
     //*************************************************************************
     /// Fix the internal pointers after a low level memory copy.
     //*************************************************************************
-    void repair()
 #if ETL_HAS_ISTRING_REPAIR
-      ETL_OVERRIDE
+    virtual void repair() ETL_OVERRIDE
+#else
+    void repair()
 #endif
     {
     }

From 5e78b48b6cda8429b493e5b43b18a982307c5ecb Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 20 Jan 2024 18:35:20 +0000
Subject: [PATCH 038/131] #815 etl::remove_if calls predicate twice for first
 iterator, where predicate returns true.

---
 include/etl/algorithm.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/include/etl/algorithm.h b/include/etl/algorithm.h
index dd01415a..a6c96162 100644
--- a/include/etl/algorithm.h
+++ b/include/etl/algorithm.h
@@ -2021,9 +2021,7 @@ namespace etl
   template <typename TIterator, typename T>
   ETL_CONSTEXPR14
   TIterator remove(TIterator first, TIterator last, const T& value)
-  {
-    first = etl::find(first, last, value);
-      
+  {    
     if (first != last)
     {
       TIterator itr = first;
@@ -2051,8 +2049,6 @@ namespace etl
   ETL_CONSTEXPR14
   TIterator remove_if(TIterator first, TIterator last, TUnaryPredicate predicate)
   {
-    first = etl::find_if(first, last, predicate);
-
     if (first != last)
     {
       TIterator itr = first;

From 51b10c498c68afed682bb9bf82c93d77e12c7d0d Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 20 Jan 2024 21:03:17 +0000
Subject: [PATCH 039/131] Added to_ulong() and to_ullong()

---
 include/etl/private/bitset_new.h              | 31 ++++++----
 test/test_bitset_new_default_element_type.cpp | 50 ++++++++++++++++
 ...itset_new_explicit_single_element_type.cpp | 50 ++++++++++++++++
 ...st_bitset_new_ext_default_element_type.cpp | 56 ++++++++++++++++++
 ...t_new_ext_explicit_single_element_type.cpp | 57 +++++++++++++++++++
 5 files changed, 232 insertions(+), 12 deletions(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 1220ef92..822bdd52 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -497,7 +497,7 @@ namespace etl
     {
       typedef typename etl::make_unsigned<T>::type unsigned_t;
 
-      const unsigned_t Mask = etl::make_lsb_mask<unsigned_t>(Length);
+      const unsigned_t Mask  = etl::make_lsb_mask<unsigned_t>(Length);
       const unsigned_t Shift = Position % Bits_Per_Element;
 
       unsigned_t value = static_cast<unsigned_t>(*pbuffer >> Shift) & Mask;
@@ -1780,10 +1780,17 @@ namespace etl
       const size_t Shift = etl::integral_limits<element_type>::bits;
 
       // Set the non-zero elements.
-      while ((value != 0) && (i != number_of_elements))
+      if ETL_IF_CONSTEXPR(etl::integral_limits<element_type>::bits == etl::integral_limits<unsigned long long>::bits)
       {
-        pbuffer[i++] = value & All_Set_Element;
-        value = value >> Shift;
+        pbuffer[i++] = value;
+      }
+      else
+      {
+        while ((value != 0) && (i != number_of_elements))
+        {
+          pbuffer[i++] = value & All_Set_Element;
+          value = value >> Shift;
+        }
       }
 
       // Clear the remaining elements.
@@ -2267,9 +2274,9 @@ namespace etl
     //*************************************************************************
     /// Get as an unsigned long.
     //*************************************************************************
-    ETL_CONSTEXPR14 unsigned long to_ulong() const ETL_NOEXCEPT
+    unsigned long to_ulong() const
     {
-      ETL_STATIC_ASSERT(etl::integral_limits<unsigned long>::bits >= Active_Bits, "to_ulong() : Active_Bits > unsigned long");
+      ETL_ASSERT(etl::integral_limits<unsigned long>::bits >= Active_Bits, ETL_ERROR(etl::bitset_overflow));
 
       return implementation::template value<unsigned long>(buffer, Number_Of_Elements);
     }
@@ -2277,9 +2284,9 @@ namespace etl
     //*************************************************************************
     /// Get as an unsigned long long.
     //*************************************************************************
-    ETL_CONSTEXPR14 unsigned long long to_ullong() const ETL_NOEXCEPT
+    unsigned long long to_ullong() const
     {
-      ETL_STATIC_ASSERT(etl::integral_limits<unsigned long long>::bits >= Active_Bits, "to_ullong() : Active_Bits > unsigned long long");
+      ETL_ASSERT(etl::integral_limits<unsigned long long>::bits >= Active_Bits, ETL_ERROR(etl::bitset_overflow));
 
       return implementation::template value<unsigned long long>(buffer, Number_Of_Elements);
     }
@@ -3264,9 +3271,9 @@ namespace etl
     //*************************************************************************
     /// Get as an unsigned long.
     //*************************************************************************
-    ETL_CONSTEXPR14 unsigned long to_ulong() const ETL_NOEXCEPT
+    unsigned long to_ulong() const
     {
-      ETL_STATIC_ASSERT(etl::integral_limits<unsigned long>::bits >= Active_Bits, "Active_Bits > unsigned long");
+      ETL_ASSERT(etl::integral_limits<unsigned long>::bits >= Active_Bits, ETL_ERROR(etl::bitset_overflow));
 
       return implementation::template value<unsigned long>(pbuffer, Number_Of_Elements);
     }
@@ -3274,9 +3281,9 @@ namespace etl
     //*************************************************************************
     /// Get as an unsigned long long.
     //*************************************************************************
-    ETL_CONSTEXPR14 unsigned long long to_ullong() const ETL_NOEXCEPT
+    unsigned long long to_ullong() const
     {
-      ETL_STATIC_ASSERT(etl::integral_limits<unsigned long long>::bits >= Active_Bits, "Active_Bits > unsigned long long");
+      ETL_ASSERT(etl::integral_limits<unsigned long long>::bits >= Active_Bits, ETL_ERROR(etl::bitset_overflow));
 
       return implementation::template value<unsigned long long>(pbuffer, Number_Of_Elements);
     }
diff --git a/test/test_bitset_new_default_element_type.cpp b/test/test_bitset_new_default_element_type.cpp
index 4ca19920..b2854161 100644
--- a/test/test_bitset_new_default_element_type.cpp
+++ b/test/test_bitset_new_default_element_type.cpp
@@ -1140,6 +1140,56 @@ namespace
       CHECK_EQUAL(std::numeric_limits<int64_t>::max(), value);
     }
 
+    //*************************************************************************
+    TEST(test_to_ulong_min)
+    {
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits> data((unsigned long)etl::integral_limits<unsigned long>::min);
+      unsigned long value = data.to_ulong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ulong_max)
+    {
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits> data((unsigned long)etl::integral_limits<unsigned long>::max);
+      unsigned long value = data.to_ulong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long>::max(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ulong_overflow)
+    {
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits + 1> data((unsigned long)etl::integral_limits<unsigned long>::min);
+      CHECK_THROW(data.to_ulong(), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ullong_min)
+    {
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits> data((unsigned long long)etl::integral_limits<unsigned long long>::min);
+      unsigned long long value = data.to_ullong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ullong_max)
+    {
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits> data((unsigned long long)etl::integral_limits<unsigned long long>::max);
+      unsigned long long value = data.to_ullong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long long>::max(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ullong_overflow)
+    {
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits + 1> data((unsigned long long)etl::integral_limits<unsigned long long>::min);
+      CHECK_THROW(data.to_ullong(), etl::bitset_overflow);
+    }
+
     //*************************************************************************
     TEST(test_position_set)
     {
diff --git a/test/test_bitset_new_explicit_single_element_type.cpp b/test/test_bitset_new_explicit_single_element_type.cpp
index 91411477..6dbfb8ca 100644
--- a/test/test_bitset_new_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_explicit_single_element_type.cpp
@@ -1136,6 +1136,56 @@ namespace
       CHECK_EQUAL(std::numeric_limits<int64_t>::max(), value);
     }
 
+    //*************************************************************************
+    TEST(test_to_ulong_min)
+    {
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits, uint64_t> data((unsigned long)etl::integral_limits<unsigned long>::min);
+      unsigned long value = data.to_ulong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ulong_max)
+    {
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits, uint64_t> data((unsigned long)etl::integral_limits<unsigned long>::max);
+      unsigned long value = data.to_ulong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long>::max(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ulong_overflow)
+    {
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits + 1, uint64_t> data((unsigned long)etl::integral_limits<unsigned long>::min);
+      CHECK_THROW(data.to_ulong(), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ullong_min)
+    {
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits, uint64_t> data((unsigned long long)etl::integral_limits<unsigned long long>::min);
+      unsigned long long value = data.to_ullong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ullong_max)
+    {
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits, uint64_t> data((unsigned long long)etl::integral_limits<unsigned long long>::max);
+      unsigned long long value = data.to_ullong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long long>::max(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ullong_overflow)
+    {
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits + 1, uint64_t> data((unsigned long long)etl::integral_limits<unsigned long long>::min);
+      CHECK_THROW(data.to_ullong(), etl::bitset_overflow);
+    }
+
     //*************************************************************************
     TEST(test_position_set)
     {
diff --git a/test/test_bitset_new_ext_default_element_type.cpp b/test/test_bitset_new_ext_default_element_type.cpp
index 6945376d..a91cc135 100644
--- a/test/test_bitset_new_ext_default_element_type.cpp
+++ b/test/test_bitset_new_ext_default_element_type.cpp
@@ -1082,6 +1082,62 @@ namespace
       CHECK_EQUAL(std::numeric_limits<uint64_t>::max(), value);
     }
 
+    //*************************************************************************
+    TEST(test_to_ulong_min)
+    {
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits>::buffer_type buffer;
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits> data((unsigned long)etl::integral_limits<unsigned long>::min, buffer);
+      unsigned long value = data.to_ulong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ulong_max)
+    {
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits>::buffer_type buffer;
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits> data((unsigned long)etl::integral_limits<unsigned long>::max, buffer);
+      unsigned long value = data.to_ulong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long>::max(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ulong_overflow)
+    {
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits + 1>::buffer_type buffer;
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits + 1> data((unsigned long)etl::integral_limits<unsigned long>::min, buffer);
+      CHECK_THROW(data.to_ulong(), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ullong_min)
+    {
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits>::buffer_type buffer;
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits> data((unsigned long long)etl::integral_limits<unsigned long long>::min, buffer);
+      unsigned long long value = data.to_ullong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ullong_max)
+    {
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits>::buffer_type buffer;
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits> data((unsigned long long)etl::integral_limits<unsigned long long>::max, buffer);
+      unsigned long long value = data.to_ullong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long long>::max(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ullong_overflow)
+    {
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits + 1>::buffer_type buffer;
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits + 1> data((unsigned long long)etl::integral_limits<unsigned long long>::min, buffer);
+      CHECK_THROW(data.to_ullong(), etl::bitset_overflow);
+    }
+
     //*************************************************************************
     TEST(test_position_set)
     {
diff --git a/test/test_bitset_new_ext_explicit_single_element_type.cpp b/test/test_bitset_new_ext_explicit_single_element_type.cpp
index d98c779d..eb186deb 100644
--- a/test/test_bitset_new_ext_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_ext_explicit_single_element_type.cpp
@@ -1110,6 +1110,63 @@ namespace
       CHECK_EQUAL(std::numeric_limits<uint64_t>::max(), value);
     }
 
+    //*************************************************************************
+    TEST(test_to_ulong_min)
+    {
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits, uint64_t> data((unsigned long)etl::integral_limits<unsigned long>::min, buffer);
+      unsigned long value = data.to_ulong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ulong_max)
+    {
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits, uint64_t> data((unsigned long)etl::integral_limits<unsigned long>::max, buffer);
+      unsigned long value = data.to_ulong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long>::max(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ulong_overflow)
+    {
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits + 1, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits + 1, uint64_t> data((unsigned long)etl::integral_limits<unsigned long>::min, buffer);
+      CHECK_THROW(data.to_ulong(), etl::bitset_overflow);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ullong_min)
+    {
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits, uint64_t> data((unsigned long long)etl::integral_limits<unsigned long long>::min, buffer);
+      unsigned long long value = data.to_ullong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ullong_max)
+    {
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits, uint64_t> data((unsigned long long)etl::integral_limits<unsigned long long>::max, buffer);
+      unsigned long long value = data.to_ullong();
+
+      CHECK_EQUAL(std::numeric_limits<unsigned long long>::max(), value);
+    }
+
+    //*************************************************************************
+    TEST(test_to_ullong_overflow)
+    {
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits + 1, uint64_t>::buffer_type buffer;
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits + 1, uint64_t> data((unsigned long long)etl::integral_limits<unsigned long long>::min, buffer);    
+      
+      CHECK_THROW(data.to_ullong(), etl::bitset_overflow);
+    }
+
     //*************************************************************************
     TEST(test_position_set)
     {

From 664bdac4bddd105925f8cc7d4b910af4c72d1151 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sun, 21 Jan 2024 15:02:01 +0000
Subject: [PATCH 040/131] Initial refactor

---
 include/etl/optional.h | 437 +----------------------------------------
 1 file changed, 1 insertion(+), 436 deletions(-)

diff --git a/include/etl/optional.h b/include/etl/optional.h
index d85763d2..c638427c 100644
--- a/include/etl/optional.h
+++ b/include/etl/optional.h
@@ -103,15 +103,8 @@ namespace etl
   /// See http://en.cppreference.com/w/cpp/utility/optional
   ///\tparam T The type to store.
   ///\ingroup utilities
-  //*****************************************************************************
-  template <typename T, bool is_pod = etl::is_pod<T>::value>
-  class optional;
-
-  //*****************************************************************************
-  /// For non POD types.
-  //*****************************************************************************
   template <typename T>
-  class optional<T, false>
+  class optional
   {
   public:
 
@@ -682,434 +675,6 @@ namespace etl
     storage_type storage;
   };
 
-  //*****************************************************************************
-  /// For arithmetic or pointer types.
-  ///\tparam T The type to store.
-  ///\ingroup utilities
-  //*****************************************************************************
-  template <typename T>
-  class optional<T, true>
-  {
-  public:
-
-    typedef T value_type;
-
-    //***************************************************************************
-    /// Constructor.
-    //***************************************************************************
-    ETL_CONSTEXPR14 optional()
-      : valid(false)
-      , storage()
-    {
-    }
-
-    //***************************************************************************
-    /// Constructor with nullopt.
-    //***************************************************************************
-    ETL_CONSTEXPR14 optional(etl::nullopt_t)
-      : valid(false)
-      , storage()
-    {
-    }
-
-    //***************************************************************************
-    /// Copy constructor.
-    //***************************************************************************
-    ETL_CONSTEXPR14 optional(const optional& other)
-      : valid(bool(other))
-      , storage(other.storage)
-    {
-    }
-
-#if ETL_USING_CPP11
-    //***************************************************************************
-    /// Move constructor.
-    //***************************************************************************
-    ETL_CONSTEXPR14 optional(optional&& other)
-      : valid(bool(other))
-      , storage(etl::move(other.storage))
-    {
-    }
-#endif
-
-    //***************************************************************************
-    /// Constructor from value type.
-    //***************************************************************************
-    ETL_CONSTEXPR14 optional(const T& value_)
-      : valid(true)
-      , storage(value_)
-    {
-    }
-
-#if ETL_USING_CPP11
-    //***************************************************************************
-    /// Constructor from value type.
-    //***************************************************************************
-    ETL_CONSTEXPR14 optional(T&& value_)
-      : valid(true)
-      , storage(etl::move(value_))
-    {
-    }
-#endif
-
-    //***************************************************************************
-    /// Assignment operator from nullopt.
-    //***************************************************************************
-    ETL_CONSTEXPR14 optional& operator =(etl::nullopt_t)
-    {
-      valid = false;
-      return *this;
-    }
-
-    //***************************************************************************
-    /// Assignment operator from optional.
-    //***************************************************************************
-    ETL_CONSTEXPR14 optional& operator =(const optional& other)
-    {
-      if (this != &other)
-      {
-        storage.value = other.storage.value;
-        valid = other.valid;
-      }
-
-      return *this;
-    }
-
-#if ETL_USING_CPP11
-    //***************************************************************************
-    /// Assignment operator from optional.
-    //***************************************************************************
-    ETL_CONSTEXPR14 optional& operator =(optional&& other)
-    {
-      if (this != &other)
-      {
-        storage.value = etl::move(other.storage.value);
-        valid = other.valid;
-      }
-
-      return *this;
-    }
-#endif
-
-    //***************************************************************************
-    /// Assignment operator from value type.
-    //***************************************************************************
-    ETL_CONSTEXPR14 optional& operator =(const T& value_)
-    {
-      storage.value = value_;
-      valid = true;
-
-      return *this;
-    }
-
-#if ETL_USING_CPP11
-    //***************************************************************************
-    /// Assignment operator from value type.
-    //***************************************************************************
-    ETL_CONSTEXPR14 optional& operator =(T&& value_)
-    {
-      storage.value = etl::move(value_);
-      valid = true;
-
-      return *this;
-    }
-#endif
-
-    //***************************************************************************
-    /// Pointer operator.
-    //***************************************************************************
-    ETL_CONSTEXPR14 T* operator ->()
-    {
-#if ETL_IS_DEBUG_BUILD
-      ETL_ASSERT(valid, ETL_ERROR(optional_invalid));
-#endif
-
-      return &storage.value;
-    }
-
-    //***************************************************************************
-    /// Pointer operator.
-    //***************************************************************************
-    ETL_CONSTEXPR14 const T* operator ->() const
-    {
-#if ETL_IS_DEBUG_BUILD
-      ETL_ASSERT(valid, ETL_ERROR(optional_invalid));
-#endif
-
-      return &storage.value;
-    }
-
-    //***************************************************************************
-    /// Dereference operator.
-    //***************************************************************************
-    ETL_CONSTEXPR14 T& operator *() ETL_LVALUE_REF_QUALIFIER
-    {
-#if ETL_IS_DEBUG_BUILD
-      ETL_ASSERT(valid, ETL_ERROR(optional_invalid));
-#endif
-
-      return storage.value;
-    }
-
-    //***************************************************************************
-    /// Dereference operator.
-    //***************************************************************************
-    ETL_CONSTEXPR14 const T& operator *() const ETL_LVALUE_REF_QUALIFIER
-    {
-#if ETL_IS_DEBUG_BUILD
-      ETL_ASSERT(valid, ETL_ERROR(optional_invalid));
-#endif
-
-      return storage.value;
-    }
-
-#if ETL_USING_CPP11
-    //***************************************************************************
-    /// Dereference operator.
-    //***************************************************************************
-    ETL_CONSTEXPR14 T&& operator *()&&
-    {
-#if ETL_IS_DEBUG_BUILD
-      ETL_ASSERT(valid, ETL_ERROR(optional_invalid));
-#endif
-
-      return etl::move(storage.value);
-    }
-
-    //***************************************************************************
-    /// Dereference operator.
-    //***************************************************************************
-    ETL_CONSTEXPR14 const T&& operator *() const&&
-    {
-#if ETL_IS_DEBUG_BUILD
-      ETL_ASSERT(valid, ETL_ERROR(optional_invalid));
-#endif
-
-      return etl::move(storage.value);
-    }
-#endif
-
-    //***************************************************************************
-    /// Bool conversion operator.
-    //***************************************************************************
-    ETL_CONSTEXPR14
-    ETL_EXPLICIT operator bool() const
-    {
-      return valid;
-    }
-
-    //***************************************************************************
-    // Check whether optional contains value
-    //***************************************************************************
-    ETL_CONSTEXPR14 bool has_value() const ETL_NOEXCEPT
-    {
-      return valid;
-    }
-
-    //***************************************************************************
-    /// Get a reference to the value.
-    //***************************************************************************
-    ETL_CONSTEXPR14 T& value() ETL_LVALUE_REF_QUALIFIER
-    {
-#if ETL_IS_DEBUG_BUILD
-      ETL_ASSERT(valid, ETL_ERROR(optional_invalid));
-#endif
-
-      return storage.value;
-    }
-
-    //***************************************************************************
-    /// Get a const reference to the value.
-    //***************************************************************************
-    ETL_CONSTEXPR14 const T& value() const ETL_LVALUE_REF_QUALIFIER
-    {
-#if ETL_IS_DEBUG_BUILD
-      ETL_ASSERT(valid, ETL_ERROR(optional_invalid));
-#endif
-
-      return storage.value;
-    }
-
-    //***************************************************************************
-    /// Gets the value or a default if no valid.
-    //***************************************************************************
-    ETL_CONSTEXPR14 T value_or(const T& default_value) const ETL_LVALUE_REF_QUALIFIER
-    {
-      return valid ? value() : default_value;
-    }
-
-#if ETL_USING_CPP11
-    //***************************************************************************
-    /// Get an rvalue reference to the value.
-    //***************************************************************************
-    ETL_CONSTEXPR14 T&& value()&&
-    {
-#if ETL_IS_DEBUG_BUILD
-      ETL_ASSERT(valid, ETL_ERROR(optional_invalid));
-#endif
-
-      return etl::move(storage.value);
-    }
-
-    //***************************************************************************
-    /// Get a const rvalue reference to the value.
-    //***************************************************************************
-    ETL_CONSTEXPR14 const T&& value() const&&
-    {
-#if ETL_IS_DEBUG_BUILD
-      ETL_ASSERT(valid, ETL_ERROR(optional_invalid));
-#endif
-
-      return etl::move(storage.value);
-    }
-
-    //***************************************************************************
-    /// Gets the value or a default if not valid.
-    //***************************************************************************
-    template <typename U>
-    ETL_CONSTEXPR20_STL
-    etl::enable_if_t<etl::is_convertible<U, T>::value, T>
-      value_or(U&& default_value) const&
-    {
-      if (has_value())
-      {
-        return value();
-      }
-      else
-      {
-        return static_cast<T>(etl::forward<U>(default_value));
-      }
-    }
-
-    //***************************************************************************
-    /// Gets the value or a default if not valid.
-    //***************************************************************************
-    template <typename U>
-    ETL_CONSTEXPR20_STL
-    etl::enable_if_t<etl::is_convertible<U, T>::value, T>
-      value_or(U&& default_value) &&
-    {
-      if (has_value())
-      {
-        return etl::move(value());
-      }
-      else
-      {
-        return static_cast<T>(etl::forward<U>(default_value));
-      }
-    }
-#endif
-
-    //***************************************************************************
-    /// Swaps this value with another.
-    //***************************************************************************
-    ETL_CONSTEXPR14 void swap(optional& other)
-    {
-      optional temp(*this);
-      *this = other;
-      other = temp;
-    }
-
-    //***************************************************************************
-    /// Reset back to invalid.
-    //***************************************************************************
-    ETL_CONSTEXPR14 void reset()
-    {
-      valid = false;
-    }
-
-#if ETL_USING_CPP11  && ETL_NOT_USING_STLPORT && !defined(ETL_OPTIONAL_FORCE_CPP03_IMPLEMENTATION)
-    //*************************************************************************
-    /// Emplaces a value.
-    ///\param args The arguments to construct with.
-    //*************************************************************************
-    template <typename ... Args>
-    ETL_CONSTEXPR14 void emplace(Args && ... args)
-    {
-      storage.value = T(ETL_OR_STD::forward<Args>(args)...);
-      valid = true;
-    }
-#else
-    //*************************************************************************
-    /// Emplaces a value.
-    /// 0 parameters.
-    //*************************************************************************
-    void emplace()
-    {
-      storage.value = value_type();
-      valid = true;
-    }
-
-    //*************************************************************************
-    /// Emplaces a value.
-    /// 1 parameter.
-    //*************************************************************************
-    template <typename T1>
-    void emplace(const T1& value1)
-    {
-      storage.value = value1;
-      valid = true;
-    }
-
-    //*************************************************************************
-    /// Emplaces a value.
-    /// 2 parameters.
-    //*************************************************************************
-    template <typename T1, typename T2>
-    void emplace(const T1& value1, const T2& value2)
-    {
-      storage.value = T(value1, value2);
-      valid = true;
-    }
-
-    //*************************************************************************
-    /// Emplaces a value.
-    /// 3 parameters.
-    //*************************************************************************
-    template <typename T1, typename T2, typename T3>
-    void emplace(const T1& value1, const T2& value2, const T3& value3)
-    {
-      storage.value = T(value1, value2, value3);
-      valid = true;
-    }
-
-    //*************************************************************************
-    /// Emplaces a value.
-    /// 4 parameters.
-    //*************************************************************************
-    template <typename T1, typename T2, typename T3, typename T4>
-    void emplace(const T1& value1, const T2& value2, const T3& value3, const T4& value4)
-    {
-      storage.value = T(value1, value2, value3, value4);
-      valid = true;
-    }
-#endif
-
-  private:
-
-    bool valid;
-
-    struct dummy_t {};
-
-    union storage_type
-    {
-      dummy_t dummy;
-      T       value;
-
-      ETL_CONSTEXPR storage_type()
-        : dummy()
-      {
-      }
-
-      ETL_CONSTEXPR storage_type(const T& v)
-        : value(v) 
-      {
-      }
-    };
-
-    storage_type storage;
-  };
-
 #include "private/diagnostic_uninitialized_push.h"
 
   //***************************************************************************

From 1a0036366ddd43a13c8fd71af51e10c89b70241c Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sun, 21 Jan 2024 15:41:50 +0000
Subject: [PATCH 041/131] Added test for #819

---
 test/test_optional.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/test_optional.cpp b/test/test_optional.cpp
index 8f07862b..a6bbc650 100644
--- a/test/test_optional.cpp
+++ b/test/test_optional.cpp
@@ -629,6 +629,21 @@ namespace
       CHECK_EQUAL(42, (*opt).v);
     }
 #endif
+
+    //*************************************************************************
+    TEST(test_optional_issue_819)
+    {
+      // The code below should compile without error.
+      class optional_type 
+      {
+      public:
+
+        static etl::optional<optional_type> function()
+        {
+          return {};
+        }
+      };
+    }
   };
 }
 

From d2c7a206e7820fc13c6dd620c7756e34aec4c469 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 23 Jan 2024 13:43:57 +0000
Subject: [PATCH 042/131] Removed AVR STL implementation from support

---
 support/avr-stl-1.1.1.zip | Bin 202024 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 support/avr-stl-1.1.1.zip

diff --git a/support/avr-stl-1.1.1.zip b/support/avr-stl-1.1.1.zip
deleted file mode 100644
index 335f511a109a208dcf383688cfefcd765a462a6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 202024
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


From 77513730e09b742a2fc9ad5ecb0ebb7b78b54a7f Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Thu, 25 Jan 2024 14:22:26 +0000
Subject: [PATCH 043/131] Fixed shadow warnings in all files

#823 Multiple variable shadowing warnings in private/bitset_new.h
---
 include/etl/basic_string_stream.h             |  68 +++----
 include/etl/byte_stream.h                     |  48 ++---
 include/etl/frame_check_sequence.h            |   2 +-
 include/etl/fsm.h                             |   4 +-
 include/etl/generators/fsm_generator.h        |   4 +-
 .../etl/generators/message_router_generator.h |  12 +-
 include/etl/message_broker.h                  |   4 +-
 include/etl/message_bus.h                     |  22 +--
 include/etl/message_router.h                  |  12 +-
 include/etl/multi_range.h                     |  14 +-
 include/etl/private/bitset_legacy.h           |   2 +-
 include/etl/private/bitset_new.h              | 102 +++++++----
 include/etl/queue_spsc_locked.h               |   6 +-
 include/etl/radix.h                           |  20 +--
 include/etl/to_arithmetic.h                   |   6 +-
 include/etl/unordered_map.h                   |  22 +--
 include/etl/unordered_multimap.h              |  28 +--
 include/etl/unordered_multiset.h              |  28 +--
 include/etl/unordered_set.h                   |  32 ++--
 test/CMakeLists.txt                           |   2 +
 test/UnitTest++/CheckMacros.h                 |  40 ++---
 test/UnitTest++/ExecuteTest.h                 |   8 +-
 test/run-tests.sh                             |   2 +-
 test/test_algorithm.cpp                       |   6 +-
 test/test_bitset_new_default_element_type.cpp |  12 +-
 ...itset_new_explicit_single_element_type.cpp |  12 +-
 ...st_bitset_new_ext_default_element_type.cpp |  17 +-
 ...t_new_ext_explicit_single_element_type.cpp |  20 +--
 test/test_callback_service.cpp                |  24 +--
 test/test_callback_timer.cpp                  |  82 ++++-----
 test/test_callback_timer_atomic.cpp           |  82 ++++-----
 test/test_callback_timer_interrupt.cpp        |  74 ++++----
 test/test_callback_timer_locked.cpp           |  82 ++++-----
 test/test_circular_buffer_external_buffer.cpp |  63 ++++++-
 test/test_circular_iterator.cpp               |  40 ++---
 test/test_compare.cpp                         |  18 +-
 test/test_delegate.cpp                        | 166 +++++++++---------
 test/test_delegate_cpp03.cpp                  | 106 +++++------
 test/test_delegate_service.cpp                |  24 +--
 test/test_delegate_service_compile_time.cpp   |   8 +-
 test/test_delegate_service_cpp03.cpp          |  10 +-
 test/test_deque.cpp                           | 133 +++++++-------
 test/test_fixed_iterator.cpp                  |  14 +-
 test/test_function.cpp                        |  66 +++----
 test/test_indirect_vector.cpp                 |   8 +-
 test/test_indirect_vector_external_buffer.cpp |   8 +-
 test/test_intrusive_forward_list.cpp          |  58 +++---
 test/test_memory.cpp                          |  38 ++--
 test/test_parameter_type.cpp                  |  18 +-
 test/test_pool.cpp                            |   4 +-
 test/test_pool_external_buffer.cpp            |   4 +-
 test/test_set.cpp                             |   9 +-
 test/test_shared_message.cpp                  |  50 +++---
 test/test_type_traits.cpp                     |   6 +-
 test/test_vector.cpp                          |   4 +-
 test/test_vector_external_buffer.cpp          |   4 +-
 test/test_vector_non_trivial.cpp              |   3 -
 test/vs2022/etl.vcxproj                       |  24 +--
 58 files changed, 928 insertions(+), 857 deletions(-)

diff --git a/include/etl/basic_string_stream.h b/include/etl/basic_string_stream.h
index e91ee1fe..2b466055 100644
--- a/include/etl/basic_string_stream.h
+++ b/include/etl/basic_string_stream.h
@@ -58,28 +58,28 @@ namespace etl
     }
 
     //*************************************************************************
-    /// Construct from text and format spec.
+    /// Construct from text and format fmt.
     //*************************************************************************
     basic_string_stream(TIString& text_, const TFormat& spec_)
       : text(text_)
-      , spec(spec_)
+      , format(spec_)
     {
     }
 
     //*************************************************************************
-    /// Set the format spec.
+    /// Set the format fmt.
     //*************************************************************************
     void set_format(const TFormat& spec_)
     {
-      spec = spec_;
+      format = spec_;
     }
 
     //*************************************************************************
-    /// Get a const reference to the format spec.
+    /// Get a const reference to the format fmt.
     //*************************************************************************
     const TFormat& get_format() const
     {
-      return spec;
+      return format;
     }
 
     //*************************************************************************
@@ -121,27 +121,27 @@ namespace etl
     //*********************************
     /// TFormat
     //*********************************
-    friend basic_string_stream& operator <<(basic_string_stream& ss, const TFormat& spec)
+    friend basic_string_stream& operator <<(basic_string_stream& ss, const TFormat& fmt)
     {
-      ss.spec = spec;
+      ss.format = fmt;
       return ss;
     }
 
     //*********************************
     /// etl::base_spec from etl::setbase, etl::bin, etl::oct, etl::dec & etl::hex stream manipulators
     //*********************************
-    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::base_spec spec)
+    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::base_spec fmt)
     {
-      ss.spec.base(spec.base);
+      ss.format.base(fmt.base);
       return ss;
     }
 
     //*********************************
     /// etl::width_spec from etl::setw stream manipulator
     //*********************************
-    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::width_spec spec)
+    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::width_spec fmt)
     {
-      ss.spec.width(spec.width);
+      ss.format.width(fmt.width);
       return ss;
     }
 
@@ -149,63 +149,63 @@ namespace etl
     /// etl::fill_spec from etl::setfill stream manipulator
     //*********************************
     template <typename TChar>
-    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::fill_spec<TChar> spec)
+    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::fill_spec<TChar> fmt)
     {
-      ss.spec.fill(spec.fill);
+      ss.format.fill(fmt.fill);
       return ss;
     }
 
     //*********************************
     /// etl::precision_spec from etl::setprecision stream manipulator
     //*********************************
-    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::precision_spec spec)
+    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::precision_spec fmt)
     {
-      ss.spec.precision(spec.precision);
+      ss.format.precision(fmt.precision);
       return ss;
     }
 
     //*********************************
     /// etl::boolalpha_spec from etl::boolalpha & etl::noboolalpha stream manipulators
     //*********************************
-    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::boolalpha_spec spec)
+    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::boolalpha_spec fmt)
     {
-      ss.spec.boolalpha(spec.boolalpha);
+      ss.format.boolalpha(fmt.boolalpha);
       return ss;
     }
 
     //*********************************
     /// etl::uppercase_spec from etl::uppercase & etl::nouppercase stream manipulators
     //*********************************
-    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::uppercase_spec spec)
+    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::uppercase_spec fmt)
     {
-      ss.spec.upper_case(spec.upper_case);
+      ss.format.upper_case(fmt.upper_case);
       return ss;
     }
 
     //*********************************
     /// etl::showbase_spec from etl::showbase & etl::noshowbase stream manipulators
     //*********************************
-    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::showbase_spec spec)
+    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::showbase_spec fmt)
     {
-      ss.spec.show_base(spec.show_base);
+      ss.format.show_base(fmt.show_base);
       return ss;
     }
 
     //*********************************
     /// etl::left_spec from etl::left stream manipulator
     //*********************************
-    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::left_spec /*spec*/)
+    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::left_spec /*fmt*/)
     {
-      ss.spec.left();
+      ss.format.left();
       return ss;
     }
 
     //*********************************
     /// etl::right_spec from etl::left stream manipulator
     //*********************************
-    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::right_spec /*spec*/)
+    friend basic_string_stream& operator <<(basic_string_stream& ss, etl::private_basic_format_spec::right_spec /*fmt*/)
     {
-      ss.spec.right();
+      ss.format.right();
       return ss;
     }
 
@@ -214,7 +214,7 @@ namespace etl
     //*********************************
     friend basic_string_stream& operator <<(basic_string_stream& ss, TStringView view)
     {
-      etl::to_string(view, ss.text, ss.spec, true);
+      etl::to_string(view, ss.text, ss.format, true);
       return ss;
     }
 
@@ -241,9 +241,9 @@ namespace etl
     //*********************************
     /// From a string interface
     //*********************************
-    friend basic_string_stream& operator <<(basic_string_stream& ss, const TIString& text)
+    friend basic_string_stream& operator <<(basic_string_stream& ss, const TIString& t)
     {
-      etl::to_string(text, ss.text, ss.spec, true);
+      etl::to_string(t, ss.text, ss.format, true);
       return ss;
     }
 
@@ -251,9 +251,9 @@ namespace etl
     /// From a string
     //*********************************
     template <template <size_t> class TString, size_t SIZE>
-    friend basic_string_stream& operator <<(basic_string_stream& ss, const TString<SIZE>& text)
+    friend basic_string_stream& operator <<(basic_string_stream& ss, const TString<SIZE>& t)
     {
-      const TIString& itext = text;
+      const TIString& itext = t;
       etl::to_string(itext, ss.str(), ss.get_format(), true);
       return ss;
     }
@@ -264,14 +264,14 @@ namespace etl
     template <typename T>
     friend basic_string_stream& operator <<(basic_string_stream& ss, const T& value)
     {
-      etl::to_string(value, ss.text, ss.spec, true);
+      etl::to_string(value, ss.text, ss.format, true);
       return ss;
     }
 
   private:
 
-    TIString&    text;
-    TFormat spec;
+    TIString& text;
+    TFormat   format;
 
     basic_string_stream(const basic_string_stream&) ETL_DELETE;
     basic_string_stream& operator =(const basic_string_stream&) ETL_DELETE;
diff --git a/include/etl/byte_stream.h b/include/etl/byte_stream.h
index aaa9d8a4..17d58f4e 100644
--- a/include/etl/byte_stream.h
+++ b/include/etl/byte_stream.h
@@ -69,7 +69,7 @@ namespace etl
     byte_stream_writer(etl::span<char> span_, etl::endian stream_endianness_, callback_type callback_ = callback_type())
       : pdata(span_.begin())
       , pcurrent(span_.begin())
-      , length(span_.size_bytes())
+      , stream_length(span_.size_bytes())
       , stream_endianness(stream_endianness_)
       , callback(callback_)
     {
@@ -81,7 +81,7 @@ namespace etl
     byte_stream_writer(etl::span<unsigned char> span_, etl::endian stream_endianness_, callback_type callback_ = callback_type())
       : pdata(reinterpret_cast<char*>(span_.begin()))
       , pcurrent(reinterpret_cast<char*>(span_.begin()))
-      , length(span_.size_bytes())
+      , stream_length(span_.size_bytes())
       , stream_endianness(stream_endianness_)
       , callback(callback_)
     {
@@ -93,7 +93,7 @@ namespace etl
     byte_stream_writer(void* begin_, void* end_, etl::endian stream_endianness_, callback_type callback_ = callback_type())
       : pdata(reinterpret_cast<char*>(begin_))
       , pcurrent(reinterpret_cast<char*>(begin_))
-      , length(etl::distance(reinterpret_cast<char*>(begin_), reinterpret_cast<char*>(end_)))
+      , stream_length(etl::distance(reinterpret_cast<char*>(begin_), reinterpret_cast<char*>(end_)))
       , stream_endianness(stream_endianness_)
       , callback(callback_)
     {
@@ -105,7 +105,7 @@ namespace etl
     byte_stream_writer(void* begin_, size_t length_, etl::endian stream_endianness_, callback_type callback_ = callback_type())
       : pdata(reinterpret_cast<char*>(begin_))
       , pcurrent(reinterpret_cast<char*>(begin_))
-      , length(length_)
+      , stream_length(length_)
       , stream_endianness(stream_endianness_)
       , callback(callback_)
     {
@@ -118,7 +118,7 @@ namespace etl
     byte_stream_writer(T(&begin_)[Size], etl::endian stream_endianness_, callback_type callback_ = callback_type())
       : pdata(begin_)
       , pcurrent(begin_)
-      , length(begin_ + (Size * sizeof(T)))
+      , stream_length(begin_ + (Size * sizeof(T)))
       , stream_endianness(stream_endianness_)
       , callback(callback_)
     {
@@ -333,7 +333,7 @@ namespace etl
     //***************************************************************************
     etl::span<char> free_data()
     {
-      return etl::span<char>(pcurrent, pdata + length);
+      return etl::span<char>(pcurrent, pdata + stream_length);
     }
 
     //***************************************************************************
@@ -341,7 +341,7 @@ namespace etl
     //***************************************************************************
     etl::span<const char> free_data() const
     {
-      return etl::span<const char>(pcurrent, pdata + length);
+      return etl::span<const char>(pcurrent, pdata + stream_length);
     }
 
     //***************************************************************************
@@ -349,7 +349,7 @@ namespace etl
     //***************************************************************************
     etl::span<char> data()
     {
-      return etl::span<char>(pdata, pdata + length);
+      return etl::span<char>(pdata, pdata + stream_length);
     }
 
     //***************************************************************************
@@ -357,7 +357,7 @@ namespace etl
     //***************************************************************************
     etl::span<const char> data() const
     {
-      return etl::span<const char>(pdata, pdata + length);
+      return etl::span<const char>(pdata, pdata + stream_length);
     }
 
     //***************************************************************************
@@ -389,7 +389,7 @@ namespace etl
     //***************************************************************************
     size_t capacity() const
     {
-      return length;
+      return stream_length;
     }
 
     //***************************************************************************
@@ -410,7 +410,7 @@ namespace etl
     }
 
     //***************************************************************************
-    /// Sets the function to call afer every write.
+    /// Sets the function to call after every write.
     //***************************************************************************
     void set_callback(callback_type callback_)
     {
@@ -418,7 +418,7 @@ namespace etl
     }
 
     //***************************************************************************
-    /// Gets the function to call afer every write.
+    /// Gets the function to call after every write.
     //***************************************************************************
     callback_type get_callback() const
     {
@@ -481,7 +481,7 @@ namespace etl
 
     char* const       pdata;             ///< The start of the byte stream buffer.
     char*             pcurrent;          ///< The current position in the byte stream buffer.
-    const size_t      length;            ///< The length of the byte stream buffer.
+    const size_t      stream_length;     ///< The length of the byte stream buffer.
     const etl::endian stream_endianness; ///< The endianness of the stream data.
     callback_type     callback;          ///< An optional callback on every step on the write buffer.
   };
@@ -503,7 +503,7 @@ namespace etl
     byte_stream_reader(etl::span<char> span_, etl::endian stream_endianness_)
       : pdata(span_.begin())
       , pcurrent(span_.begin())
-      , length(span_.size_bytes())
+      , stream_length(span_.size_bytes())
       , stream_endianness(stream_endianness_)
     {
     }
@@ -514,7 +514,7 @@ namespace etl
     byte_stream_reader(etl::span<const char> span_, etl::endian stream_endianness_)
       : pdata(span_.begin())
       , pcurrent(span_.begin())
-      , length(span_.size_bytes())
+      , stream_length(span_.size_bytes())
       , stream_endianness(stream_endianness_)
     {
     }
@@ -525,7 +525,7 @@ namespace etl
     byte_stream_reader(const void* begin_, const void* end_, etl::endian stream_endianness_)
       : pdata(reinterpret_cast<const char*>(begin_))
       , pcurrent(reinterpret_cast<const char*>(begin_))
-      , length(etl::distance(reinterpret_cast<const char*>(begin_), reinterpret_cast<const char*>(end_)))
+      , stream_length(etl::distance(reinterpret_cast<const char*>(begin_), reinterpret_cast<const char*>(end_)))
       , stream_endianness(stream_endianness_)
     {
     }
@@ -536,7 +536,7 @@ namespace etl
     byte_stream_reader(const void* begin_, size_t length_, etl::endian stream_endianness_)
       : pdata(reinterpret_cast<const char*>(begin_))
       , pcurrent(reinterpret_cast<const char*>(begin_))
-      , length(length_)
+      , stream_length(length_)
       , stream_endianness(stream_endianness_)
     {
     }
@@ -548,7 +548,7 @@ namespace etl
     byte_stream_reader(T(&begin_)[Size], etl::endian stream_endianness_)
       : pdata(begin_)
       , pcurrent(begin_)
-      , length(begin_ + (Size * sizeof(T)))
+      , stream_length(begin_ + (Size * sizeof(T)))
       , stream_endianness(stream_endianness_)
     {
     }
@@ -560,7 +560,7 @@ namespace etl
     byte_stream_reader(const T(&begin_)[Size], etl::endian stream_endianness_)
       : pdata(begin_)
       , pcurrent(begin_)
-      , length(begin_ + (Size * sizeof(T)))
+      , stream_length(begin_ + (Size * sizeof(T)))
       , stream_endianness(stream_endianness_)
     {
     }
@@ -766,7 +766,7 @@ namespace etl
     //***************************************************************************
     etl::span<const char> free_data() const
     {
-      return etl::span<const char>(pcurrent, pdata + length);
+      return etl::span<const char>(pcurrent, pdata + stream_length);
     }
 
     //***************************************************************************
@@ -774,7 +774,7 @@ namespace etl
     //***************************************************************************
     etl::span<const char> data() const
     {
-      return etl::span<const char>(pdata, pdata + length);
+      return etl::span<const char>(pdata, pdata + stream_length);
     }
 
     //***************************************************************************
@@ -790,7 +790,7 @@ namespace etl
     //***************************************************************************
     size_t size_bytes() const
     {
-      return length;
+      return stream_length;
     }
 
     //***************************************************************************
@@ -801,7 +801,7 @@ namespace etl
     {
       size_t used = etl::distance(pdata, pcurrent);
 
-      return (length - used) / sizeof(T);
+      return (stream_length - used) / sizeof(T);
     }
 
     //***************************************************************************
@@ -855,7 +855,7 @@ namespace etl
 
     const char* const pdata;             ///< The start of the byte stream buffer.
     const char*       pcurrent;          ///< The current position in the byte stream buffer.
-    const size_t      length;            ///< The length of the byte stream buffer.
+    const size_t      stream_length;     ///< The length of the byte stream buffer.
     const etl::endian stream_endianness; ///< The endianness of the stream data.
   };
 
diff --git a/include/etl/frame_check_sequence.h b/include/etl/frame_check_sequence.h
index 0311c43a..ec67e1ba 100644
--- a/include/etl/frame_check_sequence.h
+++ b/include/etl/frame_check_sequence.h
@@ -76,7 +76,7 @@ namespace etl
       }
 
       //***********************************
-      add_insert_iterator& operator =(typename TFrame_Check_Sequence::value_type value)
+      add_insert_iterator& operator =(uint8_t value)
       {
         p_fcs->add(value);
         return *this;
diff --git a/include/etl/fsm.h b/include/etl/fsm.h
index 19584a91..67f89850 100644
--- a/include/etl/fsm.h
+++ b/include/etl/fsm.h
@@ -587,11 +587,11 @@ namespace etl
 
     //********************************************
     template <typename TMessage>
-    bool process_event_type(const etl::imessage& msg, etl::fsm_state_id_t& state_id)
+    bool process_event_type(const etl::imessage& msg, etl::fsm_state_id_t& new_state_id)
     {
       if (TMessage::ID == msg.get_message_id())
       {
-        state_id = static_cast<TDerived*>(this)->on_event(static_cast<const TMessage&>(msg));
+        new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const TMessage&>(msg));
         return true;
       }
       else
diff --git a/include/etl/generators/fsm_generator.h b/include/etl/generators/fsm_generator.h
index a59d1fa1..3add4b4f 100644
--- a/include/etl/generators/fsm_generator.h
+++ b/include/etl/generators/fsm_generator.h
@@ -613,11 +613,11 @@ namespace etl
 
     //********************************************
     template <typename TMessage>
-    bool process_event_type(const etl::imessage& msg, etl::fsm_state_id_t& state_id)
+    bool process_event_type(const etl::imessage& msg, etl::fsm_state_id_t& new_state_id)
     {
       if (TMessage::ID == msg.get_message_id())
       {
-        state_id = static_cast<TDerived*>(this)->on_event(static_cast<const TMessage&>(msg));
+        new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const TMessage&>(msg));
         return true;
       }
       else
diff --git a/include/etl/generators/message_router_generator.h b/include/etl/generators/message_router_generator.h
index 32903acf..d3676012 100644
--- a/include/etl/generators/message_router_generator.h
+++ b/include/etl/generators/message_router_generator.h
@@ -212,8 +212,8 @@ namespace etl
     }
 
     //********************************************
-    null_message_router(etl::imessage_router& successor)
-      : imessage_router(imessage_router::NULL_MESSAGE_ROUTER, successor)
+    null_message_router(etl::imessage_router& successor_)
+      : imessage_router(imessage_router::NULL_MESSAGE_ROUTER, successor_)
     {
     }
     
@@ -290,8 +290,8 @@ namespace etl
     }
 
     //********************************************
-    message_producer(etl::imessage_router& successor)
-      : imessage_router(imessage_router::NULL_MESSAGE_ROUTER, successor)
+    message_producer(etl::imessage_router& successor_)
+      : imessage_router(imessage_router::NULL_MESSAGE_ROUTER, successor_)
     {
     }
 
@@ -303,8 +303,8 @@ namespace etl
     }
 
     //********************************************
-    message_producer(etl::message_router_id_t id_, etl::imessage_router& successor)
-      : imessage_router(id_, successor)
+    message_producer(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
     {
       ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
     }
diff --git a/include/etl/message_broker.h b/include/etl/message_broker.h
index ad99cb3f..7d000c2c 100644
--- a/include/etl/message_broker.h
+++ b/include/etl/message_broker.h
@@ -228,9 +228,7 @@ namespace etl
       // Always pass the message on to the successor.
       if (has_successor())
       {
-        etl::imessage_router& successor = get_successor();
-
-        successor.receive(destination_router_id, msg);
+        get_successor().receive(destination_router_id, msg);
       }
     }
 
diff --git a/include/etl/message_bus.h b/include/etl/message_bus.h
index 3ab24dba..8ed0737e 100644
--- a/include/etl/message_bus.h
+++ b/include/etl/message_bus.h
@@ -227,11 +227,9 @@ namespace etl
 
       if (has_successor())
       {
-        etl::imessage_router& successor = get_successor();
-
-        if (successor.accepts(message.get_message_id()))
+        if (get_successor().accepts(message.get_message_id()))
         {
-          successor.receive(destination_router_id, message);
+          get_successor().receive(destination_router_id, message);
         }
       }
     }
@@ -306,11 +304,9 @@ namespace etl
 
       if (has_successor())
       {
-        etl::imessage_router& successor = get_successor();
-
-        if (successor.accepts(shared_msg.get_message().get_message_id()))
+        if (get_successor().accepts(shared_msg.get_message().get_message_id()))
         {
-          successor.receive(destination_router_id, shared_msg);
+          get_successor().receive(destination_router_id, shared_msg);
         }
       }
     }
@@ -370,9 +366,9 @@ namespace etl
     //*******************************************
     /// Constructor.
     //*******************************************
-    imessage_bus(router_list_t& list, etl::imessage_router& successor)
-      : imessage_router(etl::imessage_router::MESSAGE_BUS, successor),
-      router_list(list)
+    imessage_bus(router_list_t& router_list_, etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_BUS, successor_),
+      router_list(router_list_)
     {
     }
 
@@ -416,8 +412,8 @@ namespace etl
     //*******************************************
     /// Constructor.
     //*******************************************
-    message_bus(etl::imessage_router& successor)
-      : imessage_bus(router_list, successor)
+    message_bus(etl::imessage_router& successor_)
+      : imessage_bus(router_list, successor_)
     {
     }
 
diff --git a/include/etl/message_router.h b/include/etl/message_router.h
index b7807a77..11ca865c 100644
--- a/include/etl/message_router.h
+++ b/include/etl/message_router.h
@@ -200,8 +200,8 @@ namespace etl
     }
 
     //********************************************
-    null_message_router(etl::imessage_router& successor)
-      : imessage_router(imessage_router::NULL_MESSAGE_ROUTER, successor)
+    null_message_router(etl::imessage_router& successor_)
+      : imessage_router(imessage_router::NULL_MESSAGE_ROUTER, successor_)
     {
     }
     
@@ -278,8 +278,8 @@ namespace etl
     }
 
     //********************************************
-    message_producer(etl::imessage_router& successor)
-      : imessage_router(imessage_router::NULL_MESSAGE_ROUTER, successor)
+    message_producer(etl::imessage_router& successor_)
+      : imessage_router(imessage_router::NULL_MESSAGE_ROUTER, successor_)
     {
     }
 
@@ -291,8 +291,8 @@ namespace etl
     }
 
     //********************************************
-    message_producer(etl::message_router_id_t id_, etl::imessage_router& successor)
-      : imessage_router(id_, successor)
+    message_producer(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
     {
       ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
     }
diff --git a/include/etl/multi_range.h b/include/etl/multi_range.h
index 44c02110..e8297ca8 100644
--- a/include/etl/multi_range.h
+++ b/include/etl/multi_range.h
@@ -324,7 +324,7 @@ namespace etl
     {
       typedef T value_type;
 
-      virtual bool operator()(const value_type& current, const value_type& last) const = 0;
+      virtual bool operator()(const value_type& lhs, const value_type& rhs) const = 0;
     };
 
     //***************************************************************************
@@ -334,9 +334,9 @@ namespace etl
     {
       typedef T value_type;
 
-      virtual bool operator()(const value_type& current, const value_type& last) const ETL_OVERRIDE
+      virtual bool operator()(const value_type& lhs, const value_type& rhs) const ETL_OVERRIDE
       {
-        return etl::not_equal_to<value_type>()(current, last);
+        return etl::not_equal_to<value_type>()(lhs, rhs);
       }
     };
 
@@ -347,9 +347,9 @@ namespace etl
     {
       typedef T value_type;
 
-      virtual bool operator()(const value_type& current, const value_type& last) const ETL_OVERRIDE
+      virtual bool operator()(const value_type& lhs, const value_type& rhs) const ETL_OVERRIDE
       {
-        return etl::less<value_type>()(current, last);
+        return etl::less<value_type>()(lhs, rhs);
       }
     };
 
@@ -360,9 +360,9 @@ namespace etl
     {
       typedef T value_type;
 
-      virtual bool operator()(const value_type& current, const value_type& last) const ETL_OVERRIDE
+      virtual bool operator()(const value_type& lhs, const value_type& rhs) const ETL_OVERRIDE
       {
-        return etl::greater<value_type>()(current, last);
+        return etl::greater<value_type>()(lhs, rhs);
       }
     };
 
diff --git a/include/etl/private/bitset_legacy.h b/include/etl/private/bitset_legacy.h
index 2a37a6a3..593f415b 100644
--- a/include/etl/private/bitset_legacy.h
+++ b/include/etl/private/bitset_legacy.h
@@ -860,7 +860,7 @@ namespace etl
             --dst_index;
 
             // Shift lsb.
-            element_type lsb = element_type((pdata[src_index] & lsb_mask) << lsb_shift);
+            lsb = element_type((pdata[src_index] & lsb_mask) << lsb_shift);
             pdata[dst_index] = lsb;
             --src_index;
           }
diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index 822bdd52..a439ffb4 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -827,13 +827,14 @@ namespace etl
     //*************************************************************************
     /// Initialise from an unsigned long long.
     //*************************************************************************
+    template <typename TElementType>
     ETL_CONSTEXPR14 
     static 
     void initialise(pointer            pbuffer, 
                     size_t             /*number_of_elements*/,
                     unsigned long long value) ETL_NOEXCEPT
     {
-      *pbuffer = static_cast<element_type>(value);
+      *pbuffer = static_cast<TElementType>(value);
     }
 
     //*************************************************************************
@@ -1672,7 +1673,7 @@ namespace etl
           --dst_index;
 
           // Shift lsb.
-          element_type lsb = element_type((pbuffer[src_index] & lsb_mask) << lsb_shift);
+          lsb = element_type((pbuffer[src_index] & lsb_mask) << lsb_shift);
           pbuffer[dst_index] = lsb;
           --src_index;
         }
@@ -1769,28 +1770,49 @@ namespace etl
 
     //*************************************************************************
     /// Initialise from an unsigned long long.
+    /// Enabled if the number of bits in the element equals the number of bits in an unsigned long long.
     //*************************************************************************
+    template <typename TElementType>
     ETL_CONSTEXPR14
     static
-    void initialise(pointer            pbuffer, 
-                    size_t             number_of_elements, 
-                    unsigned long long value) ETL_NOEXCEPT
+    typename etl::enable_if<etl::integral_limits<TElementType>::bits == etl::integral_limits<unsigned long long>::bits, void>::type
+      initialise(pointer            pbuffer, 
+                 size_t             number_of_elements, 
+                 unsigned long long value) ETL_NOEXCEPT
+    {
+      size_t i = 0UL;
+      
+      // Set the non-zero elements.
+      pbuffer[i++] = value;
+
+      // Clear the remaining elements.
+      while (i != number_of_elements)
+      {
+        pbuffer[i++] = All_Clear_Element;
+      }
+    }
+
+    //*************************************************************************
+    /// Initialise from an unsigned long long.
+    /// Enabled if the number of bits in the element doesn't equal the number of bits in an unsigned long long.
+    //*************************************************************************
+    template <typename TElementType>
+    ETL_CONSTEXPR14
+    static
+    typename etl::enable_if<etl::integral_limits<TElementType>::bits != etl::integral_limits<unsigned long long>::bits, void>::type
+      initialise(pointer            pbuffer,
+                 size_t             number_of_elements,
+                 unsigned long long value) ETL_NOEXCEPT
     {
       size_t i = 0UL;
-      const size_t Shift = etl::integral_limits<element_type>::bits;
 
       // Set the non-zero elements.
-      if ETL_IF_CONSTEXPR(etl::integral_limits<element_type>::bits == etl::integral_limits<unsigned long long>::bits)
+      const unsigned long long Shift = etl::integral_limits<element_type>::bits;
+
+      while ((value != 0) && (i != number_of_elements))
       {
-        pbuffer[i++] = value;
-      }
-      else
-      {
-        while ((value != 0) && (i != number_of_elements))
-        {
-          pbuffer[i++] = value & All_Set_Element;
-          value = value >> Shift;
-        }
+        pbuffer[i++] = value & All_Set_Element;
+        value = value >> Shift;
       }
 
       // Clear the remaining elements.
@@ -2029,16 +2051,18 @@ namespace etl
     //*************************************************************************
     /// Construct from a value.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset(unsigned long long value) ETL_NOEXCEPT
+    template <typename TValue>
+    ETL_CONSTEXPR14 bitset(TValue value, typename etl::enable_if<is_integral<TValue>::value>::type* = 0) ETL_NOEXCEPT
       : buffer()
     {
-      implementation::initialise(buffer, Number_Of_Elements, value);
+      implementation::template initialise<element_type>(buffer, Number_Of_Elements, value);
     }
 
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset(const char* text) ETL_NOEXCEPT
+    template <typename TPString>
+    ETL_CONSTEXPR14 bitset(TPString text, typename etl::enable_if<is_same<TPString, const char*>::value>::type* = 0) ETL_NOEXCEPT
       : buffer()
     {
       implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
@@ -2047,7 +2071,8 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset(const wchar_t* text) ETL_NOEXCEPT
+    template <typename TPString>
+    ETL_CONSTEXPR14 bitset(TPString text, typename etl::enable_if<is_same<TPString, const wchar_t*>::value>::type* = 0) ETL_NOEXCEPT
       : buffer()
     {
       implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
@@ -2056,7 +2081,8 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset(const char16_t* text) ETL_NOEXCEPT
+    template <typename TPString>
+    ETL_CONSTEXPR14 bitset(TPString text, typename etl::enable_if<is_same<TPString, const char16_t*>::value>::type* = 0) ETL_NOEXCEPT
       : buffer()
     {
       implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
@@ -2065,7 +2091,8 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset(const char32_t* text) ETL_NOEXCEPT
+    template <typename TPString>
+    ETL_CONSTEXPR14 bitset(TPString text, typename etl::enable_if<is_same<TPString, const char32_t*>::value>::type* = 0) ETL_NOEXCEPT
       : buffer()
     {
       implementation::from_string(buffer, Number_Of_Elements, Active_Bits, text);
@@ -2981,22 +3008,24 @@ namespace etl
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
-      implementation::initialise(pbuffer, Number_Of_Elements, value);
+      implementation::template initialise<element_type>(pbuffer, Number_Of_Elements, value);
     }
 
     //*************************************************************************
     /// Construct from a value.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(unsigned long long value, buffer_type& buffer) ETL_NOEXCEPT
+    template <typename TValue>
+    ETL_CONSTEXPR14 bitset_ext(TValue value, buffer_type& buffer, typename etl::enable_if<is_integral<TValue>::value>::type* = 0) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
-      implementation::initialise(pbuffer, Number_Of_Elements, value);
+      implementation::template initialise<element_type>(pbuffer, Number_Of_Elements, value);
     }
 
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char* text, element_type* pbuffer_)
+    template <typename TPString>
+    ETL_CONSTEXPR14 bitset_ext(TPString text, element_type* pbuffer_, typename etl::enable_if<is_same<TPString, const char*>::value>::type* = 0)
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
@@ -3006,7 +3035,8 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char* text, buffer_type& buffer) ETL_NOEXCEPT
+    template <typename TPString>
+    ETL_CONSTEXPR14 bitset_ext(TPString text, buffer_type& buffer, typename etl::enable_if<is_same<TPString, const char*>::value>::type* = 0) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
       implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
@@ -3015,7 +3045,8 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const wchar_t* text, element_type* pbuffer_)
+    template <typename TPString>
+    ETL_CONSTEXPR14 bitset_ext(TPString text, element_type* pbuffer_, typename etl::enable_if<is_same<TPString, const wchar_t*>::value>::type* = 0)
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
@@ -3025,7 +3056,8 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const wchar_t* text, buffer_type& buffer) ETL_NOEXCEPT
+    template <typename TPString>
+    ETL_CONSTEXPR14 bitset_ext(TPString text, buffer_type& buffer, typename etl::enable_if<is_same<TPString, const wchar_t*>::value>::type* = 0) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
       implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
@@ -3034,7 +3066,8 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char16_t* text, element_type* pbuffer_)
+    template <typename TPString>
+    ETL_CONSTEXPR14 bitset_ext(TPString text, element_type* pbuffer_, typename etl::enable_if<is_same<TPString, const char16_t*>::value>::type* = 0)
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
@@ -3044,7 +3077,8 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char16_t* text, buffer_type& buffer) ETL_NOEXCEPT
+    template <typename TPString>
+    ETL_CONSTEXPR14 bitset_ext(TPString text, buffer_type& buffer, typename etl::enable_if<is_same<TPString, const char16_t*>::value>::type* = 0) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
       implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
@@ -3053,7 +3087,8 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char32_t* text, element_type* pbuffer_)
+    template <typename TPString>
+    ETL_CONSTEXPR14 bitset_ext(TPString text, element_type* pbuffer_, typename etl::enable_if<is_same<TPString, const char32_t*>::value>::type* = 0)
       : pbuffer(pbuffer_)
     {
       ETL_ASSERT(pbuffer != ETL_NULLPTR, ETL_ERROR(etl::bitset_invalid_buffer));
@@ -3063,7 +3098,8 @@ namespace etl
     //*************************************************************************
     /// Construct from a string.
     //*************************************************************************
-    ETL_CONSTEXPR14 bitset_ext(const char32_t* text, buffer_type& buffer) ETL_NOEXCEPT
+    template <typename TPString>
+    ETL_CONSTEXPR14 bitset_ext(TPString text, buffer_type& buffer, typename etl::enable_if<is_same<TPString, const char32_t*>::value>::type* = 0) ETL_NOEXCEPT
       : pbuffer(buffer.data())
     {
       implementation::from_string(pbuffer, Number_Of_Elements, Active_Bits, text);
diff --git a/include/etl/queue_spsc_locked.h b/include/etl/queue_spsc_locked.h
index a5e7ca1f..0ac26b5d 100644
--- a/include/etl/queue_spsc_locked.h
+++ b/include/etl/queue_spsc_locked.h
@@ -868,9 +868,9 @@ namespace etl
     /// Default constructor.
     //*************************************************************************
 
-    queue_spsc_locked(const etl::ifunction<void>& lock,
-                      const etl::ifunction<void>& unlock)
-      : base_t(reinterpret_cast<T*>(buffer.raw), MAX_SIZE, lock, unlock)
+    queue_spsc_locked(const etl::ifunction<void>& lock_,
+                      const etl::ifunction<void>& unlock_)
+      : base_t(reinterpret_cast<T*>(buffer.raw), MAX_SIZE, lock_, unlock_)
     {
     }
 
diff --git a/include/etl/radix.h b/include/etl/radix.h
index 63bf47f3..88a62738 100644
--- a/include/etl/radix.h
+++ b/include/etl/radix.h
@@ -47,19 +47,19 @@ namespace etl
   {
     enum enum_type
     {
-      undefined = 0,
-      binary    = 2,
-      octal     = 8,
-      decimal   = 10,
-      hex       = 16
+      undefined   = 0,
+      binary      = 2,
+      octal       = 8,
+      decimal     = 10,
+      hexadecimal = 16
     };
 
     ETL_DECLARE_ENUM_TYPE(radix, uint_least8_t)
-    ETL_ENUM_TYPE(undefined, "undefined")
-    ETL_ENUM_TYPE(binary,    "binary")
-    ETL_ENUM_TYPE(octal,     "octal")
-    ETL_ENUM_TYPE(decimal,   "decimal")
-    ETL_ENUM_TYPE(hex,       "hex")
+    ETL_ENUM_TYPE(undefined,   "undefined")
+    ETL_ENUM_TYPE(binary,      "binary")
+    ETL_ENUM_TYPE(octal,       "octal")
+    ETL_ENUM_TYPE(decimal,     "decimal")
+    ETL_ENUM_TYPE(hexadecimal, "hexadecimal")
     ETL_END_ENUM_TYPE
   };
 }
diff --git a/include/etl/to_arithmetic.h b/include/etl/to_arithmetic.h
index f2e69743..797b2163 100644
--- a/include/etl/to_arithmetic.h
+++ b/include/etl/to_arithmetic.h
@@ -251,7 +251,7 @@ namespace etl
           break;
         }
 
-        case etl::radix::hex:
+        case etl::radix::hexadecimal:
         {
           return ((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f'));
           break;
@@ -281,7 +281,7 @@ namespace etl
           break;
         }
 
-        case etl::radix::hex:
+        case etl::radix::hexadecimal:
         {
           if ((c >= '0') && (c <= '9'))
           {
@@ -363,7 +363,7 @@ namespace etl
       return (radix == etl::radix::binary)  ||
              (radix == etl::radix::octal)   ||
              (radix == etl::radix::decimal) ||
-             (radix == etl::radix::hex);
+             (radix == etl::radix::hexadecimal);
     }
 
     //***************************************************************************
diff --git a/include/etl/unordered_map.h b/include/etl/unordered_map.h
index 0e5b9e35..ceffedb9 100644
--- a/include/etl/unordered_map.h
+++ b/include/etl/unordered_map.h
@@ -1420,14 +1420,14 @@ namespace etl
     //*************************************************************************
     /// Move from a range
     //*************************************************************************
-    void move(iterator first, iterator last)
+    void move(iterator b, iterator e)
     {
-      while (first != last)
+      while (b != e)
       {
-        iterator temp = first;
+        iterator temp = b;
         ++temp;
-        insert(etl::move(*first));
-        first = temp;
+        insert(etl::move(*b));
+        b = temp;
       }
     }
 #endif
@@ -1489,26 +1489,26 @@ namespace etl
         else if (pbucket == last)
         {
           // We erased the last, so we need to search again. Start from the first, go no further than the current last.
-          bucket_t* pcurrent = first;
+          pbucket = first;
           bucket_t* pend = last;
 
           last = first;
 
-          while (pcurrent != pend)
+          while (pbucket != pend)
           {
-            if (!pcurrent->empty())
+            if (!pbucket->empty())
             {
-              last = pcurrent;
+              last = pbucket;
             }
 
-            ++pcurrent;
+            ++pbucket;
           }
         }
       }
     }
 
     //*********************************************************************
-    /// Delete a data noe at the specified location.
+    /// Delete a data node at the specified location.
     //*********************************************************************
     local_iterator delete_data_node(local_iterator iprevious, local_iterator icurrent, bucket_t& bucket)
     {
diff --git a/include/etl/unordered_multimap.h b/include/etl/unordered_multimap.h
index 174b5978..079c8c67 100644
--- a/include/etl/unordered_multimap.h
+++ b/include/etl/unordered_multimap.h
@@ -1274,14 +1274,14 @@ namespace etl
     //*************************************************************************
     /// Move from a range
     //*************************************************************************
-    void move(iterator first, iterator last)
+    void move(iterator b, iterator e)
     {
-      while (first != last)
+      while (b != e)
       {
-        iterator temp = first;
+        iterator temp = b;
         ++temp;
-        insert(etl::move(*first));
-        first = temp;
+        insert(etl::move(*b));
+        b = temp;
       }
     }
 #endif
@@ -1323,7 +1323,7 @@ namespace etl
     //*********************************************************************
     /// Adjust the first and last markers according to the erased entry.
     //*********************************************************************
-    void adjust_first_last_markers_after_erase(bucket_t* pcurrent)
+    void adjust_first_last_markers_after_erase(bucket_t* pbucket)
     {
       if (empty())
       {
@@ -1332,7 +1332,7 @@ namespace etl
       }
       else
       {
-        if (pcurrent == first)
+        if (pbucket == first)
         {
           // We erased the first so, we need to search again from where we erased.
           while (first->empty())
@@ -1340,29 +1340,29 @@ namespace etl
             ++first;
           }
         }
-        else if (pcurrent == last)
+        else if (pbucket == last)
         {
           // We erased the last, so we need to search again. Start from the first, go no further than the current last.
-          bucket_t* pcurrent = first;
+          pbucket = first;
           bucket_t* pend = last;
 
           last = first;
 
-          while (pcurrent != pend)
+          while (pbucket != pend)
           {
-            if (!pcurrent->empty())
+            if (!pbucket->empty())
             {
-              last = pcurrent;
+              last = pbucket;
             }
 
-            ++pcurrent;
+            ++pbucket;
           }
         }
       }
     }
 
     //*********************************************************************
-    /// Delete a data noe at the specified location.
+    /// Delete a data node at the specified location.
     //*********************************************************************
     local_iterator delete_data_node(local_iterator iprevious, local_iterator icurrent, bucket_t& bucket)
     {
diff --git a/include/etl/unordered_multiset.h b/include/etl/unordered_multiset.h
index be1acee7..52a9edf3 100644
--- a/include/etl/unordered_multiset.h
+++ b/include/etl/unordered_multiset.h
@@ -1252,14 +1252,14 @@ namespace etl
     //*************************************************************************
     /// Move from a range
     //*************************************************************************
-    void move(iterator first, iterator last)
+    void move(iterator b, iterator e)
     {
-      while (first != last)
+      while (b != e)
       {
-        iterator temp = first;
+        iterator temp = b;
         ++temp;
-        insert(etl::move(*first));
-        first = temp;
+        insert(etl::move(*b));
+        b = temp;
       }
     }
 #endif
@@ -1301,7 +1301,7 @@ namespace etl
     //*********************************************************************
     /// Adjust the first and last markers according to the erased entry.
     //*********************************************************************
-    void adjust_first_last_markers_after_erase(bucket_t* pcurrent)
+    void adjust_first_last_markers_after_erase(bucket_t* pbucket)
     {
       if (empty())
       {
@@ -1310,7 +1310,7 @@ namespace etl
       }
       else
       {
-        if (pcurrent == first)
+        if (pbucket == first)
         {
           // We erased the first so, we need to search again from where we erased.
           while (first->empty())
@@ -1318,29 +1318,29 @@ namespace etl
             ++first;
           }
         }
-        else if (pcurrent == last)
+        else if (pbucket == last)
         {
           // We erased the last, so we need to search again. Start from the first, go no further than the current last.
-          bucket_t* pcurrent = first;
+          pbucket = first;
           bucket_t* pend = last;
 
           last = first;
 
-          while (pcurrent != pend)
+          while (pbucket != pend)
           {
-            if (!pcurrent->empty())
+            if (!pbucket->empty())
             {
-              last = pcurrent;
+              last = pbucket;
             }
 
-            ++pcurrent;
+            ++pbucket;
           }
         }
       }
     }
 
     //*********************************************************************
-    /// Delete a data noe at the specified location.
+    /// Delete a data node at the specified location.
     //*********************************************************************
     local_iterator delete_data_node(local_iterator iprevious, local_iterator icurrent, bucket_t& bucket)
     {
diff --git a/include/etl/unordered_set.h b/include/etl/unordered_set.h
index 35dce097..c1b5f03b 100644
--- a/include/etl/unordered_set.h
+++ b/include/etl/unordered_set.h
@@ -1272,20 +1272,20 @@ namespace etl
     //*************************************************************************
     /// Move from a range
     //*************************************************************************
-    void move(iterator first, iterator last)
+    void move(iterator b, iterator e)
     {
 #if ETL_IS_DEBUG_BUILD
-      difference_type d = etl::distance(first, last);
+      difference_type d = etl::distance(b, e);
       ETL_ASSERT(d >= 0, ETL_ERROR(unordered_set_iterator));
       ETL_ASSERT(size_t(d) <= max_size(), ETL_ERROR(unordered_set_full));
 #endif
 
-      while (first != last)
+      while (b != e)
       {
-        iterator temp = first;
+        iterator temp = b;
         ++temp;
-        insert(etl::move(*first));
-        first = temp;
+        insert(etl::move(*b));
+        b = temp;
       }
     }
 #endif
@@ -1309,7 +1309,7 @@ namespace etl
       if (size() == 1)
       {
         first = pbucket;
-        last = pbucket;
+        last  = pbucket;
       }
       else
       {
@@ -1327,7 +1327,7 @@ namespace etl
     //*********************************************************************
     /// Adjust the first and last markers according to the erased entry.
     //*********************************************************************
-    void adjust_first_last_markers_after_erase(bucket_t* pcurrent)
+    void adjust_first_last_markers_after_erase(bucket_t* pbucket)
     {
       if (empty())
       {
@@ -1336,7 +1336,7 @@ namespace etl
       }
       else
       {
-        if (pcurrent == first)
+        if (pbucket == first)
         {
           // We erased the first so, we need to search again from where we erased.
           while (first->empty())
@@ -1344,29 +1344,29 @@ namespace etl
             ++first;
           }
         }
-        else if (pcurrent == last)
+        else if (pbucket == last)
         {
           // We erased the last, so we need to search again. Start from the first, go no further than the current last.
-          bucket_t* pcurrent = first;
+          pbucket = first;
           bucket_t* pend = last;
 
           last = first;
 
-          while (pcurrent != pend)
+          while (pbucket != pend)
           {
-            if (!pcurrent->empty())
+            if (!pbucket->empty())
             {
-              last = pcurrent;
+              last = pbucket;
             }
 
-            ++pcurrent;
+            ++pbucket;
           }
         }
       }
     }
 
     //*********************************************************************
-    /// Delete a data noe at the specified location.
+    /// Delete a data node at the specified location.
     //*********************************************************************
     local_iterator delete_data_node(local_iterator iprevious, local_iterator icurrent, bucket_t& bucket)
     {
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e8afb269..5fa7e763 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -383,6 +383,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 			-Werror
 			-Wfloat-equal
 			-Wuseless-cast
+			-Wshadow
 			)
 endif ()
 
@@ -395,6 +396,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 			-Wextra
 			-Werror
 			-Wfloat-equal
+			-Wshadow
 			)
 endif ()
 
diff --git a/test/UnitTest++/CheckMacros.h b/test/UnitTest++/CheckMacros.h
index 4cb5767c..f655d884 100644
--- a/test/UnitTest++/CheckMacros.h
+++ b/test/UnitTest++/CheckMacros.h
@@ -19,10 +19,10 @@
          UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__), #value); \
    })                                                                                                                                 \
    UNITTEST_IMPL_RETHROW (UnitTest::RequiredCheckException)                                                                                                               \
-   UNITTEST_IMPL_CATCH (std::exception, e,                                                                                                       \
+   UNITTEST_IMPL_CATCH (std::exception, exc,                                                                                                       \
    {                                                                                                                                  \
       UnitTest::MemoryOutStream UnitTest_message;                                                                                     \
-      UnitTest_message << "Unhandled exception (" << e.what() << ") in CHECK(" #value ")";                                            \
+      UnitTest_message << "Unhandled exception (" << exc.what() << ") in CHECK(" #value ")";                                            \
       UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__),             \
                                                       UnitTest_message.GetText());                                                    \
    })                                                                                                                                 \
@@ -41,10 +41,10 @@
          UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__), #value); \
    })                                                                                                                                 \
    UNITTEST_IMPL_RETHROW (UnitTest::RequiredCheckException)                                                                                                               \
-   UNITTEST_IMPL_CATCH (std::exception, e,                                                                                                       \
+   UNITTEST_IMPL_CATCH (std::exception, exc,                                                                                                       \
    {                                                                                                                                  \
       UnitTest::MemoryOutStream UnitTest_message;                                                                                     \
-      UnitTest_message << "Unhandled exception (" << e.what() << ") in CHECK(" #value ")";                                            \
+      UnitTest_message << "Unhandled exception (" << exc.what() << ") in CHECK(" #value ")";                                            \
       UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__),             \
                                                       UnitTest_message.GetText());                                                    \
    })                                                                                                                                 \
@@ -62,10 +62,10 @@
       UnitTest::CheckEqual(*UnitTest::CurrentTest::Results(), expected, actual, UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__)); \
    })                                                                                                                                                \
    UNITTEST_IMPL_RETHROW (UnitTest::RequiredCheckException)                                                                                                               \
-   UNITTEST_IMPL_CATCH (std::exception, e,                                                                                                                      \
+   UNITTEST_IMPL_CATCH (std::exception, exc,                                                                                                                      \
    {                                                                                                                                                 \
       UnitTest::MemoryOutStream UnitTest_message;                                                                                                    \
-      UnitTest_message << "Unhandled exception (" << e.what() << ") in CHECK_EQUAL(" #expected ", " #actual ")";                                     \
+      UnitTest_message << "Unhandled exception (" << exc.what() << ") in CHECK_EQUAL(" #expected ", " #actual ")";                                     \
       UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__),                            \
                                                       UnitTest_message.GetText());                                                                   \
    })                                                                                                                                                \
@@ -83,10 +83,10 @@
       UnitTest::CheckEqualHex(*UnitTest::CurrentTest::Results(), expected, actual, UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__)); \
    })                                                                                                                                                \
    UNITTEST_IMPL_RETHROW (UnitTest::RequiredCheckException)                                                                                                               \
-   UNITTEST_IMPL_CATCH (std::exception, e,                                                                                                                      \
+   UNITTEST_IMPL_CATCH (std::exception, exc,                                                                                                                      \
    {                                                                                                                                                 \
       UnitTest::MemoryOutStream UnitTest_message;                                                                                                    \
-      UnitTest_message << "Unhandled exception (" << e.what() << ") in CHECK_EQUAL(" #expected ", " #actual ")";                                     \
+      UnitTest_message << "Unhandled exception (" << exc.what() << ") in CHECK_EQUAL(" #expected ", " #actual ")";                                     \
       UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__),                            \
                                                       UnitTest_message.GetText());                                                                   \
    })                                                                                                                                                \
@@ -104,10 +104,10 @@
       UnitTest::CheckNotEqual(*UnitTest::CurrentTest::Results(), expected, actual, UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__)); \
    })                                                                                                                                                \
    UNITTEST_IMPL_RETHROW (UnitTest::RequiredCheckException)                                                                                                               \
-   UNITTEST_IMPL_CATCH (std::exception, e,                                                                                                                      \
+   UNITTEST_IMPL_CATCH (std::exception, exc,                                                                                                                      \
    {                                                                                                                                                 \
       UnitTest::MemoryOutStream UnitTest_message;                                                                                                    \
-      UnitTest_message << "Unhandled exception (" << e.what() << ") in CHECK_EQUAL(" #expected ", " #actual ")";                                     \
+      UnitTest_message << "Unhandled exception (" << exc.what() << ") in CHECK_EQUAL(" #expected ", " #actual ")";                                     \
       UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__),                            \
                                                       UnitTest_message.GetText());                                                                   \
    })                                                                                                                                                \
@@ -125,10 +125,10 @@
       UnitTest::CheckNotEqualHex(*UnitTest::CurrentTest::Results(), expected, actual, UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__)); \
    })                                                                                                                                                \
    UNITTEST_IMPL_RETHROW (UnitTest::RequiredCheckException)                                                                                                               \
-   UNITTEST_IMPL_CATCH (std::exception, e,                                                                                                                      \
+   UNITTEST_IMPL_CATCH (std::exception, exc,                                                                                                                      \
    {                                                                                                                                                 \
       UnitTest::MemoryOutStream UnitTest_message;                                                                                                    \
-      UnitTest_message << "Unhandled exception (" << e.what() << ") in CHECK_EQUAL(" #expected ", " #actual ")";                                     \
+      UnitTest_message << "Unhandled exception (" << exc.what() << ") in CHECK_EQUAL(" #expected ", " #actual ")";                                     \
       UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__),                            \
                                                       UnitTest_message.GetText());                                                                   \
    })                                                                                                                                                \
@@ -146,10 +146,10 @@
       UnitTest::CheckClose(*UnitTest::CurrentTest::Results(), expected, actual, tolerance, UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__)); \
    })                                                                                                                                                           \
    UNITTEST_IMPL_RETHROW (UnitTest::RequiredCheckException)                                                                                                               \
-   UNITTEST_IMPL_CATCH (std::exception, e,                                                                                                                                 \
+   UNITTEST_IMPL_CATCH (std::exception, exc,                                                                                                                                 \
    {                                                                                                                                                            \
       UnitTest::MemoryOutStream UnitTest_message;                                                                                                               \
-      UnitTest_message << "Unhandled exception (" << e.what() << ") in CHECK_CLOSE(" #expected ", " #actual ")";                                                \
+      UnitTest_message << "Unhandled exception (" << exc.what() << ") in CHECK_CLOSE(" #expected ", " #actual ")";                                                \
       UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__),                                       \
                                                       UnitTest_message.GetText());                                                                              \
    })                                                                                                                                                           \
@@ -167,10 +167,10 @@
       UnitTest::CheckArrayEqual(*UnitTest::CurrentTest::Results(), expected, actual, count, UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__)); \
    })                                                                                                                                                            \
    UNITTEST_IMPL_RETHROW (UnitTest::RequiredCheckException)                                                                                                               \
-   UNITTEST_IMPL_CATCH (std::exception, e,                                                                                                                                  \
+   UNITTEST_IMPL_CATCH (std::exception, exc,                                                                                                                                  \
    {                                                                                                                                                             \
       UnitTest::MemoryOutStream UnitTest_message;                                                                                                                \
-      UnitTest_message << "Unhandled exception (" << e.what() << ") in CHECK_ARRAY_EQUAL(" #expected ", " #actual ")";                                           \
+      UnitTest_message << "Unhandled exception (" << exc.what() << ") in CHECK_ARRAY_EQUAL(" #expected ", " #actual ")";                                           \
       UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__),                                        \
                                                       UnitTest_message.GetText());                                                                               \
    })                                                                                                                                                            \
@@ -188,10 +188,10 @@
       UnitTest::CheckArrayClose(*UnitTest::CurrentTest::Results(), expected, actual, count, tolerance, UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__)); \
    })                                                                                                                                                                       \
    UNITTEST_IMPL_RETHROW (UnitTest::RequiredCheckException)                                                                                                               \
-   UNITTEST_IMPL_CATCH (std::exception, e,                                                                                                                                             \
+   UNITTEST_IMPL_CATCH (std::exception, exc,                                                                                                                                             \
    {                                                                                                                                                                        \
       UnitTest::MemoryOutStream UnitTest_message;                                                                                                                           \
-      UnitTest_message << "Unhandled exception (" << e.what() << ") in CHECK_ARRAY_CLOSE(" #expected ", " #actual ")";                                                      \
+      UnitTest_message << "Unhandled exception (" << exc.what() << ") in CHECK_ARRAY_CLOSE(" #expected ", " #actual ")";                                                      \
       UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__),                                                   \
                                                       UnitTest_message.GetText());                                                                                          \
    })                                                                                                                                                                       \
@@ -209,10 +209,10 @@
       UnitTest::CheckArray2DClose(*UnitTest::CurrentTest::Results(), expected, actual, rows, columns, tolerance, UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__)); \
    })                                                                                                                                                                                 \
    UNITTEST_IMPL_RETHROW (UnitTest::RequiredCheckException)                                                                                                               \
-   UNITTEST_IMPL_CATCH (std::exception, e,                                                                                                                                                       \
+   UNITTEST_IMPL_CATCH (std::exception, exc,                                                                                                                                                       \
    {                                                                                                                                                                                  \
       UnitTest::MemoryOutStream UnitTest_message;                                                                                                                                     \
-      UnitTest_message << "Unhandled exception (" << e.what() << ") in CHECK_ARRAY2D_CLOSE(" #expected ", " #actual ")";                                                              \
+      UnitTest_message << "Unhandled exception (" << exc.what() << ") in CHECK_ARRAY2D_CLOSE(" #expected ", " #actual ")";                                                              \
       UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__),                                                             \
                                                       UnitTest_message.GetText());                                                                                                    \
    })                                                                                                                                                                                 \
diff --git a/test/UnitTest++/ExecuteTest.h b/test/UnitTest++/ExecuteTest.h
index 2759aad9..d632d4cd 100644
--- a/test/UnitTest++/ExecuteTest.h
+++ b/test/UnitTest++/ExecuteTest.h
@@ -39,12 +39,12 @@ namespace UnitTest {
          testObject.RunImpl();
       })
 #endif
-      UNITTEST_IMPL_CATCH(RequiredCheckException, e, { (void)e; })
-      UNITTEST_IMPL_CATCH(AssertException, e, { (void)e; })
-      UNITTEST_IMPL_CATCH(std::exception, e,
+      UNITTEST_IMPL_CATCH(RequiredCheckException, exc, { (void)exc; })
+      UNITTEST_IMPL_CATCH(AssertException, exc, { (void)exc; })
+      UNITTEST_IMPL_CATCH(std::exception, exc,
       {
          MemoryOutStream stream;
-         stream << "Unhandled exception: " << e.what();
+         stream << "Unhandled exception: " << exc.what();
          CurrentTest::Results()->OnTestFailure(details, stream.GetText());
       })
       UNITTEST_IMPL_CATCH_ALL
diff --git a/test/run-tests.sh b/test/run-tests.sh
index 92d80738..41fd6b29 100644
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -283,7 +283,7 @@ compiler=$clang_compiler
 SetConfigurationName "STL"
 PrintHeader
 rm * -rf
-cmake -DCMAKE_C_COMPILER="gcc" -DCMAKE_CXX_COMPILER="clang++" -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF -DETL_OPTIMISATION=$opt -DETL_CXX_STANDARD=$cxx_standard -DETL_ENABLE_SANITIZER=$sanitize -DETL_MESSAGES_ARE_NOT_VIRTUAL=OFF ..
+cmake -DCMAKE_C_COMPILER="clang" -DCMAKE_CXX_COMPILER="clang++" -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03_IMPLEMENTATION=OFF -DETL_OPTIMISATION=$opt -DETL_CXX_STANDARD=$cxx_standard -DETL_ENABLE_SANITIZER=$sanitize -DETL_MESSAGES_ARE_NOT_VIRTUAL=OFF ..
 cmake --build .
 if [ $? -eq 0 ]; then
   PassedCompilation
diff --git a/test/test_algorithm.cpp b/test/test_algorithm.cpp
index aef1fcfd..1be3f7f3 100644
--- a/test/test_algorithm.cpp
+++ b/test/test_algorithm.cpp
@@ -84,9 +84,9 @@ namespace
     {
     }
 
-    Data(int a, int b)
-      : a(a)
-      , b(b)
+    Data(int a_, int b_)
+      : a(a_)
+      , b(b_)
     {
     }
 
diff --git a/test/test_bitset_new_default_element_type.cpp b/test/test_bitset_new_default_element_type.cpp
index b2854161..81d4158d 100644
--- a/test/test_bitset_new_default_element_type.cpp
+++ b/test/test_bitset_new_default_element_type.cpp
@@ -1143,7 +1143,7 @@ namespace
     //*************************************************************************
     TEST(test_to_ulong_min)
     {
-      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits> data((unsigned long)etl::integral_limits<unsigned long>::min);
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits> data(etl::integral_limits<unsigned long>::min);
       unsigned long value = data.to_ulong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
@@ -1152,7 +1152,7 @@ namespace
     //*************************************************************************
     TEST(test_to_ulong_max)
     {
-      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits> data((unsigned long)etl::integral_limits<unsigned long>::max);
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits> data(etl::integral_limits<unsigned long>::max);
       unsigned long value = data.to_ulong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long>::max(), value);
@@ -1161,14 +1161,14 @@ namespace
     //*************************************************************************
     TEST(test_to_ulong_overflow)
     {
-      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits + 1> data((unsigned long)etl::integral_limits<unsigned long>::min);
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits + 1> data(etl::integral_limits<unsigned long>::min);
       CHECK_THROW(data.to_ulong(), etl::bitset_overflow);
     }
 
     //*************************************************************************
     TEST(test_to_ullong_min)
     {
-      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits> data((unsigned long long)etl::integral_limits<unsigned long long>::min);
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits> data(etl::integral_limits<unsigned long long>::min);
       unsigned long long value = data.to_ullong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
@@ -1177,7 +1177,7 @@ namespace
     //*************************************************************************
     TEST(test_to_ullong_max)
     {
-      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits> data((unsigned long long)etl::integral_limits<unsigned long long>::max);
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits> data(etl::integral_limits<unsigned long long>::max);
       unsigned long long value = data.to_ullong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long long>::max(), value);
@@ -1186,7 +1186,7 @@ namespace
     //*************************************************************************
     TEST(test_to_ullong_overflow)
     {
-      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits + 1> data((unsigned long long)etl::integral_limits<unsigned long long>::min);
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits + 1> data(etl::integral_limits<unsigned long long>::min);
       CHECK_THROW(data.to_ullong(), etl::bitset_overflow);
     }
 
diff --git a/test/test_bitset_new_explicit_single_element_type.cpp b/test/test_bitset_new_explicit_single_element_type.cpp
index 6dbfb8ca..2fa756a3 100644
--- a/test/test_bitset_new_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_explicit_single_element_type.cpp
@@ -1139,7 +1139,7 @@ namespace
     //*************************************************************************
     TEST(test_to_ulong_min)
     {
-      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits, uint64_t> data((unsigned long)etl::integral_limits<unsigned long>::min);
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits, uint64_t> data(etl::integral_limits<unsigned long>::min);
       unsigned long value = data.to_ulong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
@@ -1148,7 +1148,7 @@ namespace
     //*************************************************************************
     TEST(test_to_ulong_max)
     {
-      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits, uint64_t> data((unsigned long)etl::integral_limits<unsigned long>::max);
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits, uint64_t> data(etl::integral_limits<unsigned long>::max);
       unsigned long value = data.to_ulong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long>::max(), value);
@@ -1157,14 +1157,14 @@ namespace
     //*************************************************************************
     TEST(test_to_ulong_overflow)
     {
-      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits + 1, uint64_t> data((unsigned long)etl::integral_limits<unsigned long>::min);
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long>::bits + 1, uint64_t> data(etl::integral_limits<unsigned long>::min);
       CHECK_THROW(data.to_ulong(), etl::bitset_overflow);
     }
 
     //*************************************************************************
     TEST(test_to_ullong_min)
     {
-      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits, uint64_t> data((unsigned long long)etl::integral_limits<unsigned long long>::min);
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits, uint64_t> data(etl::integral_limits<unsigned long long>::min);
       unsigned long long value = data.to_ullong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
@@ -1173,7 +1173,7 @@ namespace
     //*************************************************************************
     TEST(test_to_ullong_max)
     {
-      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits, uint64_t> data((unsigned long long)etl::integral_limits<unsigned long long>::max);
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits, uint64_t> data(etl::integral_limits<unsigned long long>::max);
       unsigned long long value = data.to_ullong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long long>::max(), value);
@@ -1182,7 +1182,7 @@ namespace
     //*************************************************************************
     TEST(test_to_ullong_overflow)
     {
-      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits + 1, uint64_t> data((unsigned long long)etl::integral_limits<unsigned long long>::min);
+      ETL_CONSTEXPR14 etl::bitset<etl::integral_limits<unsigned long long>::bits + 1, uint64_t> data(etl::integral_limits<unsigned long long>::min);
       CHECK_THROW(data.to_ullong(), etl::bitset_overflow);
     }
 
diff --git a/test/test_bitset_new_ext_default_element_type.cpp b/test/test_bitset_new_ext_default_element_type.cpp
index a91cc135..161417f5 100644
--- a/test/test_bitset_new_ext_default_element_type.cpp
+++ b/test/test_bitset_new_ext_default_element_type.cpp
@@ -1086,7 +1086,7 @@ namespace
     TEST(test_to_ulong_min)
     {
       etl::bitset_ext<etl::integral_limits<unsigned long>::bits>::buffer_type buffer;
-      etl::bitset_ext<etl::integral_limits<unsigned long>::bits> data((unsigned long)etl::integral_limits<unsigned long>::min, buffer);
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits> data(etl::integral_limits<unsigned long>::min, buffer);
       unsigned long value = data.to_ulong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
@@ -1096,7 +1096,7 @@ namespace
     TEST(test_to_ulong_max)
     {
       etl::bitset_ext<etl::integral_limits<unsigned long>::bits>::buffer_type buffer;
-      etl::bitset_ext<etl::integral_limits<unsigned long>::bits> data((unsigned long)etl::integral_limits<unsigned long>::max, buffer);
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits> data(etl::integral_limits<unsigned long>::max, buffer);
       unsigned long value = data.to_ulong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long>::max(), value);
@@ -1106,7 +1106,7 @@ namespace
     TEST(test_to_ulong_overflow)
     {
       etl::bitset_ext<etl::integral_limits<unsigned long>::bits + 1>::buffer_type buffer;
-      etl::bitset_ext<etl::integral_limits<unsigned long>::bits + 1> data((unsigned long)etl::integral_limits<unsigned long>::min, buffer);
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits + 1> data(etl::integral_limits<unsigned long>::min, buffer);
       CHECK_THROW(data.to_ulong(), etl::bitset_overflow);
     }
 
@@ -1114,7 +1114,7 @@ namespace
     TEST(test_to_ullong_min)
     {
       etl::bitset_ext<etl::integral_limits<unsigned long long>::bits>::buffer_type buffer;
-      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits> data((unsigned long long)etl::integral_limits<unsigned long long>::min, buffer);
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits> data(etl::integral_limits<unsigned long long>::min, buffer);
       unsigned long long value = data.to_ullong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
@@ -1124,7 +1124,7 @@ namespace
     TEST(test_to_ullong_max)
     {
       etl::bitset_ext<etl::integral_limits<unsigned long long>::bits>::buffer_type buffer;
-      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits> data((unsigned long long)etl::integral_limits<unsigned long long>::max, buffer);
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits> data(etl::integral_limits<unsigned long long>::max, buffer);
       unsigned long long value = data.to_ullong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long long>::max(), value);
@@ -1134,7 +1134,7 @@ namespace
     TEST(test_to_ullong_overflow)
     {
       etl::bitset_ext<etl::integral_limits<unsigned long long>::bits + 1>::buffer_type buffer;
-      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits + 1> data((unsigned long long)etl::integral_limits<unsigned long long>::min, buffer);
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits + 1> data(etl::integral_limits<unsigned long long>::min, buffer);
       CHECK_THROW(data.to_ullong(), etl::bitset_overflow);
     }
 
@@ -1570,9 +1570,10 @@ namespace
 
       etl::bitset_ext<64> original(0x0123456789ABCDEFULL, buffer1);
 
-      for (ull shift = 0U; shift < 64U; ++shift)
+      for (size_t shift = 0U; shift < 64U; ++shift)
       {
         etl::bitset_ext<64> data(original, buffer2);
+
         CHECK_EQUAL_HEX(((value & mask) << shift), (data <<= shift).value<uint64_t>());
         mask >>= 1;
       }
@@ -1604,7 +1605,7 @@ namespace
 
       etl::bitset_ext<64> original(0x0123456789ABCDEFULL, buffer1);
 
-      for (ull shift = 0U; shift < 64U; ++shift)
+      for (size_t shift = 0U; shift < 64U; ++shift)
       {
         etl::bitset_ext<64> data(original, buffer2);
         CHECK_EQUAL_HEX((value >> shift), (data >>= shift).value<uint64_t>());
diff --git a/test/test_bitset_new_ext_explicit_single_element_type.cpp b/test/test_bitset_new_ext_explicit_single_element_type.cpp
index eb186deb..5f36026d 100644
--- a/test/test_bitset_new_ext_explicit_single_element_type.cpp
+++ b/test/test_bitset_new_ext_explicit_single_element_type.cpp
@@ -85,8 +85,8 @@ namespace
       CHECK_EQUAL(All_Set_Element, All_Set_Element2);
 
       //*******************************
-      constexpr size_t All_Clear_Element1 = bitset_type::All_Clear_Element;
-      constexpr size_t All_Clear_Element2 = bitset_type::all_clear_element();
+      constexpr element_type All_Clear_Element1 = bitset_type::All_Clear_Element;
+      constexpr element_type All_Clear_Element2 = bitset_type::all_clear_element();
 
       CHECK_EQUAL(All_Clear_Element, All_Clear_Element1);
       CHECK_EQUAL(All_Clear_Element, All_Clear_Element2);
@@ -1114,7 +1114,7 @@ namespace
     TEST(test_to_ulong_min)
     {
       etl::bitset_ext<etl::integral_limits<unsigned long>::bits, uint64_t>::buffer_type buffer;
-      etl::bitset_ext<etl::integral_limits<unsigned long>::bits, uint64_t> data((unsigned long)etl::integral_limits<unsigned long>::min, buffer);
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits, uint64_t> data(etl::integral_limits<unsigned long>::min, buffer);
       unsigned long value = data.to_ulong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
@@ -1124,7 +1124,7 @@ namespace
     TEST(test_to_ulong_max)
     {
       etl::bitset_ext<etl::integral_limits<unsigned long>::bits, uint64_t>::buffer_type buffer;
-      etl::bitset_ext<etl::integral_limits<unsigned long>::bits, uint64_t> data((unsigned long)etl::integral_limits<unsigned long>::max, buffer);
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits, uint64_t> data(etl::integral_limits<unsigned long>::max, buffer);
       unsigned long value = data.to_ulong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long>::max(), value);
@@ -1134,7 +1134,7 @@ namespace
     TEST(test_to_ulong_overflow)
     {
       etl::bitset_ext<etl::integral_limits<unsigned long>::bits + 1, uint64_t>::buffer_type buffer;
-      etl::bitset_ext<etl::integral_limits<unsigned long>::bits + 1, uint64_t> data((unsigned long)etl::integral_limits<unsigned long>::min, buffer);
+      etl::bitset_ext<etl::integral_limits<unsigned long>::bits + 1, uint64_t> data(etl::integral_limits<unsigned long>::min, buffer);
       CHECK_THROW(data.to_ulong(), etl::bitset_overflow);
     }
 
@@ -1142,7 +1142,7 @@ namespace
     TEST(test_to_ullong_min)
     {
       etl::bitset_ext<etl::integral_limits<unsigned long long>::bits, uint64_t>::buffer_type buffer;
-      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits, uint64_t> data((unsigned long long)etl::integral_limits<unsigned long long>::min, buffer);
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits, uint64_t> data(etl::integral_limits<unsigned long long>::min, buffer);
       unsigned long long value = data.to_ullong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long>::min(), value);
@@ -1152,7 +1152,7 @@ namespace
     TEST(test_to_ullong_max)
     {
       etl::bitset_ext<etl::integral_limits<unsigned long long>::bits, uint64_t>::buffer_type buffer;
-      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits, uint64_t> data((unsigned long long)etl::integral_limits<unsigned long long>::max, buffer);
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits, uint64_t> data(etl::integral_limits<unsigned long long>::max, buffer);
       unsigned long long value = data.to_ullong();
 
       CHECK_EQUAL(std::numeric_limits<unsigned long long>::max(), value);
@@ -1162,7 +1162,7 @@ namespace
     TEST(test_to_ullong_overflow)
     {
       etl::bitset_ext<etl::integral_limits<unsigned long long>::bits + 1, uint64_t>::buffer_type buffer;
-      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits + 1, uint64_t> data((unsigned long long)etl::integral_limits<unsigned long long>::min, buffer);    
+      etl::bitset_ext<etl::integral_limits<unsigned long long>::bits + 1, uint64_t> data(etl::integral_limits<unsigned long long>::min, buffer);    
       
       CHECK_THROW(data.to_ullong(), etl::bitset_overflow);
     }
@@ -1749,7 +1749,7 @@ namespace
 
       etl::bitset_ext<64, uint64_t> original(0x0123456789ABCDEFULL, buffer1);
 
-      for (ull shift = 0U; shift < 64U; ++shift)
+      for (size_t shift = 0U; shift < 64ULL; ++shift)
       {
         etl::bitset_ext<64, uint64_t> data(original, buffer2);
         CHECK_EQUAL_HEX(((value & mask) << shift), (data <<= shift).value<uint64_t>());
@@ -1783,7 +1783,7 @@ namespace
 
       etl::bitset_ext<64, uint64_t> original(0x0123456789ABCDEFULL, buffer1);
       
-      for (ull shift = 0U; shift < 64U; ++shift)
+      for (size_t shift = 0U; shift < 64U; ++shift)
       {
         etl::bitset_ext<64, uint64_t> data(original, buffer2);
         CHECK_EQUAL_HEX((value >> shift), (data >>= shift).value<uint64_t>());
diff --git a/test/test_callback_service.cpp b/test/test_callback_service.cpp
index 059c617c..c2f89db2 100644
--- a/test/test_callback_service.cpp
+++ b/test/test_callback_service.cpp
@@ -66,11 +66,11 @@ namespace
   //*****************************************************************************
   // The test class with member functions.
   //*****************************************************************************
-  class Test
+  class Object
   {
   public:
 
-    Test()
+    Object()
       : callback(*this)
     {
     }
@@ -88,13 +88,13 @@ namespace
     }
 
     // Callback for 'member1'.
-    etl::function_mp<Test, size_t, &Test::member1> callback;
+    etl::function_mp<Object, size_t, &Object::member1> callback;
   };
 
-  Test test;
+  Object object;
 
   // Callback for 'member2'.
-  etl::function_imp<Test, size_t, test, &Test::member2> member_callback;
+  etl::function_imp<Object, size_t, object, &Object::member2> member_callback;
 
   // Callback for 'global'.
   etl::function_fp<size_t, global> global_callback;
@@ -136,7 +136,7 @@ namespace
       Service service;
 
       service.register_callback<GLOBAL>(global_callback);
-      service.register_callback<MEMBER1>(test.callback);
+      service.register_callback<MEMBER1>(object.callback);
       service.register_callback<MEMBER2>(member_callback);
 
       service.callback<GLOBAL>();
@@ -154,7 +154,7 @@ namespace
       Service service;
 
       service.register_callback(GLOBAL,  global_callback);
-      service.register_callback(MEMBER1, test.callback);
+      service.register_callback(MEMBER1, object.callback);
       service.register_callback(MEMBER2, member_callback);
 
       service.callback(GLOBAL);
@@ -172,7 +172,7 @@ namespace
       Service service;
 
       service.register_callback<GLOBAL>(global_callback);
-      service.register_callback<MEMBER1>(test.callback);
+      service.register_callback<MEMBER1>(object.callback);
       service.register_callback<MEMBER2>(member_callback);
 
       service.callback<MEMBER1>();
@@ -190,7 +190,7 @@ namespace
       Service service;
 
       service.register_callback(GLOBAL,  global_callback);
-      service.register_callback(MEMBER1, test.callback);
+      service.register_callback(MEMBER1, object.callback);
       service.register_callback(MEMBER2, member_callback);
 
       service.callback(MEMBER1);
@@ -208,7 +208,7 @@ namespace
       Service service;
 
       service.register_callback<GLOBAL>(global_callback);
-      service.register_callback<MEMBER1>(test.callback);
+      service.register_callback<MEMBER1>(object.callback);
       service.register_callback<MEMBER2>(member_callback);
 
       service.callback<MEMBER2>();
@@ -226,7 +226,7 @@ namespace
       Service service;
 
       service.register_callback<GLOBAL>(global_callback);
-      service.register_callback<MEMBER1>(test.callback);
+      service.register_callback<MEMBER1>(object.callback);
       service.register_callback<MEMBER2>(member_callback);
 
       service.callback(OUT_OF_RANGE);
@@ -244,7 +244,7 @@ namespace
       Service service;
 
       service.register_callback<GLOBAL>(global_callback);
-      service.register_callback<MEMBER1>(test.callback);
+      service.register_callback<MEMBER1>(object.callback);
       service.register_callback<MEMBER2>(member_callback);
 
       service.register_unhandled_callback(unhandled_callback);
diff --git a/test/test_callback_timer.cpp b/test/test_callback_timer.cpp
index 1057fc08..a807a754 100644
--- a/test/test_callback_timer.cpp
+++ b/test/test_callback_timer.cpp
@@ -49,11 +49,11 @@ namespace
   //***************************************************************************
   // Class callback via etl::function
   //***************************************************************************
-  class Test
+  class Object
   {
   public:
 
-    Test()
+    Object()
       : p_controller(nullptr)
     {
     }
@@ -81,9 +81,9 @@ namespace
     etl::callback_timer<3>* p_controller;
   };
 
-  Test test;
-  etl::function_imv<Test, test, &Test::callback>  member_callback;
-  etl::function_imv<Test, test, &Test::callback2> member_callback2;
+  Object object;
+  etl::function_imv<Object, object, &Object::callback>  member_callback;
+  etl::function_imv<Object, object, &Object::callback2> member_callback2;
 
   //***************************************************************************
   // Free function callback via etl::function
@@ -136,7 +136,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Single_Shot);
       etl::timer::id::type id3 = timer_controller.register_timer(free_callback2,         11, etl::timer::mode::Single_Shot);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -160,11 +160,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
     }
@@ -175,7 +175,7 @@ namespace
       etl::callback_timer<1> timer_controller;
 
       etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Single_Shot);
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       timer_controller.start(id1);
       timer_controller.enable(true);
@@ -195,7 +195,7 @@ namespace
       CHECK(timer_controller.set_period(id1, 50));
       timer_controller.start(id1);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       ticks = 0;
 
@@ -207,7 +207,7 @@ namespace
 
       // Timer should have timed out.
 
-      CHECK_EQUAL(50U, *test.tick_list.data());
+      CHECK_EQUAL(50U, *object.tick_list.data());
 
       CHECK(timer_controller.unregister_timer(id1));
       CHECK(!timer_controller.unregister_timer(id1));
@@ -224,7 +224,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_callback2,         11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -248,11 +248,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23, 46, 69, 92 };
       std::vector<uint64_t> compare3 = { 11, 22, 33, 44, 55, 66, 77, 88, 99 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
     }
@@ -266,7 +266,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_callback2,         11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -294,11 +294,11 @@ namespace
       std::vector<uint64_t> compare2 = { 25, 50, 70, 95 };
       std::vector<uint64_t> compare3 = { 15, 25, 35, 45, 55, 70, 80, 90, 100 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
     }
@@ -312,7 +312,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_callback2,         11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -347,11 +347,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11, 22, 33, 44, 55, 66, 77, 88, 99 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
     }
@@ -368,9 +368,9 @@ namespace
       (void)id2;
       (void)id3;
 
-      test.set_controller(timer_controller);
+      object.set_controller(timer_controller);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       timer_controller.start(id1);
 
@@ -388,9 +388,9 @@ namespace
 
       std::vector<uint64_t> compare1 = { 100, 110, 122 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(), compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(), compare1.size());
     }
 
     //*************************************************************************
@@ -405,9 +405,9 @@ namespace
       (void)id2;
       (void)id3;
 
-      test.set_controller(timer_controller);
+      object.set_controller(timer_controller);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       timer_controller.start(id1);
 
@@ -425,9 +425,9 @@ namespace
 
       std::vector<uint64_t> compare1 = { 102, 111, 123 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
     }
 
     //*************************************************************************
@@ -439,7 +439,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_callback2,         11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -470,11 +470,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11, 22, 33, 44, 55, 66, 77, 88, 99 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
     }
@@ -488,7 +488,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_callback2,         11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -518,11 +518,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11, 22, 33 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
     }
@@ -536,7 +536,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_callback2,         11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -561,11 +561,11 @@ namespace
       std::vector<uint64_t> compare2 = { 6, 28, 51, 74, 97 };
       std::vector<uint64_t> compare3 = { 16, 27, 38, 49, 60, 71, 82, 93 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
     }
@@ -774,7 +774,7 @@ namespace
       etl::timer::id::type id2 = controller.register_timer(free_function_callback, 100, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = controller.register_timer(free_callback2,          10, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -812,18 +812,18 @@ namespace
       //Join the thread with the main thread
       t1.join();
 
-      CHECK_EQUAL(2U,  test.tick_list.size());
+      CHECK_EQUAL(2U,  object.tick_list.size());
       CHECK_EQUAL(10U, free_tick_list1.size());
       CHECK(free_tick_list2.size() < 65U);
 
       //std::vector<uint64_t> compare1 = { 400, 900 };
       //std::vector<uint64_t> compare2 = { 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000 };
 
-      CHECK(test.tick_list.size()  != 0);
+      CHECK(object.tick_list.size()  != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      //CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  min(compare1.size(), test.tick_list.size()));
+      //CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  min(compare1.size(), object.tick_list.size()));
       //CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), min(compare2.size(), free_tick_list1.size()));
     }
 #endif
diff --git a/test/test_callback_timer_atomic.cpp b/test/test_callback_timer_atomic.cpp
index 34980b6b..442e2be9 100644
--- a/test/test_callback_timer_atomic.cpp
+++ b/test/test_callback_timer_atomic.cpp
@@ -52,11 +52,11 @@ namespace
   //***************************************************************************
   // Class callback via etl::function
   //***************************************************************************
-  class Test
+  class Object
   {
   public:
 
-    Test()
+    Object()
       : p_controller(nullptr)
     {
     }
@@ -86,9 +86,9 @@ namespace
 
   using callback_type = etl::icallback_timer_atomic<std::atomic_uint32_t>::callback_type;
 
-  Test test;
-  callback_type member_callback1 = callback_type::create<Test, test, &Test::callback1>();
-  callback_type member_callback2 = callback_type::create<Test, test, &Test::callback2>();
+  Object object;
+  callback_type member_callback1 = callback_type::create<Object, object, &Object::callback1>();
+  callback_type member_callback2 = callback_type::create<Object, object, &Object::callback2>();
 
   //***************************************************************************
   // Free function callback via etl::function
@@ -143,7 +143,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Single_Shot);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Single_Shot);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -167,11 +167,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
     }
@@ -182,7 +182,7 @@ namespace
       etl::callback_timer_atomic<1, std::atomic_uint32_t> timer_controller;
 
       etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::Single_Shot);
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       timer_controller.start(id1);
       timer_controller.enable(true);
@@ -202,7 +202,7 @@ namespace
       CHECK(timer_controller.set_period(id1, 50));
       timer_controller.start(id1);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       ticks = 0;
 
@@ -214,7 +214,7 @@ namespace
 
       // Timer should have timed out.
 
-      CHECK_EQUAL(50U, *test.tick_list.data());
+      CHECK_EQUAL(50U, *object.tick_list.data());
 
       CHECK(timer_controller.unregister_timer(id1));
       CHECK(!timer_controller.unregister_timer(id1));
@@ -231,7 +231,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -255,11 +255,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23, 46, 69, 92 };
       std::vector<uint64_t> compare3 = { 11, 22, 33, 44, 55, 66, 77, 88, 99 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
     }
@@ -273,7 +273,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -301,11 +301,11 @@ namespace
       std::vector<uint64_t> compare2 = { 25, 50, 70, 95 };
       std::vector<uint64_t> compare3 = { 15, 25, 35, 45, 55, 70, 80, 90, 100 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
     }
@@ -319,7 +319,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -354,11 +354,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11, 22, 33, 44, 55, 66, 77, 88, 99 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
     }
@@ -375,9 +375,9 @@ namespace
       (void)id2;
       (void)id3;
 
-      test.set_controller(timer_controller);
+      object.set_controller(timer_controller);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       timer_controller.start(id1);
 
@@ -395,9 +395,9 @@ namespace
 
       std::vector<uint64_t> compare1 = { 100, 110, 122 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(), compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(), compare1.size());
     }
 
     //*************************************************************************
@@ -412,9 +412,9 @@ namespace
       (void)id2;
       (void)id3;
 
-      test.set_controller(timer_controller);
+      object.set_controller(timer_controller);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       timer_controller.start(id1);
 
@@ -432,9 +432,9 @@ namespace
 
       std::vector<uint64_t> compare1 = { 102, 111, 123 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
     }
 
     //*************************************************************************
@@ -446,7 +446,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -477,11 +477,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11, 22, 33, 44, 55, 66, 77, 88, 99 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
     }
@@ -495,7 +495,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2,         11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -525,11 +525,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11, 22, 33 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
     }
@@ -543,7 +543,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -568,11 +568,11 @@ namespace
       std::vector<uint64_t> compare2 = { 6, 28, 51, 74, 97 };
       std::vector<uint64_t> compare3 = { 16, 27, 38, 49, 60, 71, 82, 93 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
     }
@@ -780,7 +780,7 @@ namespace
       etl::timer::id::type id2 = controller.register_timer(free_function_callback1, 100, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = controller.register_timer(free_function_callback2,  10, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -818,18 +818,18 @@ namespace
       //Join the thread with the main thread
       t1.join();
 
-      CHECK_EQUAL(2U,  test.tick_list.size());
+      CHECK_EQUAL(2U,  object.tick_list.size());
       CHECK_EQUAL(10U, free_tick_list1.size());
       CHECK(free_tick_list2.size() < 65U);
 
       //std::vector<uint64_t> compare1 = { 400, 900 };
       //std::vector<uint64_t> compare2 = { 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000 };
 
-      CHECK(test.tick_list.size()  != 0);
+      CHECK(object.tick_list.size()  != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      //CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  min(compare1.size(), test.tick_list.size()));
+      //CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  min(compare1.size(), object.tick_list.size()));
       //CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), min(compare2.size(), free_tick_list1.size()));
     }
 #endif
diff --git a/test/test_callback_timer_interrupt.cpp b/test/test_callback_timer_interrupt.cpp
index cbc7d5dd..752aa560 100644
--- a/test/test_callback_timer_interrupt.cpp
+++ b/test/test_callback_timer_interrupt.cpp
@@ -65,11 +65,11 @@ namespace
   //***************************************************************************
   // Class callback via etl::delegate
   //***************************************************************************
-  class Test
+  class Object
   {
   public:
 
-    Test()
+    Object()
       : p_controller(nullptr)
     {
     }
@@ -99,9 +99,9 @@ namespace
 
   using callback_type = etl::icallback_timer_interrupt<ScopedGuard>::callback_type;
 
-  Test test;
-  callback_type member_callback  = callback_type::create<Test, test, &Test::callback>();
-  callback_type member_callback2 = callback_type::create<Test, test, &Test::callback2>();
+  Object object;
+  callback_type member_callback  = callback_type::create<Object, object, &Object::callback>();
+  callback_type member_callback2 = callback_type::create<Object, object, &Object::callback2>();
 
   //***************************************************************************
   // Free function callback via etl::function
@@ -158,7 +158,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback,  23, etl::timer::mode::Single_Shot);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Single_Shot);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -182,11 +182,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
 
@@ -199,7 +199,7 @@ namespace
       etl::callback_timer_interrupt<1, ScopedGuard> timer_controller;
 
       etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Single_Shot);
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       timer_controller.start(id1);
       timer_controller.enable(true);
@@ -219,7 +219,7 @@ namespace
       CHECK(timer_controller.set_period(id1, 50));
       timer_controller.start(id1);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       ticks = 0;
 
@@ -231,7 +231,7 @@ namespace
 
       // Timer should have timed out.
 
-      CHECK_EQUAL(50U, *test.tick_list.data());
+      CHECK_EQUAL(50U, *object.tick_list.data());
 
       CHECK(timer_controller.unregister_timer(id1));
       CHECK(!timer_controller.unregister_timer(id1));
@@ -250,7 +250,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback,  23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -274,11 +274,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23, 46, 69, 92 };
       std::vector<uint64_t> compare3 = { 11, 22, 33, 44, 55, 66, 77, 88, 99 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
 
@@ -294,7 +294,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback,  23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -322,11 +322,11 @@ namespace
       std::vector<uint64_t> compare2 = { 25, 50, 70, 95 };
       std::vector<uint64_t> compare3 = { 15, 25, 35, 45, 55, 70, 80, 90, 100 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
 
@@ -342,7 +342,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback,  23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -377,11 +377,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11, 22, 33, 44, 55, 66, 77, 88, 99 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
 
@@ -400,9 +400,9 @@ namespace
       (void)id2;
       (void)id3;
 
-      test.set_controller(timer_controller);
+      object.set_controller(timer_controller);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       timer_controller.start(id1);
 
@@ -420,9 +420,9 @@ namespace
 
       std::vector<uint64_t> compare1 = { 100, 110, 122 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(), compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(), compare1.size());
 
       CHECK_EQUAL(0U, ScopedGuard::guard_count);
     }
@@ -439,9 +439,9 @@ namespace
       (void)id2;
       (void)id3;
 
-      test.set_controller(timer_controller);
+      object.set_controller(timer_controller);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       timer_controller.start(id1);
 
@@ -459,9 +459,9 @@ namespace
 
       std::vector<uint64_t> compare1 = { 102, 111, 123 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
 
       CHECK_EQUAL(0U, ScopedGuard::guard_count);
     }
@@ -475,7 +475,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback,  23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -506,11 +506,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11, 22, 33, 44, 55, 66, 77, 88, 99 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
 
@@ -526,7 +526,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback,  23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -556,11 +556,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11, 22, 33 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
 
@@ -576,7 +576,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback,  23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -601,11 +601,11 @@ namespace
       std::vector<uint64_t> compare2 = { 6, 28, 51, 74, 97 };
       std::vector<uint64_t> compare3 = { 16, 27, 38, 49, 60, 71, 82, 93 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
 
diff --git a/test/test_callback_timer_locked.cpp b/test/test_callback_timer_locked.cpp
index 4ca6c3a9..6ef92aca 100644
--- a/test/test_callback_timer_locked.cpp
+++ b/test/test_callback_timer_locked.cpp
@@ -84,11 +84,11 @@ namespace
   //***************************************************************************
   // Class callback via etl::function
   //***************************************************************************
-  class Test
+  class Object
   {
   public:
 
-    Test()
+    Object()
       : p_controller(nullptr)
     {
     }
@@ -121,9 +121,9 @@ namespace
   using lock_type     = etl::icallback_timer_locked::lock_type;
   using unlock_type   = etl::icallback_timer_locked::unlock_type;
 
-  Test test;
-  callback_type member_callback  = callback_type::create<Test, test, &Test::callback>();
-  callback_type member_callback2 = callback_type::create<Test, test, &Test::callback2>();
+  Object object;
+  callback_type member_callback  = callback_type::create<Object, object, &Object::callback>();
+  callback_type member_callback2 = callback_type::create<Object, object, &Object::callback2>();
 
   //***************************************************************************
   // Free function callback via etl::function
@@ -190,7 +190,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback,  23, etl::timer::mode::Single_Shot);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Single_Shot);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -214,11 +214,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
 
@@ -236,7 +236,7 @@ namespace
       etl::callback_timer_locked<1> timer_controller(try_lock, lock, unlock);
 
       etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Single_Shot);
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       timer_controller.start(id1);
       timer_controller.enable(true);
@@ -256,7 +256,7 @@ namespace
       CHECK(timer_controller.set_period(id1, 50));
       timer_controller.start(id1);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       ticks = 0;
 
@@ -268,7 +268,7 @@ namespace
 
       // Timer should have timed out.
 
-      CHECK_EQUAL(50U, *test.tick_list.data());
+      CHECK_EQUAL(50U, *object.tick_list.data());
 
       CHECK(timer_controller.unregister_timer(id1));
       CHECK(!timer_controller.unregister_timer(id1));
@@ -292,7 +292,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback,  23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -316,11 +316,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23, 46, 69, 92 };
       std::vector<uint64_t> compare3 = { 11, 22, 33, 44, 55, 66, 77, 88, 99 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
 
@@ -341,7 +341,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback,  23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -369,11 +369,11 @@ namespace
       std::vector<uint64_t> compare2 = { 25, 50, 70, 95 };
       std::vector<uint64_t> compare3 = { 15, 25, 35, 45, 55, 70, 80, 90, 100 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
 
@@ -394,7 +394,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback,  23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -429,11 +429,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11, 22, 33, 44, 55, 66, 77, 88, 99 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
 
@@ -457,9 +457,9 @@ namespace
       (void)id2;
       (void)id3;
 
-      test.set_controller(timer_controller);
+      object.set_controller(timer_controller);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       timer_controller.start(id1);
 
@@ -477,9 +477,9 @@ namespace
 
       std::vector<uint64_t> compare1 = { 100, 110, 122 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(), compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(), compare1.size());
 
       CHECK_EQUAL(0U, locks.lock_count);
     }
@@ -501,9 +501,9 @@ namespace
       (void)id2;
       (void)id3;
 
-      test.set_controller(timer_controller);
+      object.set_controller(timer_controller);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
 
       timer_controller.start(id1);
 
@@ -521,9 +521,9 @@ namespace
 
       std::vector<uint64_t> compare1 = { 102, 111, 123 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
 
       CHECK_EQUAL(0U, locks.lock_count);
     }
@@ -542,7 +542,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback,  23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -573,11 +573,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11, 22, 33, 44, 55, 66, 77, 88, 99 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
 
@@ -598,7 +598,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback,  23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -628,11 +628,11 @@ namespace
       std::vector<uint64_t> compare2 = { 23 };
       std::vector<uint64_t> compare3 = { 11, 22, 33 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
 
@@ -653,7 +653,7 @@ namespace
       etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback,  23, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -678,11 +678,11 @@ namespace
       std::vector<uint64_t> compare2 = { 6, 28, 51, 74, 97 };
       std::vector<uint64_t> compare3 = { 16, 27, 38, 49, 60, 71, 82, 93 };
 
-      CHECK(test.tick_list.size() != 0);
+      CHECK(object.tick_list.size() != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  compare1.size());
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  compare1.size());
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), compare2.size());
       CHECK_ARRAY_EQUAL(compare3.data(), free_tick_list2.data(), compare3.size());
 
@@ -957,7 +957,7 @@ namespace
       etl::timer::id::type id2 = controller.register_timer(free_function_callback,  100, etl::timer::mode::Repeating);
       etl::timer::id::type id3 = controller.register_timer(free_function_callback2,  10, etl::timer::mode::Repeating);
 
-      test.tick_list.clear();
+      object.tick_list.clear();
       free_tick_list1.clear();
       free_tick_list2.clear();
 
@@ -1001,18 +1001,18 @@ namespace
       //Join the thread with the main thread
       t1.join();
 
-      CHECK_EQUAL(2U,  test.tick_list.size());
+      CHECK_EQUAL(2U,  object.tick_list.size());
       CHECK_EQUAL(10U, free_tick_list1.size());
       CHECK(free_tick_list2.size() < 65U);
 
       std::vector<uint64_t> compare1 = { 400, 900 };
       std::vector<uint64_t> compare2 = { 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000 };
 
-      CHECK(test.tick_list.size()  != 0);
+      CHECK(object.tick_list.size()  != 0);
       CHECK(free_tick_list1.size() != 0);
       CHECK(free_tick_list2.size() != 0);
 
-      CHECK_ARRAY_EQUAL(compare1.data(), test.tick_list.data(),  min(compare1.size(), test.tick_list.size()));
+      CHECK_ARRAY_EQUAL(compare1.data(), object.tick_list.data(),  min(compare1.size(), object.tick_list.size()));
       CHECK_ARRAY_EQUAL(compare2.data(), free_tick_list1.data(), min(compare2.size(), free_tick_list1.size()));
 
       CHECK_EQUAL(0U, threadLock.lock_count);
diff --git a/test/test_circular_buffer_external_buffer.cpp b/test/test_circular_buffer_external_buffer.cpp
index 79be1028..271f88d3 100644
--- a/test/test_circular_buffer_external_buffer.cpp
+++ b/test/test_circular_buffer_external_buffer.cpp
@@ -55,15 +55,16 @@ namespace
     using BufferM_t = etl::uninitialized_buffer_of<ItemM, SIZE + 1>;
     using Buffer_t  = etl::uninitialized_buffer_of<Ndc, SIZE + 1>;
 
-    BufferM_t bufferm1;
-    BufferM_t bufferm2;
+    //BufferM_t bufferm1;
+    //BufferM_t bufferm2;
 
-    Buffer_t buffer1;
-    Buffer_t buffer2;
+    //Buffer_t buffer1;
+    //Buffer_t buffer2;
 
     //*************************************************************************
     TEST(test_default_constructor)
     {
+      Buffer_t buffer1;
       Data data(buffer1.raw, SIZE);
 
       CHECK(data.is_valid());
@@ -80,6 +81,8 @@ namespace
     //*************************************************************************
     TEST(test_set_buffer_after_default_constructor)
     {
+      Buffer_t buffer1;
+
       Data data(SIZE);
       CHECK(!data.is_valid());
 
@@ -100,6 +103,7 @@ namespace
     //*************************************************************************
     TEST(test_constructor_from_literal)
     {
+      Buffer_t buffer1;
       Data data({ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") }, buffer1.raw, SIZE);
       Compare compare = { Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
 
@@ -115,6 +119,7 @@ namespace
     //*************************************************************************
     TEST(test_constructor_from_literal_excess)
     {
+      Buffer_t buffer1;
       Data data({ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") }, buffer1.raw, SIZE);
       Compare compare = { Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12")  };
 
@@ -131,6 +136,7 @@ namespace
     //*************************************************************************
     TEST(test_cpp17_deduced_constructor)
     {
+      Buffer_t buffer1;
       Data data({ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") }, buffer1.raw, SIZE);
       Compare compare{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
 
@@ -147,6 +153,7 @@ namespace
 #if ETL_USING_CPP17 && ETL_HAS_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED)
     TEST(test_cpp17_deduced_constructor_excess)
     {
+      Buffer_t buffer1;
       Data data({ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") }, buffer1.raw, SIZE);
       Compare compare{ Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12")  };
 
@@ -162,6 +169,7 @@ namespace
     //*************************************************************************
     TEST(test_push)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Data data(buffer1.raw, SIZE);
       for (auto v : test)
@@ -183,6 +191,7 @@ namespace
     //*************************************************************************
     TEST(test_move_push)
     {
+      BufferM_t bufferm1;
       DataM data(bufferm1.raw, SIZE);
       CompareM compare;
 
@@ -203,6 +212,7 @@ namespace
     //*************************************************************************
     TEST(test_push_full_range)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -220,6 +230,7 @@ namespace
     //*************************************************************************
     TEST(test_iterator_to_pointer_operator)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -241,6 +252,7 @@ namespace
     //*************************************************************************
     TEST(test_const_iterator_to_pointer_operator)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -262,6 +274,7 @@ namespace
     //*************************************************************************
     TEST(test_push_full_range_reverse_iterator)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -279,6 +292,7 @@ namespace
     //*************************************************************************
     TEST(test_push_excess_range)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -296,6 +310,7 @@ namespace
     //*************************************************************************
     TEST(test_push_excess_range_reverse_iterator)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -313,6 +328,7 @@ namespace
     //*************************************************************************
     TEST(test_push_short_range_at_start_of_buffer)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -330,6 +346,7 @@ namespace
     //*************************************************************************
     TEST(test_push_short_range_at_start_of_buffer_reverse_iterator)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -347,6 +364,7 @@ namespace
     //*************************************************************************
     TEST(test_push_short_range_at_end_of_buffer)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -365,6 +383,7 @@ namespace
     //*************************************************************************
     TEST(test_push_short_range_at_end_of_buffer_reverse_iterator)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -383,6 +402,7 @@ namespace
     //*************************************************************************
     TEST(test_push_short_range_middle_of_buffer)
     {
+      Buffer_t buffer1;
       Compare input1{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4") };
       Compare input2{ Ndc("5"), Ndc("6"), Ndc("7") };
       Data data(buffer1.raw, SIZE);
@@ -403,6 +423,7 @@ namespace
     //*************************************************************************
     TEST(test_push_short_range_middle_of_buffer_reverse_iterator)
     {
+      Buffer_t buffer1;
       Compare input1{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4") };
       Compare input2{ Ndc("5"), Ndc("6"), Ndc("7") };
       Data data(buffer1.raw, SIZE);
@@ -423,6 +444,7 @@ namespace
     //*************************************************************************
     TEST(test_push_short_range_overlap_start_and_end_of_buffer)
     {
+      Buffer_t buffer1;
       Compare input1{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Compare input2{ Ndc("10"), Ndc("11"), Ndc("12") };
       Data data(buffer1.raw, SIZE);
@@ -443,6 +465,7 @@ namespace
     //*************************************************************************
     TEST(test_push_short_range_overlap_start_and_end_of_buffer_reverse_iterator)
     {
+      Buffer_t buffer1;
       Compare input1{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Compare input2{ Ndc("10"), Ndc("11"), Ndc("12") };
       Data data(buffer1.raw, SIZE);
@@ -463,6 +486,7 @@ namespace
     //*************************************************************************
     TEST(test_available)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Data data(buffer1.raw, SIZE);
       for (auto v : test)
@@ -475,6 +499,7 @@ namespace
     //*************************************************************************
     TEST(test_front)
     {
+      Buffer_t buffer1;
       Compare input1{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Data data(buffer1.raw, SIZE);
       data.push(input1.begin(), input1.end());
@@ -492,6 +517,7 @@ namespace
     //*************************************************************************
     TEST(test_front_const)
     {
+      Buffer_t buffer1;
       Compare input1{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Data data(buffer1.raw, SIZE);
       data.push(input1.begin(), input1.end());
@@ -505,6 +531,7 @@ namespace
     //*************************************************************************
     TEST(test_back)
     {
+      Buffer_t buffer1;
       Compare input1{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Data data(buffer1.raw, SIZE);
       data.push(input1.begin(), input1.end());
@@ -522,6 +549,7 @@ namespace
     //*************************************************************************
     TEST(test_back_const)
     {
+      Buffer_t buffer1;
       Compare input{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Data data(buffer1.raw, SIZE);
       data.push(input.begin(), input.end());
@@ -535,7 +563,8 @@ namespace
     //*************************************************************************
     TEST(test_index_operator)
     {
-      // Overrun by 3
+      // Overrun by 3 
+      Buffer_t buffer1;
       Compare input1{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Compare input2{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Data data(buffer1.raw, SIZE);
@@ -561,6 +590,7 @@ namespace
     TEST(test_index_operator_const)
     {
       // Overrun by 3
+      Buffer_t buffer1;
       Compare input{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Data data(buffer1.raw, SIZE);
       data.push(input.begin(), input.end());
@@ -574,6 +604,7 @@ namespace
     //*************************************************************************
     TEST(test_random_iterator_plus)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -597,6 +628,7 @@ namespace
     //*************************************************************************
     TEST(test_random_iterator_plus_rollover)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -620,6 +652,7 @@ namespace
     //*************************************************************************
     TEST(test_random_iterator_plus_equals)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -643,6 +676,7 @@ namespace
     //*************************************************************************
     TEST(test_random_iterator_plus_equals_rollover)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -666,6 +700,7 @@ namespace
     //*************************************************************************
     TEST(test_random_iterator_minus)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -689,6 +724,7 @@ namespace
     //*************************************************************************
     TEST(test_random_iterator_minus_rollover)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -712,6 +748,7 @@ namespace
     //*************************************************************************
     TEST(test_random_iterator_minus_equals)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -735,6 +772,7 @@ namespace
     //*************************************************************************
     TEST(test_random_iterator_minus_equals_rollover)
     {
+      Buffer_t buffer1;
       Compare input{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Data data(buffer1.raw, SIZE);
       data.push(input.begin(), input.end());
@@ -758,6 +796,8 @@ namespace
     //*************************************************************************
     TEST(test_copy_constructor)
     {
+      Buffer_t buffer1;
+      Buffer_t buffer2;
       Compare input1{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9") };
       Compare input2{ Ndc("9"), Ndc("8"), Ndc("7"), Ndc("6"), Ndc("5"), Ndc("4"), Ndc("3"), Ndc("2"), Ndc("1"), Ndc("0") };
       Data data1(buffer1.raw, SIZE);
@@ -781,6 +821,8 @@ namespace
     //*************************************************************************
     TEST(test_move_constructor)
     {
+      BufferM_t bufferm1;
+      BufferM_t bufferm2;
       CompareM input1;
       CompareM input2;
       CompareM compare;
@@ -819,6 +861,8 @@ namespace
     //*************************************************************************
     TEST(test_assignment)
     {
+      Buffer_t buffer1;
+      Buffer_t buffer2;
       Compare input1{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8") };
       Compare input2{ Ndc("8"), Ndc("7"), Ndc("6"), Ndc("5"), Ndc("4"), Ndc("3"), Ndc("2"), Ndc("1"), Ndc("0") };
       Data data1(buffer1.raw, SIZE);
@@ -845,6 +889,8 @@ namespace
     //*************************************************************************
     TEST(test_move_assignment)
     {
+      Buffer_t buffer1;
+      Buffer_t buffer2;
       Compare input1{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8") };
       Compare input2{ Ndc("8"), Ndc("7"), Ndc("6"), Ndc("5"), Ndc("4"), Ndc("3"), Ndc("2"), Ndc("1"), Ndc("0") };
       Data data1(buffer1.raw, SIZE);
@@ -871,6 +917,7 @@ namespace
     //*************************************************************************
     TEST(test_swap_iterator)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -893,6 +940,7 @@ namespace
     //*************************************************************************
     TEST(test_swap_const_iterator)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -915,6 +963,7 @@ namespace
     //*************************************************************************
     TEST(test_iterator_difference)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -940,6 +989,7 @@ namespace
     //*************************************************************************
     TEST(test_const_iterator_difference)
     {
+      Buffer_t buffer1;
       Compare test{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Data data(buffer1.raw, SIZE);
       data.push(test.begin(), test.end());
@@ -987,6 +1037,7 @@ namespace
     TEST(test_equal)
     {
       // Over-write by 3
+      Buffer_t buffer1;
       Compare input{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Data data1(buffer1.raw, SIZE);
       Data data2(buffer1.raw, SIZE);
@@ -1000,6 +1051,8 @@ namespace
     TEST(test_not_equal)
     {
       // Over-write by 3
+      Buffer_t buffer1;
+      Buffer_t buffer2;
       Compare input1{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Compare input2{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("6"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") };
       Data data1(buffer1.raw, SIZE);
diff --git a/test/test_circular_iterator.cpp b/test/test_circular_iterator.cpp
index 2e5d77a1..191b4ad5 100644
--- a/test/test_circular_iterator.cpp
+++ b/test/test_circular_iterator.cpp
@@ -8,7 +8,7 @@ https://www.etlcpp.com
 Copyright(c) 2022 John Wellbelove
 
 Permission is hereby granted, free of charge, to any person obtaining data copy
-of this software and associated documentation ciles(the "Software"), to deal
+of this software and associated documentation files(the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
 copies of the Software, and to permit persons to whom the Software is
@@ -470,46 +470,46 @@ namespace
     //*************************************************************************
     TEST(test_member_dereference_operator_for_random_access_iterator)
     {
-      struct Test
+      struct Object
       {
         int data;
         int b;
       };
 
-      Test test[] = { { 1, 2 }, { 3, 4 }, { 5, 6 } };
+      Object object[] = { { 1, 2 }, { 3, 4 }, { 5, 6 } };
 
-      etl::circular_iterator<Test*> ci(std::begin(test), std::end(test));
+      etl::circular_iterator<Object*> ci(std::begin(object), std::end(object));
 
-      CHECK_EQUAL(test[0].data, ci->data);
-      CHECK_EQUAL(test[0].b, ci->b);
+      CHECK_EQUAL(object[0].data, ci->data);
+      CHECK_EQUAL(object[0].b, ci->b);
 
       *ci = { 7, 8 };
 
-      CHECK_EQUAL(test[0].data, ci->data);
-      CHECK_EQUAL(test[0].b, ci->b);
+      CHECK_EQUAL(object[0].data, ci->data);
+      CHECK_EQUAL(object[0].b, ci->b);
 
       ++ci;
-      CHECK_EQUAL(test[1].data, ci->data);
-      CHECK_EQUAL(test[1].b, ci->b);
+      CHECK_EQUAL(object[1].data, ci->data);
+      CHECK_EQUAL(object[1].b, ci->b);
 
       ++ci;
-      CHECK_EQUAL(test[2].data, ci->data);
-      CHECK_EQUAL(test[2].b, ci->b);
+      CHECK_EQUAL(object[2].data, ci->data);
+      CHECK_EQUAL(object[2].b, ci->b);
     }
 
     //*************************************************************************
     TEST(test_member_dereference_operator_for_bidirectional_iterator)
     {
-      struct Test
+      struct Object
       {
         int data;
         int b;
       };
 
-      std::list<Test> test = { { 1, 2 }, { 3, 4 }, { 5, 6 } };
-      std::list<Test>::iterator itr = test.begin();
+      std::list<Object> object = { { 1, 2 }, { 3, 4 }, { 5, 6 } };
+      std::list<Object>::iterator itr = object.begin();
 
-      etl::circular_iterator<std::list<Test>::iterator> ci(std::begin(test), std::end(test));
+      etl::circular_iterator<std::list<Object>::iterator> ci(std::begin(object), std::end(object));
 
       CHECK_EQUAL(itr->b, ci->b);
 
@@ -528,16 +528,16 @@ namespace
     //*************************************************************************
     TEST(test_member_dereference_operator_for_forward_iterator)
     {
-      struct Test
+      struct Object
       {
         int data;
         int b;
       };
 
-      std::forward_list<Test> test = { { 1, 2 }, { 3, 4 }, { 5, 6 } };
-      std::forward_list<Test>::iterator itr = test.begin();
+      std::forward_list<Object> object = { { 1, 2 }, { 3, 4 }, { 5, 6 } };
+      std::forward_list<Object>::iterator itr = object.begin();
 
-      etl::circular_iterator<std::forward_list<Test>::iterator> ci(std::begin(test), std::end(test));
+      etl::circular_iterator<std::forward_list<Object>::iterator> ci(std::begin(object), std::end(object));
 
       CHECK_EQUAL(itr->b, ci->b);
 
diff --git a/test/test_compare.cpp b/test/test_compare.cpp
index a11d611a..527c8542 100644
--- a/test/test_compare.cpp
+++ b/test/test_compare.cpp
@@ -37,35 +37,35 @@ namespace
 
   typedef etl::compare<int> CompareInt;
 
-  struct Test
+  struct Object
   {
     int a;
     int b;
   };
 
-  Test ta = { 1, 2 };
-  Test tb = { 2, 3 };
+  Object ta = { 1, 2 };
+  Object tb = { 2, 3 };
 
   //***********************************
-  bool operator <(const Test& lhs, const Test& rhs)
+  bool operator <(const Object& lhs, const Object& rhs)
   {
     return (lhs.a + lhs.b) < (rhs.a + rhs.b);
   }
 
   //***********************************
-  bool operator >(const Test& lhs, const Test& rhs)
+  bool operator >(const Object& lhs, const Object& rhs)
   {
     return (lhs.a + lhs.b) > (rhs.a + rhs.b);
   }
 
   //***********************************
-  bool operator <=(const Test& lhs, const Test& rhs)
+  bool operator <=(const Object& lhs, const Object& rhs)
   {
     return (lhs.a + lhs.b) <= (rhs.a + rhs.b);
   }
 
   //***********************************
-  bool operator >=(const Test& lhs, const Test& rhs)
+  bool operator >=(const Object& lhs, const Object& rhs)
   {
     return (lhs.a + lhs.b) >= (rhs.a + rhs.b);
   }
@@ -73,13 +73,13 @@ namespace
   //***********************************
   struct LessTest
   {
-    bool operator()(const Test& lhs, const Test& rhs) const
+    bool operator()(const Object& lhs, const Object& rhs) const
     {
       return (lhs.a + lhs.b) < (rhs.a + rhs.b);
     }
   };
 
-  typedef etl::compare<Test, LessTest> CompareTest;
+  typedef etl::compare<Object, LessTest> CompareTest;
 
   SUITE(test_compare)
   {
diff --git a/test/test_delegate.cpp b/test/test_delegate.cpp
index 63ff2648..e3fe0b31 100644
--- a/test/test_delegate.cpp
+++ b/test/test_delegate.cpp
@@ -71,7 +71,7 @@ namespace
   bool parameter_correct = false;
 
   //*****************************************************************************
-  // Test data structure.
+  // Object data structure.
   //*****************************************************************************
   struct Data
   {
@@ -79,7 +79,7 @@ namespace
   };
 
   //*****************************************************************************
-  // Test moveable only data structure.
+  // Object moveable only data structure.
   //*****************************************************************************
   struct MoveableOnlyData
   {
@@ -161,7 +161,7 @@ namespace
   //*****************************************************************************
   // The test class with member functions.
   //*****************************************************************************
-  class Test
+  class Object
   {
   public:
 
@@ -240,8 +240,8 @@ namespace
     return a * 2;
   }
 
-  Test test_static;
-  const Test const_test_static;
+  Object object_static;
+  const Object const_object_static;
 }
 
 namespace
@@ -437,9 +437,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_operator_void)
     {
-      Test test;
+      Object object;
 
-      etl::delegate<void(void)> d(test);
+      etl::delegate<void(void)> d(object);
 
       d();
 
@@ -449,9 +449,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_operator_void_create)
     {
-      Test test;
+      Object object;
 
-      auto d = etl::delegate<void(void)>::create(test);
+      auto d = etl::delegate<void(void)>::create(object);
 
       d();
 
@@ -462,9 +462,9 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_operator_void_create_constexpr)
     {
-      static Test test;
+      static Object object;
 
-      constexpr auto d = etl::delegate<void(void)>::create(test);
+      constexpr auto d = etl::delegate<void(void)>::create(object);
 
       d();
 
@@ -475,9 +475,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_operator_void_const)
     {
-      const Test test;
+      const Object object;
 
-      etl::delegate<void(void)> d(test);
+      etl::delegate<void(void)> d(object);
 
       d();
 
@@ -488,7 +488,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_operator_void_compile_time)
     {
-      auto d = etl::delegate<void(void)>::create<Test, test_static>();
+      auto d = etl::delegate<void(void)>::create<Object, object_static>();
 
       d();
 
@@ -499,7 +499,7 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_operator_void_compile_time_constexpr)
     {
-      constexpr auto d = etl::delegate<void(void)>::create<Test, test_static>();
+      constexpr auto d = etl::delegate<void(void)>::create<Object, object_static>();
 
       d();
 
@@ -510,7 +510,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_operator_void_compile_time_const)
     {
-      auto d = etl::delegate<void(void)>::create<const Test, const_test_static>();
+      auto d = etl::delegate<void(void)>::create<const Object, const_object_static>();
 
       d();
 
@@ -521,7 +521,7 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_operator_void_compile_time_const_constexpr)
     {
-      constexpr auto d = etl::delegate<void(void)>::create<const Test, const_test_static>();
+      constexpr auto d = etl::delegate<void(void)>::create<const Object, const_object_static>();
 
       d();
 
@@ -533,11 +533,11 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_assignment_member_operator_void)
     {
-      Test test;
+      Object object;
 
       etl::delegate<void(void)> d;
 
-      d = test;
+      d = object;
 
       d();
 
@@ -547,9 +547,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_void)
     {
-      Test test;
+      Object object;
 
-      auto d = etl::delegate<void(void)>::create<Test, &Test::member_void>(test);
+      auto d = etl::delegate<void(void)>::create<Object, &Object::member_void>(object);
 
       d();
 
@@ -560,9 +560,9 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_void_constexpr)
     {
-      static Test test;
+      static Object object;
 
-      constexpr auto d = etl::delegate<void(void)>::create<Test, &Test::member_void>(test);
+      constexpr auto d = etl::delegate<void(void)>::create<Object, &Object::member_void>(object);
 
       d();
 
@@ -573,9 +573,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_void_const)
     {
-      const Test test;
+      const Object object;
 
-      auto d = etl::delegate<void(void)>::create<Test, &Test::member_void_const>(test);
+      auto d = etl::delegate<void(void)>::create<Object, &Object::member_void_const>(object);
 
       d();
 
@@ -586,9 +586,9 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_void_const_constexpr)
     {
-      static const Test test;
+      static const Object object;
 
-      constexpr auto d = etl::delegate<void(void)>::create<Test, &Test::member_void_const>(test);
+      constexpr auto d = etl::delegate<void(void)>::create<Object, &Object::member_void_const>(object);
 
       d();
 
@@ -599,9 +599,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_int)
     {
-      Test test;
+      Object object;
 
-      auto d = etl::delegate<void(int, int)>::create<Test, &Test::member_int>(test);
+      auto d = etl::delegate<void(int, int)>::create<Object, &Object::member_int>(object);
 
       d(VALUE1, VALUE2);
 
@@ -613,9 +613,9 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_int_constexpr)
     {
-      static Test test;
+      static Object object;
 
-      constexpr auto d = etl::delegate<void(int, int)>::create<Test, &Test::member_int>(test);
+      constexpr auto d = etl::delegate<void(int, int)>::create<Object, &Object::member_int>(object);
 
       d(VALUE1, VALUE2);
 
@@ -627,9 +627,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_int_const)
     {
-      const Test test;
+      const Object object;
 
-      auto d = etl::delegate<void(int, int)>::create<Test, &Test::member_int_const>(test);
+      auto d = etl::delegate<void(int, int)>::create<Object, &Object::member_int_const>(object);
 
       d(VALUE1, VALUE2);
 
@@ -641,9 +641,9 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_int_const_constexpr)
     {
-      static const Test test;
+      static const Object object;
 
-      constexpr auto d = etl::delegate<void(int, int)>::create<Test, &Test::member_int_const>(test);
+      constexpr auto d = etl::delegate<void(int, int)>::create<Object, &Object::member_int_const>(object);
 
       d(VALUE1, VALUE2);
 
@@ -655,8 +655,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_reference)
     {
-      Test test;
-      auto d = etl::delegate<void(const Data&, int)>::create<Test, &Test::member_reference>(test);
+      Object object;
+      auto d = etl::delegate<void(const Data&, int)>::create<Object, &Object::member_reference>(object);
 
       Data data;
       data.d = VALUE1;
@@ -671,8 +671,8 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_reference_constexpr)
     {
-      static Test test;
-      constexpr auto d = etl::delegate<void(const Data&, int)>::create<Test, &Test::member_reference>(test);
+      static Object object;
+      constexpr auto d = etl::delegate<void(const Data&, int)>::create<Object, &Object::member_reference>(object);
 
       Data data;
       data.d = VALUE1;
@@ -687,8 +687,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_reference_const)
     {
-      const Test test;
-      auto d = etl::delegate<void(const Data&, int)>::create<Test, &Test::member_reference_const>(test);
+      const Object object;
+      auto d = etl::delegate<void(const Data&, int)>::create<Object, &Object::member_reference_const>(object);
 
       Data data;
       data.d = VALUE1;
@@ -703,8 +703,8 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_reference_const_constexpr)
     {
-      static const Test test;
-      constexpr auto d = etl::delegate<void(const Data&, int)>::create<Test, &Test::member_reference_const>(test);
+      static const Object object;
+      constexpr auto d = etl::delegate<void(const Data&, int)>::create<Object, &Object::member_reference_const>(object);
 
       Data data;
       data.d = VALUE1;
@@ -719,8 +719,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_moveableonly)
     {
-      Test test;
-      auto d = etl::delegate<void(MoveableOnlyData&&)>::create<Test, &Test::member_moveableonly>(test);
+      Object object;
+      auto d = etl::delegate<void(MoveableOnlyData&&)>::create<Object, &Object::member_moveableonly>(object);
 
       MoveableOnlyData data;
       data.d = VALUE1;
@@ -735,8 +735,8 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_moveableonly_constexpr)
     {
-      static Test test;
-      constexpr auto d = etl::delegate<void(MoveableOnlyData&&)>::create<Test, &Test::member_moveableonly>(test);
+      static Object object;
+      constexpr auto d = etl::delegate<void(MoveableOnlyData&&)>::create<Object, &Object::member_moveableonly>(object);
 
       MoveableOnlyData data;
       data.d = VALUE1;
@@ -751,7 +751,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_static)
     {
-      auto d = etl::delegate<void(const Data&, int)>::create<Test::member_static>();
+      auto d = etl::delegate<void(const Data&, int)>::create<Object::member_static>();
 
       Data data;
       data.d = VALUE1;
@@ -766,7 +766,7 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_static_constexpr)
     {
-      constexpr auto d = etl::delegate<void(const Data&, int)>::create<Test::member_static>();
+      constexpr auto d = etl::delegate<void(const Data&, int)>::create<Object::member_static>();
 
       Data data;
       data.d = VALUE1;
@@ -782,7 +782,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_void_compile_time)
     {
-      auto d = etl::delegate<void(void)>::create<Test, test_static, &Test::member_void>();
+      auto d = etl::delegate<void(void)>::create<Object, object_static, &Object::member_void>();
 
       d();
 
@@ -793,7 +793,7 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_void_compile_time_constexpr)
     {
-      constexpr auto d = etl::delegate<void(void)>::create<Test, test_static, &Test::member_void>();
+      constexpr auto d = etl::delegate<void(void)>::create<Object, object_static, &Object::member_void>();
 
       d();
 
@@ -804,7 +804,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_void_const_compile_time)
     {
-      auto d = etl::delegate<void(void)>::create<Test, const_test_static, &Test::member_void_const>();
+      auto d = etl::delegate<void(void)>::create<Object, const_object_static, &Object::member_void_const>();
 
       d();
 
@@ -815,7 +815,7 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_void_const_compile_time_constexpr)
     {
-      constexpr auto d = etl::delegate<void(void)>::create<Test, const_test_static, &Test::member_void_const>();
+      constexpr auto d = etl::delegate<void(void)>::create<Object, const_object_static, &Object::member_void_const>();
 
       d();
 
@@ -826,7 +826,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_int_compile_time)
     {
-      auto d = etl::delegate<void(int, int)>::create<Test, test_static, &Test::member_int>();
+      auto d = etl::delegate<void(int, int)>::create<Object, object_static, &Object::member_int>();
 
       d(VALUE1, VALUE2);
 
@@ -838,7 +838,7 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_int_compile_time_constexpr)
     {
-      constexpr auto d = etl::delegate<void(int, int)>::create<Test, test_static, &Test::member_int>();
+      constexpr auto d = etl::delegate<void(int, int)>::create<Object, object_static, &Object::member_int>();
 
       d(VALUE1, VALUE2);
 
@@ -850,7 +850,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_int_const_compile_time)
     {
-      auto d = etl::delegate<void(int, int)>::create<Test, const_test_static, &Test::member_int_const>();
+      auto d = etl::delegate<void(int, int)>::create<Object, const_object_static, &Object::member_int_const>();
 
       d(VALUE1, VALUE2);
 
@@ -862,7 +862,7 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_int_const_compile_time_constexpr)
     {
-      constexpr auto d = etl::delegate<void(int, int)>::create<Test, const_test_static, &Test::member_int_const>();
+      constexpr auto d = etl::delegate<void(int, int)>::create<Object, const_object_static, &Object::member_int_const>();
 
       d(VALUE1, VALUE2);
 
@@ -874,7 +874,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_reference_compile_time)
     {
-      auto d = etl::delegate<void(const Data&, int)>::create<Test, test_static, &Test::member_reference>();
+      auto d = etl::delegate<void(const Data&, int)>::create<Object, object_static, &Object::member_reference>();
 
       Data data;
       data.d = VALUE1;
@@ -889,7 +889,7 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_reference_compile_time_constexpr)
     {
-      constexpr auto d = etl::delegate<void(const Data&, int)>::create<Test, test_static, &Test::member_reference>();
+      constexpr auto d = etl::delegate<void(const Data&, int)>::create<Object, object_static, &Object::member_reference>();
 
       Data data;
       data.d = VALUE1;
@@ -904,7 +904,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_reference_const_compile_time)
     {
-      auto d = etl::delegate<void(const Data&, int)>::create<Test, const_test_static, &Test::member_reference_const>();
+      auto d = etl::delegate<void(const Data&, int)>::create<Object, const_object_static, &Object::member_reference_const>();
 
       Data data;
       data.d = VALUE1;
@@ -919,7 +919,7 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_member_reference_const_compile_time_constexpr)
     {
-      constexpr auto d = etl::delegate<void(const Data&, int)>::create<Test, const_test_static, &Test::member_reference_const>();
+      constexpr auto d = etl::delegate<void(const Data&, int)>::create<Object, const_object_static, &Object::member_reference_const>();
 
       Data data;
       data.d = VALUE1;
@@ -960,10 +960,10 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_set_member_reference)
     {
-      Test test;
+      Object object;
       etl::delegate<void(const Data&, int)> d;
       
-      d.set<Test, &Test::member_reference>(test);
+      d.set<Object, &Object::member_reference>(object);
 
       Data data;
       data.d = VALUE1;
@@ -977,10 +977,10 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_set_const_member_reference)
     {
-      Test test;
+      Object object;
       etl::delegate<void(const Data&, int)> d;
 
-      d.set<Test, &Test::member_reference_const>(test);
+      d.set<Object, &Object::member_reference_const>(object);
 
       Data data;
       data.d = VALUE1;
@@ -996,7 +996,7 @@ namespace
     {
       etl::delegate<void(const Data&, int)> d;
 
-      d.set<Test, test_static, &Test::member_reference>();
+      d.set<Object, object_static, &Object::member_reference>();
 
       Data data;
       data.d = VALUE1;
@@ -1012,7 +1012,7 @@ namespace
     {
       etl::delegate<void(const Data&, int)> d;
 
-      d.set<Test, const_test_static, &Test::member_reference_const>();
+      d.set<Object, const_object_static, &Object::member_reference_const>();
 
       Data data;
       data.d = VALUE1;
@@ -1027,9 +1027,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_copy_construct)
     {
-      Test test;
+      Object object;
 
-      auto d1 = etl::delegate<void(int, int)>::create<Test, &Test::member_int>(test);
+      auto d1 = etl::delegate<void(int, int)>::create<Object, &Object::member_int>(object);
       auto d2(d1);
 
       d2(VALUE1, VALUE2);
@@ -1042,9 +1042,9 @@ namespace
 #if ETL_USING_CPP14
     TEST_FIXTURE(SetupFixture, test_copy_construct_constexpr)
     {
-      static Test test;
+      static Object object;
 
-      constexpr auto d1 = etl::delegate<void(int, int)>::create<Test, &Test::member_int>(test);
+      constexpr auto d1 = etl::delegate<void(int, int)>::create<Object, &Object::member_int>(object);
       constexpr auto d2(d1);
 
       d2(VALUE1, VALUE2);
@@ -1057,9 +1057,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_assignment)
     {
-      Test test;
+      Object object;
 
-      auto d1 = etl::delegate<void(int, int)>::create<Test, &Test::member_int>(test);
+      auto d1 = etl::delegate<void(int, int)>::create<Object, &Object::member_int>(object);
       etl::delegate<void(int, int)> d2;
 
       d2 = d1;
@@ -1073,9 +1073,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_delegate_equal)
     {
-      Test test;
+      Object object;
 
-      auto d1 = etl::delegate<void(int, int)>::create<Test, &Test::member_int>(test);
+      auto d1 = etl::delegate<void(int, int)>::create<Object, &Object::member_int>(object);
       auto d2 = d1;
 
       CHECK(d1 == d2);
@@ -1084,10 +1084,10 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_delegate_not_equal)
     {
-      Test test;
+      Object object;
 
-      auto d1 = etl::delegate<void(int, int)>::create<Test, &Test::member_int>(test);
-      auto d2 = etl::delegate<void(int, int)>::create<Test, &Test::member_int_const>(test);;
+      auto d1 = etl::delegate<void(int, int)>::create<Object, &Object::member_int>(object);
+      auto d2 = etl::delegate<void(int, int)>::create<Object, &Object::member_int_const>(object);;
 
       CHECK(d1 != d2);
     }
@@ -1205,12 +1205,12 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_delegate_identification)
     {
-      Test test1;
-      Test test2;
+      Object test1;
+      Object test2;
 
       auto d1 = etl::delegate<void(int, int)>::create<free_int>();
-      auto d2 = etl::delegate<void(int, int)>::create<Test, &Test::member_int>(test1);
-      auto d3 = etl::delegate<void(int, int)>::create<Test, &Test::member_int>(test2);
+      auto d2 = etl::delegate<void(int, int)>::create<Object, &Object::member_int>(test1);
+      auto d3 = etl::delegate<void(int, int)>::create<Object, &Object::member_int>(test2);
 
       etl::delegate<void(int, int)> d4;
 
@@ -1241,7 +1241,7 @@ namespace
       CHECK(*itr != d2);
       CHECK(*itr == d3);
 
-      d4 = etl::delegate<void(int, int)>::create<Test, &Test::member_int>(test2); // Same as d3
+      d4 = etl::delegate<void(int, int)>::create<Object, &Object::member_int>(test2); // Same as d3
       itr = std::find(delegate_list.begin(), delegate_list.end(), d4);
       CHECK(*itr != d1);
       CHECK(*itr != d2);
diff --git a/test/test_delegate_cpp03.cpp b/test/test_delegate_cpp03.cpp
index 3156cb78..10be5d4d 100644
--- a/test/test_delegate_cpp03.cpp
+++ b/test/test_delegate_cpp03.cpp
@@ -70,7 +70,7 @@ namespace
   bool parameter_correct = false;
 
   //*****************************************************************************
-  // Test data structure.
+  // Object data structure.
   //*****************************************************************************
   struct Data
   {
@@ -137,7 +137,7 @@ namespace
   //*****************************************************************************
   // The test class with member functions.
   //*****************************************************************************
-  class Test
+  class Object
   {
   public:
 
@@ -208,8 +208,8 @@ namespace
     return a * 2;
   }
 
-  Test test_static;
-  const Test const_test_static;
+  Object test_static;
+  const Object const_test_static;
 }
 
 namespace
@@ -297,9 +297,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_operator_void)
     {
-      Test test;
+      Object object;
 
-      etl_cpp03::delegate<void(void)> d(test);
+      etl_cpp03::delegate<void(void)> d(object);
 
       d();
 
@@ -309,9 +309,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_operator_void_create)
     {
-      Test test;
+      Object object;
 
-      auto d = etl_cpp03::delegate<void(void)>::create(test);
+      auto d = etl_cpp03::delegate<void(void)>::create(object);
 
       d();
 
@@ -321,9 +321,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_operator_void_const)
     {
-      const Test test;
+      const Object object;
 
-      etl_cpp03::delegate<void(void)> d(test);
+      etl_cpp03::delegate<void(void)> d(object);
 
       d();
 
@@ -334,7 +334,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_operator_void_compile_time)
     {
-      auto d = etl_cpp03::delegate<void(void)>::create<Test, test_static>();
+      auto d = etl_cpp03::delegate<void(void)>::create<Object, test_static>();
 
       d();
 
@@ -344,7 +344,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_operator_void_compile_time_const)
     {
-      auto d = etl_cpp03::delegate<void(void)>::create<const Test, const_test_static>();
+      auto d = etl_cpp03::delegate<void(void)>::create<const Object, const_test_static>();
 
       d();
 
@@ -355,11 +355,11 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_assignment_member_operator_void)
     {
-      Test test;
+      Object object;
 
       etl_cpp03::delegate<void(void)> d;
 
-      d = test;
+      d = object;
 
       d();
 
@@ -369,9 +369,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_void)
     {
-      Test test;
+      Object object;
 
-      auto d = etl_cpp03::delegate<void(void)>::create<Test, &Test::member_void>(test);
+      auto d = etl_cpp03::delegate<void(void)>::create<Object, &Object::member_void>(object);
 
       d();
 
@@ -381,9 +381,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_void_const)
     {
-      const Test test;
+      const Object object;
 
-      auto d = etl_cpp03::delegate<void(void)>::create<Test, &Test::member_void_const>(test);
+      auto d = etl_cpp03::delegate<void(void)>::create<Object, &Object::member_void_const>(object);
 
       d();
 
@@ -393,9 +393,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_int)
     {
-      Test test;
+      Object object;
 
-      auto d = etl_cpp03::delegate<void(int)>::create<Test, &Test::member_int>(test);
+      auto d = etl_cpp03::delegate<void(int)>::create<Object, &Object::member_int>(object);
 
       d(VALUE1);
 
@@ -406,9 +406,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_int_const)
     {
-      const Test test;
+      const Object object;
 
-      auto d = etl_cpp03::delegate<void(int)>::create<Test, &Test::member_int_const>(test);
+      auto d = etl_cpp03::delegate<void(int)>::create<Object, &Object::member_int_const>(object);
 
       d(VALUE1);
 
@@ -419,8 +419,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_reference)
     {
-      Test test;
-      auto d = etl_cpp03::delegate<void(const Data&)>::create<Test, &Test::member_reference>(test);
+      Object object;
+      auto d = etl_cpp03::delegate<void(const Data&)>::create<Object, &Object::member_reference>(object);
 
       Data data;
       data.d = VALUE1;
@@ -434,8 +434,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_reference_const)
     {
-      const Test test;
-      auto d = etl_cpp03::delegate<void(const Data&)>::create<Test, &Test::member_reference_const>(test);
+      const Object object;
+      auto d = etl_cpp03::delegate<void(const Data&)>::create<Object, &Object::member_reference_const>(object);
 
       Data data;
       data.d = VALUE1;
@@ -449,7 +449,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_static)
     {
-      auto d = etl_cpp03::delegate<void(const Data&)>::create<Test::member_static>();
+      auto d = etl_cpp03::delegate<void(const Data&)>::create<Object::member_static>();
 
       Data data;
       data.d = VALUE1;
@@ -464,7 +464,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_void_compile_time)
     {
-      auto d = etl_cpp03::delegate<void(void)>::create<Test, test_static, &Test::member_void>();
+      auto d = etl_cpp03::delegate<void(void)>::create<Object, test_static, &Object::member_void>();
 
       d();
 
@@ -474,7 +474,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_void_const_compile_time)
     {
-      auto d = etl_cpp03::delegate<void(void)>::create<Test, const_test_static, &Test::member_void_const>();
+      auto d = etl_cpp03::delegate<void(void)>::create<Object, const_test_static, &Object::member_void_const>();
 
       d();
 
@@ -484,7 +484,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_int_compile_time)
     {
-      auto d = etl_cpp03::delegate<void(int)>::create<Test, test_static, &Test::member_int>();
+      auto d = etl_cpp03::delegate<void(int)>::create<Object, test_static, &Object::member_int>();
 
       d(VALUE1);
 
@@ -495,7 +495,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_int_const_compile_time)
     {
-      auto d = etl_cpp03::delegate<void(int)>::create<Test, const_test_static, &Test::member_int_const>();
+      auto d = etl_cpp03::delegate<void(int)>::create<Object, const_test_static, &Object::member_int_const>();
 
       d(VALUE1);
 
@@ -506,7 +506,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_reference_compile_time)
     {
-      auto d = etl_cpp03::delegate<void(const Data&)>::create<Test, test_static, &Test::member_reference>();
+      auto d = etl_cpp03::delegate<void(const Data&)>::create<Object, test_static, &Object::member_reference>();
 
       Data data;
       data.d = VALUE1;
@@ -520,7 +520,7 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_reference_const_compile_time)
     {
-      auto d = etl_cpp03::delegate<void(const Data&)>::create<Test, const_test_static, &Test::member_reference_const>();
+      auto d = etl_cpp03::delegate<void(const Data&)>::create<Object, const_test_static, &Object::member_reference_const>();
 
       Data data;
       data.d = VALUE1;
@@ -560,10 +560,10 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_set_member_reference)
     {
-      Test test;
+      Object object;
       etl_cpp03::delegate<void(const Data&)> d;
       
-      d.set<Test, &Test::member_reference>(test);
+      d.set<Object, &Object::member_reference>(object);
 
       Data data;
       data.d = VALUE1;
@@ -577,10 +577,10 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_set_const_member_reference)
     {
-      Test test;
+      Object object;
       etl_cpp03::delegate<void(const Data&)> d;
 
-      d.set<Test, &Test::member_reference_const>(test);
+      d.set<Object, &Object::member_reference_const>(object);
 
       Data data;
       data.d = VALUE1;
@@ -596,7 +596,7 @@ namespace
     {
       etl_cpp03::delegate<void(const Data&)> d;
 
-      d.set<Test, test_static, &Test::member_reference>();
+      d.set<Object, test_static, &Object::member_reference>();
 
       Data data;
       data.d = VALUE1;
@@ -612,7 +612,7 @@ namespace
     {
       etl_cpp03::delegate<void(const Data&)> d;
 
-      d.set<Test, const_test_static, &Test::member_reference_const>();
+      d.set<Object, const_test_static, &Object::member_reference_const>();
 
       Data data;
       data.d = VALUE1;
@@ -627,9 +627,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_copy_construct)
     {
-      Test test;
+      Object object;
 
-      auto d1 = etl_cpp03::delegate<void(int)>::create<Test, &Test::member_int>(test);
+      auto d1 = etl_cpp03::delegate<void(int)>::create<Object, &Object::member_int>(object);
       auto d2(d1);
 
       d2(VALUE1);
@@ -641,9 +641,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_assignment)
     {
-      Test test;
+      Object object;
 
-      auto d1 = etl_cpp03::delegate<void(int)>::create<Test, &Test::member_int>(test);
+      auto d1 = etl_cpp03::delegate<void(int)>::create<Object, &Object::member_int>(object);
       etl_cpp03::delegate<void(int)> d2;
 
       d2 = d1;
@@ -657,9 +657,9 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_delegate_equal)
     {
-      Test test;
+      Object object;
 
-      auto d1 = etl_cpp03::delegate<void(int)>::create<Test, &Test::member_int>(test);
+      auto d1 = etl_cpp03::delegate<void(int)>::create<Object, &Object::member_int>(object);
       auto d2 = d1;
 
       CHECK(d1 == d2);
@@ -668,10 +668,10 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_delegate_not_equal)
     {
-      Test test;
+      Object object;
 
-      auto d1 = etl_cpp03::delegate<void(int)>::create<Test, &Test::member_int>(test);
-      auto d2 = etl_cpp03::delegate<void(int)>::create<Test, &Test::member_int_const>(test);;
+      auto d1 = etl_cpp03::delegate<void(int)>::create<Object, &Object::member_int>(object);
+      auto d2 = etl_cpp03::delegate<void(int)>::create<Object, &Object::member_int_const>(object);;
 
       CHECK(d1 != d2);
     }
@@ -776,12 +776,12 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_delegate_identification)
     {
-      Test test1;
-      Test test2;
+      Object test1;
+      Object test2;
 
       auto d1 = etl_cpp03::delegate<void(int)>::create<free_int>();
-      auto d2 = etl_cpp03::delegate<void(int)>::create<Test, &Test::member_int>(test1);
-      auto d3 = etl_cpp03::delegate<void(int)>::create<Test, &Test::member_int>(test2);
+      auto d2 = etl_cpp03::delegate<void(int)>::create<Object, &Object::member_int>(test1);
+      auto d3 = etl_cpp03::delegate<void(int)>::create<Object, &Object::member_int>(test2);
 
       etl_cpp03::delegate<void(int)> d4;
 
@@ -812,7 +812,7 @@ namespace
       CHECK(*itr != d2);
       CHECK(*itr == d3);
 
-      d4 = etl_cpp03::delegate<void(int)>::create<Test, &Test::member_int>(test2); // Same as d3
+      d4 = etl_cpp03::delegate<void(int)>::create<Object, &Object::member_int>(test2); // Same as d3
       itr = std::find(delegate_list.begin(), delegate_list.end(), d4);
       CHECK(*itr != d1);
       CHECK(*itr != d2);
diff --git a/test/test_delegate_service.cpp b/test/test_delegate_service.cpp
index 27071ac8..a9aa858e 100644
--- a/test/test_delegate_service.cpp
+++ b/test/test_delegate_service.cpp
@@ -68,12 +68,12 @@ namespace
   //*****************************************************************************
   // The test class with member functions.
   //*****************************************************************************
-  class Test
+  class Object
   {
   public:
 
-    Test()
-      : callback(Service::delegate_type::create<Test, &Test::member1>(*this))
+    Object()
+      : callback(Service::delegate_type::create<Object, &Object::member1>(*this))
     {
     }
 
@@ -93,10 +93,10 @@ namespace
     etl::delegate<void(size_t)> callback;
   };
 
-  Test test;
+  Object object;
 
   // Callback for 'member2'.
-  ETL_CONSTEXPR14 Service::delegate_type member_callback = Service::delegate_type::create<Test, test, &Test::member2>();
+  ETL_CONSTEXPR14 Service::delegate_type member_callback = Service::delegate_type::create<Object, object, &Object::member2>();
 
   // Callback for 'global'.
   ETL_CONSTEXPR14 Service::delegate_type global_callback = Service::delegate_type::create<global>();
@@ -138,7 +138,7 @@ namespace
       Service service;
 
       service.register_delegate<Global>(global_callback);
-      service.register_delegate<Member1>(test.callback);
+      service.register_delegate<Member1>(object.callback);
       service.register_delegate<Member2>(member_callback);
 
       service.call<Global>();
@@ -156,7 +156,7 @@ namespace
       Service service;
 
       service.register_delegate(Global,  global_callback);
-      service.register_delegate(Member1, test.callback);
+      service.register_delegate(Member1, object.callback);
       service.register_delegate(Member2, member_callback);
 
       service.call(Global);
@@ -174,7 +174,7 @@ namespace
       Service service;
 
       service.register_delegate<Global>(global_callback);
-      service.register_delegate<Member1>(test.callback);
+      service.register_delegate<Member1>(object.callback);
       service.register_delegate<Member2>(member_callback);
 
       service.call<Member1>();
@@ -192,7 +192,7 @@ namespace
       Service service;
 
       service.register_delegate(Global,  global_callback);
-      service.register_delegate(Member1, test.callback);
+      service.register_delegate(Member1, object.callback);
       service.register_delegate(Member2, member_callback);
 
       service.call(Member1);
@@ -210,7 +210,7 @@ namespace
       Service service;
 
       service.register_delegate<Global>(global_callback);
-      service.register_delegate<Member1>(test.callback);
+      service.register_delegate<Member1>(object.callback);
       service.register_delegate<Member2>(member_callback);
 
       service.call<Member2>();
@@ -228,7 +228,7 @@ namespace
       Service service;
 
       service.register_delegate<Global>(global_callback);
-      service.register_delegate<Member1>(test.callback);
+      service.register_delegate<Member1>(object.callback);
       service.register_delegate<Member2>(member_callback);
 
       service.call(Out_Of_Range);
@@ -246,7 +246,7 @@ namespace
       Service service;
 
       service.register_delegate<Global>(global_callback);
-      service.register_delegate<Member1>(test.callback);
+      service.register_delegate<Member1>(object.callback);
       service.register_delegate<Member2>(member_callback);
 
       service.register_unhandled_delegate(unhandled_callback);
diff --git a/test/test_delegate_service_compile_time.cpp b/test/test_delegate_service_compile_time.cpp
index 320a23be..c97db964 100644
--- a/test/test_delegate_service_compile_time.cpp
+++ b/test/test_delegate_service_compile_time.cpp
@@ -67,11 +67,11 @@ namespace
   //*****************************************************************************
   // The test class with member functions.
   //*****************************************************************************
-  class Test
+  class Object
   {
   public:
 
-    Test()
+    Object()
     {
     }
 
@@ -82,10 +82,10 @@ namespace
     }
   };
 
-  Test test;
+  Object object;
 
   // Callback for 'member'.
-  ETL_CONSTEXPR14 etl::delegate<void(size_t)> member_callback = etl::delegate<void(size_t)>::create<Test, test, &Test::member>();
+  ETL_CONSTEXPR14 etl::delegate<void(size_t)> member_callback = etl::delegate<void(size_t)>::create<Object, object, &Object::member>();
 
   // Callback for 'global'.
   ETL_CONSTEXPR14 etl::delegate<void(size_t)> global_callback = etl::delegate<void(size_t)>::create<global>();
diff --git a/test/test_delegate_service_cpp03.cpp b/test/test_delegate_service_cpp03.cpp
index f8d79b85..aa1b0de5 100644
--- a/test/test_delegate_service_cpp03.cpp
+++ b/test/test_delegate_service_cpp03.cpp
@@ -68,12 +68,12 @@ namespace
   //*****************************************************************************
   // The test class with member functions.
   //*****************************************************************************
-  class Test
+  class Object
   {
   public:
 
-    Test()
-      : callback(Service::delegate_type::create<Test, &Test::member1>(*this))
+    Object()
+      : callback(Service::delegate_type::create<Object, &Object::member1>(*this))
     {
     }
 
@@ -93,10 +93,10 @@ namespace
     Service::delegate_type callback;
   };
 
-  Test test;
+  Object object;
 
   // Callback for 'member2'.
-  Service::delegate_type member_callback = Service::delegate_type::create<Test, test, &Test::member2>();
+  Service::delegate_type member_callback = Service::delegate_type::create<Object, object, &Object::member2>();
 
   // Callback for 'global'.
   Service::delegate_type global_callback = Service::delegate_type::create<global>();
diff --git a/test/test_deque.cpp b/test/test_deque.cpp
index 42db7899..6aa6fbf3 100644
--- a/test/test_deque.cpp
+++ b/test/test_deque.cpp
@@ -47,15 +47,15 @@ namespace
 {
   SUITE(test_deque)
   {
-    const size_t SIZE = 14UL;
+    const size_t Size = 14UL;
 
     typedef TestDataDC<std::string>  DC;
     typedef TestDataNDC<std::string> NDC;
 
-    typedef etl::deque<int, SIZE>    DataInt;
+    typedef etl::deque<int, Size>    DataInt;
     typedef etl::ideque<int>         IDataInt;
-    typedef etl::deque<DC, SIZE>     DataDC;
-    typedef etl::deque<NDC, SIZE>    DataNDC;
+    typedef etl::deque<DC, Size>     DataDC;
+    typedef etl::deque<NDC, Size>    DataNDC;
     typedef etl::ideque<NDC>         IDataNDC;
 
     typedef std::deque<NDC>          Compare_Data;
@@ -100,14 +100,14 @@ namespace
       CHECK(!data.full());
       CHECK(data.begin() == data.end());
       CHECK_EQUAL(0U, data.size());
-      CHECK_EQUAL(SIZE, data.max_size());
+      CHECK_EQUAL(Size, data.max_size());
     }
 
     //*************************************************************************
     TEST(test_constructor_fill)
     {
-      Compare_Data compare_data(SIZE, N999);
-      DataNDC data(SIZE, N999);
+      Compare_Data compare_data(Size, N999);
+      DataNDC data(Size, N999);
 
       CHECK_EQUAL(compare_data.size(), data.size());
       CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
@@ -118,8 +118,8 @@ namespace
     {
       int current_count = NDC::get_instance_count();
 
-      DataNDC* pdata = new DataNDC(SIZE, N999);
-      CHECK_EQUAL(int(current_count + SIZE), NDC::get_instance_count());
+      DataNDC* pdata = new DataNDC(Size, N999);
+      CHECK_EQUAL(int(current_count + Size), NDC::get_instance_count());
 
       IDataNDC* pidata = pdata;
       delete pidata;
@@ -129,7 +129,7 @@ namespace
     //*************************************************************************
     TEST(test_constructor_fill_excess)
     {
-      CHECK_THROW(DataNDC(SIZE + 1, N999), etl::deque_full);
+      CHECK_THROW(DataNDC(Size + 1, N999), etl::deque_full);
     }
 
     //*************************************************************************
@@ -167,8 +167,7 @@ namespace
     //*************************************************************************
     TEST(test_move_constructor)
     {
-      const size_t SIZE = 10UL;
-      typedef etl::deque<std::unique_ptr<uint32_t>, SIZE> Data;
+      typedef etl::deque<std::unique_ptr<uint32_t>, Size> Data;
 
       std::unique_ptr<uint32_t> p1(new uint32_t(1U));
       std::unique_ptr<uint32_t> p2(new uint32_t(2U));
@@ -196,8 +195,7 @@ namespace
     //*************************************************************************
     TEST(test_move_insert_erase)
     {
-      const size_t SIZE = 10UL;
-      typedef etl::deque<std::unique_ptr<uint32_t>, SIZE> Data;
+      typedef etl::deque<std::unique_ptr<uint32_t>, Size> Data;
 
       std::unique_ptr<uint32_t> p1(new uint32_t(1U));
       std::unique_ptr<uint32_t> p2(new uint32_t(2U));
@@ -249,8 +247,7 @@ namespace
     //*************************************************************************
     TEST(test_move_assignment)
     {
-      const size_t SIZE = 10UL;
-      typedef etl::deque<std::unique_ptr<uint32_t>, SIZE> Data;
+      typedef etl::deque<std::unique_ptr<uint32_t>, Size> Data;
 
       std::unique_ptr<uint32_t> p1(new uint32_t(1U));
       std::unique_ptr<uint32_t> p2(new uint32_t(2U));
@@ -294,8 +291,7 @@ namespace
     //*************************************************************************
     TEST(test_move_assignment_interface)
     {
-      const size_t SIZE = 10UL;
-      typedef etl::deque<std::unique_ptr<uint32_t>, SIZE> Data;
+      typedef etl::deque<std::unique_ptr<uint32_t>, Size> Data;
       typedef etl::ideque<std::unique_ptr<uint32_t>> IData;
 
       std::unique_ptr<uint32_t> p1(new uint32_t(1U));
@@ -366,9 +362,9 @@ namespace
       Compare_Data compare_data;
       DataNDC data;
 
-      compare_data.assign(SIZE, N999);
+      compare_data.assign(Size, N999);
 
-      CHECK_NO_THROW(data.assign(SIZE, N999));
+      CHECK_NO_THROW(data.assign(Size, N999));
 
       CHECK_EQUAL(compare_data.size(), data.size());
       CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
@@ -379,7 +375,7 @@ namespace
     {
       DataNDC data;
 
-      CHECK_THROW(data.assign(SIZE + 1, N999), etl::deque_full);
+      CHECK_THROW(data.assign(Size + 1, N999), etl::deque_full);
     }
 
     //*************************************************************************
@@ -539,7 +535,7 @@ namespace
     //*************************************************************************
     TEST(test_iterator_comparison)
     {
-      DataNDC data(SIZE, N0);
+      DataNDC data(Size, N0);
 
       DataNDC::iterator first  = data.begin() + 1;
       DataNDC::iterator second = data.begin() + 1;
@@ -579,7 +575,7 @@ namespace
     //*************************************************************************
     TEST(test_const_iterator_comparison)
     {
-      DataNDC data(SIZE, N0);
+      DataNDC data(Size, N0);
 
       DataNDC::const_iterator first  = data.begin() + 1;
       DataNDC::const_iterator second = data.begin() + 1;
@@ -619,7 +615,7 @@ namespace
     //*************************************************************************
     TEST(test_iterator_comparison_rollover_left)
     {
-      DataNDC data(SIZE, N0);
+      DataNDC data(Size, N0);
 
       data.pop_back();
       data.pop_back();
@@ -640,7 +636,7 @@ namespace
     //*************************************************************************
     TEST(test_const_iterator_comparison_rollover_left)
     {
-      DataNDC data(SIZE, N0);
+      DataNDC data(Size, N0);
 
       data.pop_back();
       data.pop_back();
@@ -661,7 +657,7 @@ namespace
     //*************************************************************************
     TEST(test_iterator_comparison_rollover_right)
     {
-      DataNDC data(SIZE, N0);
+      DataNDC data(Size, N0);
 
       data.pop_front();
       data.pop_front();
@@ -682,7 +678,7 @@ namespace
     //*************************************************************************
     TEST(test_const_iterator_comparison_rollover_right)
     {
-      DataNDC data(SIZE, N0);
+      DataNDC data(Size, N0);
 
       data.pop_front();
       data.pop_front();
@@ -703,7 +699,7 @@ namespace
     //*************************************************************************
     TEST(test_reverse_iterator_comparison)
     {
-      DataNDC data(SIZE, N0);
+      DataNDC data(Size, N0);
 
       DataNDC::reverse_iterator first  = data.rbegin() + 1;
       DataNDC::reverse_iterator second = data.rbegin() + 4;
@@ -715,7 +711,7 @@ namespace
     //*************************************************************************
     TEST(test_const_reverse_iterator_comparison)
     {
-      DataNDC data(SIZE, N0);
+      DataNDC data(Size, N0);
 
       DataNDC::const_reverse_iterator first  = data.crbegin() + 1;
       DataNDC::const_reverse_iterator second = data.crbegin() + 4;
@@ -727,7 +723,7 @@ namespace
     //*************************************************************************
     TEST(test_reverse_iterator_comparison_rollover_left)
     {
-      DataNDC data(SIZE, N0);
+      DataNDC data(Size, N0);
 
       data.pop_back();
       data.pop_back();
@@ -748,7 +744,7 @@ namespace
     //*************************************************************************
     TEST(test_const_reverse_iterator_comparison_rollover_left)
     {
-      DataNDC data(SIZE, N0);
+      DataNDC data(Size, N0);
 
       data.pop_back();
       data.pop_back();
@@ -769,7 +765,7 @@ namespace
     //*************************************************************************
     TEST(test_reverse_iterator_comparison_rollover_right)
     {
-      DataNDC data(SIZE, N0);
+      DataNDC data(Size, N0);
 
       data.pop_front();
       data.pop_front();
@@ -790,7 +786,7 @@ namespace
     //*************************************************************************
     TEST(test_const_reverse_iterator_comparison_rollover_right)
     {
-      DataNDC data(SIZE, N0);
+      DataNDC data(Size, N0);
 
       data.pop_front();
       data.pop_front();
@@ -820,7 +816,7 @@ namespace
     TEST(test_full)
     {
       DataDC data;
-      data.resize(SIZE);
+      data.resize(Size);
 
       CHECK(data.full());
     }
@@ -830,13 +826,13 @@ namespace
     {
       DataDC data;
 
-      data.resize(SIZE);
+      data.resize(Size);
       data.clear();
       CHECK(data.empty());
 
       // Do it again to check that clear() didn't screw up the internals.
-      data.resize(SIZE);
-      CHECK_EQUAL(SIZE, data.size());
+      data.resize(Size);
+      CHECK_EQUAL(Size, data.size());
       data.clear();
       CHECK(data.empty());
     }
@@ -846,12 +842,12 @@ namespace
     {
       DataInt data;
 
-      data.resize(SIZE);
+      data.resize(Size);
       data.clear();
       CHECK(data.empty());
 
       // Do it again to check that clear() didn't screw up the internals.
-      data.resize(SIZE);
+      data.resize(Size);
       data.clear();
       CHECK(data.empty());
     }
@@ -1012,18 +1008,18 @@ namespace
       };
 
       // First fill with Initial values.
-      etl::deque<S, SIZE> data;
-      data.resize(SIZE, S(Initial));
+      etl::deque<S, Size> data;
+      data.resize(Size, S(Initial));
       data.clear();
 
       // Then emplace Default values.
-      for (size_t i = 0; i < SIZE; ++i)
+      for (size_t i = 0; i < Size; ++i)
       {
         data.emplace(data.end());
       }
 
       // Compare with an array of default values.
-      std::array<S, SIZE> compare_data;
+      std::array<S, Size> compare_data;
       compare_data.fill(S());
 
       CHECK_TRUE(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
@@ -1056,18 +1052,18 @@ namespace
       };
 
       // First fill with Initial values.
-      etl::deque<S, SIZE> data;
-      data.resize(SIZE, S(Initial));
+      etl::deque<S, Size> data;
+      data.resize(Size, S(Initial));
       data.clear();
 
       // Then emplace Default values.
-      for (size_t i = 0; i < SIZE; ++i)
+      for (size_t i = 0; i < Size; ++i)
       {
         data.emplace_front();
       }
 
       // Compare with an array of default values.
-      std::array<S, SIZE> compare_data;
+      std::array<S, Size> compare_data;
       compare_data.fill(S());
 
       CHECK_TRUE(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
@@ -1100,18 +1096,18 @@ namespace
       };
 
       // First fill with Initial values.
-      etl::deque<S, SIZE> data;
-      data.resize(SIZE, S(Initial));
+      etl::deque<S, Size> data;
+      data.resize(Size, S(Initial));
       data.clear();
 
       // Then emplace Default values.
-      for (size_t i = 0; i < SIZE; ++i)
+      for (size_t i = 0; i < Size; ++i)
       {
         data.emplace_back();
       }
 
       // Compare with an array of default values.
-      std::array<S, SIZE> compare_data;
+      std::array<S, Size> compare_data;
       compare_data.fill(S());
 
       CHECK_TRUE(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
@@ -1120,7 +1116,7 @@ namespace
     //*************************************************************************
     TEST(test_insert_n_value_position)
     {
-      size_t max_insert = SIZE - initial_data_small.size();
+      size_t max_insert = Size - initial_data_small.size();
 
       for (size_t insert_size = 1UL; insert_size <= max_insert; ++insert_size)
       {
@@ -1143,7 +1139,7 @@ namespace
     {
       DataNDC data(initial_data_under.begin(), initial_data_under.end());
 
-      size_t insert_size = SIZE - initial_data_under.size() + 1;
+      size_t insert_size = Size - initial_data_under.size() + 1;
 
       CHECK_THROW(data.insert(data.cbegin(),     insert_size, N14), etl::deque_full);
       CHECK_THROW(data.insert(data.cend(),       insert_size, N14), etl::deque_full);
@@ -1153,7 +1149,7 @@ namespace
     //*************************************************************************
     TEST(test_insert_range)
     {
-      size_t max_insert = SIZE - initial_data_small.size();
+      size_t max_insert = Size - initial_data_small.size();
 
       for (size_t insert_size = 1UL; insert_size <= max_insert; ++insert_size)
       {
@@ -1643,7 +1639,7 @@ namespace
     {
       DataNDC data;
 
-      for (size_t i = 0UL; i < SIZE; ++i)
+      for (size_t i = 0UL; i < Size; ++i)
       {
         CHECK_NO_THROW(data.push_back(N0));
       }
@@ -1765,7 +1761,7 @@ namespace
     {
       DataNDC data;
 
-      for (size_t i = 0UL; i < SIZE; ++i)
+      for (size_t i = 0UL; i < Size; ++i)
       {
         CHECK_NO_THROW(data.push_front(N1));
       }
@@ -1873,7 +1869,7 @@ namespace
       data.push_back(DC("15"));
       data.push_back(DC("16"));
       data.push_back(DC("17"));
-      data.resize(SIZE);
+      data.resize(Size);
 
       compare_data.pop_front();
       compare_data.pop_front();
@@ -1885,9 +1881,9 @@ namespace
       compare_data.push_back(DC("15"));
       compare_data.push_back(DC("16"));
       compare_data.push_back(DC("17"));
-      compare_data.resize(SIZE);
+      compare_data.resize(Size);
 
-      CHECK_EQUAL(size_t(SIZE), data.size());
+      CHECK_EQUAL(size_t(Size), data.size());
       CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
     }
 
@@ -1908,7 +1904,7 @@ namespace
       data.push_back(DC("15"));
       data.push_back(DC("16"));
       data.push_back(DC("17"));
-      data.resize(SIZE / 2);
+      data.resize(Size / 2);
 
       compare_data.pop_front();
       compare_data.pop_front();
@@ -1920,7 +1916,7 @@ namespace
       compare_data.push_back(DC("15"));
       compare_data.push_back(DC("16"));
       compare_data.push_back(DC("17"));
-      compare_data.resize(SIZE / 2);
+      compare_data.resize(Size / 2);
 
       CHECK_EQUAL(compare_data.size(), data.size());
       CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
@@ -1934,9 +1930,9 @@ namespace
 
       data.push_front(N1);
       data.push_back(N2);
-      data.resize(SIZE, N3);
+      data.resize(Size, N3);
 
-      CHECK_EQUAL(size_t(SIZE), data.size());
+      CHECK_EQUAL(size_t(Size), data.size());
       CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
     }
 
@@ -1945,7 +1941,7 @@ namespace
     {
       DataDC data;
 
-      CHECK_THROW(data.resize(SIZE + 1), etl::deque_full);
+      CHECK_THROW(data.resize(Size + 1), etl::deque_full);
     }
 
     //*************************************************************************
@@ -2072,8 +2068,7 @@ namespace
     //*************************************************************************
     TEST(test_move)
     {
-      const size_t SIZE = 10UL;
-      typedef etl::deque<std::unique_ptr<uint32_t>, SIZE> Data;
+      typedef etl::deque<std::unique_ptr<uint32_t>, Size> Data;
 
       Data data1;
 
@@ -2090,7 +2085,7 @@ namespace
       data1.insert(data1.begin() + 1, std::move(p4));
       data1.insert(data1.end(),       std::move(p5));
 
-      const size_t ACTUAL_SIZE = data1.size();
+      const size_t ACTUAL_Size = data1.size();
 
       CHECK(!bool(p1));
       CHECK(!bool(p2));
@@ -2113,7 +2108,7 @@ namespace
       CHECK_EQUAL(2U, *(*(data2.begin() + 3)));
       CHECK_EQUAL(5U, *(*(data2.begin() + 4)));
 
-      CHECK_EQUAL(ACTUAL_SIZE, data2.size());
+      CHECK_EQUAL(ACTUAL_Size, data2.size());
 
       // Move assignment.
       Data data3;
@@ -2125,7 +2120,7 @@ namespace
       CHECK_EQUAL(2U, *(*(data3.begin() + 3)));
       CHECK_EQUAL(5U, *(*(data3.begin() + 4)));
 
-      CHECK_EQUAL(ACTUAL_SIZE, data3.size());
+      CHECK_EQUAL(ACTUAL_Size, data3.size());
     }
 
     //*************************************************************************
diff --git a/test/test_fixed_iterator.cpp b/test/test_fixed_iterator.cpp
index d8cde672..e440ed18 100644
--- a/test/test_fixed_iterator.cpp
+++ b/test/test_fixed_iterator.cpp
@@ -101,21 +101,21 @@ namespace
     //*************************************************************************
     TEST(test_member_dereference_operator)
     {
-      struct Test
+      struct Object
       {
         int a;
         int b;
-      } test = { 1, 2 };
+      } object = { 1, 2 };
 
-      etl::fixed_iterator<Test*> fi(&test);
+      etl::fixed_iterator<Object*> fi(&object);
 
-      CHECK_EQUAL(test.a, fi->a);
-      CHECK_EQUAL(test.b, fi->b);
+      CHECK_EQUAL(object.a, fi->a);
+      CHECK_EQUAL(object.b, fi->b);
 
       *fi = { 3, 4 };
 
-      CHECK_EQUAL(test.a, fi->a);
-      CHECK_EQUAL(test.b, fi->b);
+      CHECK_EQUAL(object.a, fi->a);
+      CHECK_EQUAL(object.b, fi->b);
     }
 
     //*************************************************************************
diff --git a/test/test_function.cpp b/test/test_function.cpp
index cd9d1927..c64f81ca 100644
--- a/test/test_function.cpp
+++ b/test/test_function.cpp
@@ -38,7 +38,7 @@ namespace
   bool parameter_correct = false;
 
   //*****************************************************************************
-  // Test data structure.
+  // Object data structure.
   //*****************************************************************************
   struct Data
   {
@@ -126,7 +126,7 @@ namespace
   //*****************************************************************************
   // The test class with member functions.
   //*****************************************************************************
-  class Test
+  class Object
   {
   public:
 
@@ -148,7 +148,7 @@ namespace
     }
   };
 
-  Test test_static;
+  Object test_static;
 }
 
 //*****************************************************************************
@@ -298,8 +298,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_void)
     {
-      Test test;
-      etl::function<Test, void> function(test, &Test::member_void);
+      Object object;
+      etl::function<Object, void> function(object, &Object::member_void);
 
       call(function);
 
@@ -309,8 +309,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_const_member_void)
     {
-      Test test;
-      const etl::function<Test, void> function(test, &Test::member_void);
+      Object object;
+      const etl::function<Object, void> function(object, &Object::member_void);
 
       call(function);
 
@@ -320,8 +320,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_int)
     {
-      Test test;
-      etl::function<Test, int> function(test, &Test::member_int);
+      Object object;
+      etl::function<Object, int> function(object, &Object::member_int);
 
       call(function);
 
@@ -332,8 +332,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_const_member_int)
     {
-      Test test;
-      const etl::function<Test, int> function(test, &Test::member_int);
+      Object object;
+      const etl::function<Object, int> function(object, &Object::member_int);
 
       call(function);
 
@@ -344,8 +344,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_reference)
     {
-      Test test;
-      etl::function<Test, const Data&> function(test, &Test::member_reference);
+      Object object;
+      etl::function<Object, const Data&> function(object, &Object::member_reference);
 
       call(function);
 
@@ -356,8 +356,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_const_member_reference)
     {
-      Test test;
-      const etl::function<Test, const Data&> function(test, &Test::member_reference);
+      Object object;
+      const etl::function<Object, const Data&> function(object, &Object::member_reference);
 
       call(function);
 
@@ -368,8 +368,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_void_compile_time)
     {
-      Test test;
-      etl::function_mv<Test, &Test::member_void> function(test);
+      Object object;
+      etl::function_mv<Object, &Object::member_void> function(object);
 
       call(function);
 
@@ -379,8 +379,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_const_member_void_compile_time)
     {
-      Test test;
-      const etl::function_mv<Test, &Test::member_void> function(test);
+      Object object;
+      const etl::function_mv<Object, &Object::member_void> function(object);
 
       call(function);
 
@@ -390,8 +390,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_int_compile_time)
     {
-      Test test;
-      etl::function_mp<Test, int, &Test::member_int> function(test);
+      Object object;
+      etl::function_mp<Object, int, &Object::member_int> function(object);
 
       call(function);
 
@@ -402,8 +402,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_const_member_int_compile_time)
     {
-      Test test;
-      const etl::function_mp<Test, int, &Test::member_int> function(test);
+      Object object;
+      const etl::function_mp<Object, int, &Object::member_int> function(object);
 
       call(function);
 
@@ -414,8 +414,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_member_reference_compile_time)
     {
-      Test test;
-      etl::function_mp<Test, const Data&, &Test::member_reference> function(test);
+      Object object;
+      etl::function_mp<Object, const Data&, &Object::member_reference> function(object);
 
       call(function);
 
@@ -426,8 +426,8 @@ namespace
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_const_member_reference_compile_time)
     {
-      Test test;
-      const etl::function_mp<Test, const Data&, &Test::member_reference> function(test);
+      Object object;
+      const etl::function_mp<Object, const Data&, &Object::member_reference> function(object);
 
       call(function);
 
@@ -440,7 +440,7 @@ namespace
     {
       function_called = false;
 
-      etl::function_imv<Test, test_static, &Test::member_void> function;
+      etl::function_imv<Object, test_static, &Object::member_void> function;
 
       call(function);
 
@@ -452,7 +452,7 @@ namespace
     {
       function_called = false;
 
-      const etl::function_imv<Test, test_static, &Test::member_void> function;
+      const etl::function_imv<Object, test_static, &Object::member_void> function;
 
       call(function);
 
@@ -464,7 +464,7 @@ namespace
     {
       function_called = false;
 
-      etl::function_imp<Test, int, test_static, &Test::member_int> function;
+      etl::function_imp<Object, int, test_static, &Object::member_int> function;
 
       call(function);
 
@@ -476,7 +476,7 @@ namespace
     {
       function_called = false;
 
-      const etl::function_imp<Test, int, test_static, &Test::member_int> function;
+      const etl::function_imp<Object, int, test_static, &Object::member_int> function;
 
       call(function);
 
@@ -488,7 +488,7 @@ namespace
     {
       function_called = false;
 
-      etl::function_imp<Test, const Data&, test_static, &Test::member_reference> function;
+      etl::function_imp<Object, const Data&, test_static, &Object::member_reference> function;
 
       call(function);
 
@@ -500,7 +500,7 @@ namespace
     {
       function_called = false;
 
-      const etl::function_imp<Test, const Data&, test_static, &Test::member_reference> function;
+      const etl::function_imp<Object, const Data&, test_static, &Object::member_reference> function;
 
       call(function);
 
diff --git a/test/test_indirect_vector.cpp b/test/test_indirect_vector.cpp
index 8cfff65b..bcc3b08d 100644
--- a/test/test_indirect_vector.cpp
+++ b/test/test_indirect_vector.cpp
@@ -1427,9 +1427,9 @@ namespace
     {
       struct functor
       {
-        void operator()(const NDC& ndc)
+        void operator()(const NDC& object)
         {
-          result += ndc.value;
+          result += object.value;
         }
 
         std::string result;
@@ -1458,9 +1458,9 @@ namespace
     {
       struct functor
       {
-        bool operator()(const NDC& ndc)
+        bool operator()(const NDC& object)
         {
-          return ndc.value == "4";
+          return object.value == "4";
         }
 
         std::string result;
diff --git a/test/test_indirect_vector_external_buffer.cpp b/test/test_indirect_vector_external_buffer.cpp
index 138029a8..7911eabd 100644
--- a/test/test_indirect_vector_external_buffer.cpp
+++ b/test/test_indirect_vector_external_buffer.cpp
@@ -1560,9 +1560,9 @@ namespace
     {
       struct functor
       {
-        void operator()(const NDC& ndc)
+        void operator()(const NDC& object)
         {
-          result += ndc.value;
+          result += object.value;
         }
 
         std::string result;
@@ -1594,9 +1594,9 @@ namespace
     {
       struct functor
       {
-        bool operator()(const NDC& ndc)
+        bool operator()(const NDC& object)
         {
-          return ndc.value == "4";
+          return object.value == "4";
         }
 
         std::string result;
diff --git a/test/test_intrusive_forward_list.cpp b/test/test_intrusive_forward_list.cpp
index 0445639d..88fe6958 100644
--- a/test/test_intrusive_forward_list.cpp
+++ b/test/test_intrusive_forward_list.cpp
@@ -140,8 +140,6 @@ namespace
     InitialDataNDC merge_data3;
     InitialDataNDC merge_data4;
 
-    bool are_equal;
-
     //*************************************************************************
     struct SetupFixture
     {
@@ -204,7 +202,7 @@ namespace
     {
       DataNDC0 data0(sorted_data.begin(), sorted_data.end());
 
-      are_equal = std::equal(data0.begin(), data0.end(), sorted_data.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), sorted_data.begin());
 
       CHECK(are_equal);
     }
@@ -229,7 +227,7 @@ namespace
     {
       DataNDC0 data0(sorted_data.begin(), sorted_data.end());
 
-      are_equal = std::equal(data0.cbegin(), data0.cend(), sorted_data.begin());
+      bool are_equal = std::equal(data0.cbegin(), data0.cend(), sorted_data.begin());
 
       CHECK(are_equal);
     }
@@ -274,13 +272,13 @@ namespace
     {
       DataNDC0 data0;
 
-      static InitialDataNDC sorted_data = { ItemNDCNode("0"), ItemNDCNode("1"), ItemNDCNode("2"), ItemNDCNode("3"), ItemNDCNode("4"), ItemNDCNode("5"), ItemNDCNode("6"), ItemNDCNode("7"), ItemNDCNode("8"), ItemNDCNode("9") };
+      static InitialDataNDC assign_data = { ItemNDCNode("0"), ItemNDCNode("1"), ItemNDCNode("2"), ItemNDCNode("3"), ItemNDCNode("4"), ItemNDCNode("5"), ItemNDCNode("6"), ItemNDCNode("7"), ItemNDCNode("8"), ItemNDCNode("9") };
 
       // Do it twice. We should only get one copy.
-      data0.assign(sorted_data.begin(), sorted_data.end());
-      data0.assign(sorted_data.begin(), sorted_data.end());
+      data0.assign(assign_data.begin(), assign_data.end());
+      data0.assign(assign_data.begin(), assign_data.end());
 
-      bool are_equal = std::equal(data0.begin(), data0.end(), sorted_data.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), assign_data.begin());
 
       CHECK(are_equal);
     }
@@ -294,7 +292,7 @@ namespace
       data0.assign(sorted_data.begin(), sorted_data.end());
       data1.assign(sorted_data.begin(), sorted_data.end());
 
-      are_equal = std::equal(data0.begin(), data0.end(), sorted_data.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), sorted_data.begin());
       CHECK(are_equal);
 
       are_equal = std::equal(data1.begin(), data1.end(), sorted_data.begin());
@@ -341,7 +339,7 @@ namespace
         data0.push_front(node6);
         data0.push_front(node7);
 
-        are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
+        bool are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
         CHECK(are_equal);
         CHECK_EQUAL(6U, data0.size());
         CHECK_EQUAL(6, std::distance(data0.begin(), data0.end()));
@@ -381,7 +379,7 @@ namespace
       data0.insert_after(i_data, INSERT_VALUE1);
       compare_data.insert_after(i_compare_data, INSERT_VALUE1);
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
       CHECK(are_equal);
       CHECK_EQUAL(size_t(std::distance(compare_data.begin(), compare_data.end())), data0.size());
       CHECK_EQUAL(std::distance(compare_data.begin(), compare_data.end()), std::distance(data0.begin(), data0.end()));
@@ -426,7 +424,7 @@ namespace
 
       data0.insert_after(data0.before_begin(), test2.begin(), test2.end());
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare.begin());
       CHECK(are_equal);
 
       are_equal = std::equal(data1.begin(), data1.end(), test1.begin());
@@ -485,7 +483,7 @@ namespace
         CHECK_NO_THROW(data0.push_front(node5));
         CHECK_NO_THROW(data0.push_front(node6));
 
-        are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
+        bool are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
         CHECK(are_equal);
         CHECK_EQUAL(6U, data0.size());
         CHECK_EQUAL(6, std::distance(data0.begin(), data0.end()));
@@ -573,7 +571,7 @@ namespace
       i_compare_data = compare_data.erase_after(i_compare_data);
       i_data         = data0.erase_after(i_data);
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
 
       CHECK(are_equal);
       CHECK(*i_compare_data == *i_data);
@@ -675,7 +673,7 @@ namespace
 
       CHECK_EQUAL(*i_compare_result, *i_result);
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
       CHECK(are_equal);
       CHECK_EQUAL(size_t(std::distance(compare_data.begin(), compare_data.end())), data0.size());
       CHECK_EQUAL(std::distance(compare_data.begin(), compare_data.end()), std::distance(data0.begin(), data0.end()));
@@ -705,7 +703,7 @@ namespace
 
       CHECK(i_result == data0.end());
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
       CHECK(are_equal);
       CHECK_EQUAL(size_t(std::distance(compare_data.begin(), compare_data.end())), data0.size());
       CHECK_EQUAL(std::distance(compare_data.begin(), compare_data.end()), std::distance(data0.begin(), data0.end()));
@@ -743,7 +741,7 @@ namespace
       data0.unique(EqualItemNDCNode());
 
       // data0 should have changed.
-      are_equal = std::equal(data0.begin(), data0.end(), unique_data.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), unique_data.begin());
       CHECK(are_equal);
       CHECK_EQUAL(unique_data.size(), data0.size());
       CHECK_EQUAL(unique_data.size(), size_t(std::distance(data0.begin(), data0.end())));
@@ -765,7 +763,7 @@ namespace
       compare_data.remove(ItemNDCNode("7"));
       data0.remove(ItemNDCNode("7"));
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
 
       CHECK(are_equal);
       CHECK_EQUAL(size_t(std::distance(compare_data.begin(), compare_data.end())), data0.size());
@@ -787,7 +785,7 @@ namespace
       compare_data.remove_if(std::bind(std::equal_to<ItemNDCNode>(), std::placeholders::_1, ItemNDCNode("7")));
       data0.remove_if(std::bind(std::equal_to<ItemNDCNode>(), std::placeholders::_1, ItemNDCNode("7")));
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
 
       CHECK(are_equal);
       CHECK_EQUAL(size_t(std::distance(compare_data.begin(), compare_data.end())), data0.size());
@@ -827,7 +825,7 @@ namespace
 
       data0.sort(); // Just sort one of them.
 
-      are_equal = std::equal(data0.begin(), data0.end(), sorted_data.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), sorted_data.begin());
       CHECK(are_equal);
 
       are_equal = std::equal(data1.begin(), data1.end(), unsorted_data.begin());
@@ -863,7 +861,7 @@ namespace
 
       data0.sort(CompareItemNDCNode()); // Just sort one of them.
 
-      are_equal = std::equal(data0.begin(), data0.end(), sorted_data.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), sorted_data.begin());
       CHECK(are_equal);
 
       are_equal = std::equal(data1.begin(), data1.end(), unsorted_data.begin());
@@ -888,7 +886,7 @@ namespace
       data0.splice_after(idata_destination, data1);
       compare0.splice_after(icompare_destination, compare1);
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
       CHECK(are_equal);
 
       CHECK_EQUAL(size_t(std::distance(compare0.begin(), compare0.end())), data0.size());
@@ -907,7 +905,7 @@ namespace
 
       data0.splice_after(idata_destination, data0);
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
       CHECK(are_equal);
 
       CHECK_EQUAL(size_t(std::distance(compare0.begin(), compare0.end())), data0.size());
@@ -943,7 +941,7 @@ namespace
       data0.splice_after(idata_destination, data1, idata_begin, idata_end);
       compare0.splice_after(icompare_destination, compare1, icompare_begin, icompare_end);
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
       CHECK(are_equal);
 
       CHECK_EQUAL(size_t(std::distance(compare0.begin(), compare0.end())), data0.size());
@@ -978,7 +976,7 @@ namespace
       data0.splice_after(idata_destination, data0, idata_begin, idata_end);
       compare0.splice_after(icompare_destination, compare0, icompare_begin, icompare_end);
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
       CHECK(are_equal);
 
       CHECK_EQUAL(size_t(std::distance(compare0.begin(), compare0.end())), data0.size());
@@ -996,7 +994,7 @@ namespace
       data0.merge(data1);
       compare0.merge(compare1);
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
       CHECK(are_equal);
 
       CHECK_EQUAL(size_t(std::distance(compare0.begin(), compare0.end())), data0.size());
@@ -1015,7 +1013,7 @@ namespace
       data0.merge(data2);
       compare0.merge(compare2);
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
       CHECK(are_equal);
 
       CHECK_EQUAL(size_t(std::distance(compare0.begin(), compare0.end())), data0.size());
@@ -1034,7 +1032,7 @@ namespace
       data0.merge(data3);
       compare0.merge(compare3);
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
       CHECK(are_equal);
 
       CHECK_EQUAL(size_t(std::distance(compare0.begin(), compare0.end())), data0.size());
@@ -1053,7 +1051,7 @@ namespace
       data0.merge(data4);
       compare0.merge(compare4);
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
       CHECK(are_equal);
 
       CHECK_EQUAL(size_t(std::distance(compare0.begin(), compare0.end())), data0.size());
@@ -1078,7 +1076,7 @@ namespace
       data0.merge(data1,       std::greater<ItemNDCNode>());
       compare0.merge(compare1, std::greater<ItemNDCNode>());
 
-      are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
+      bool are_equal = std::equal(data0.begin(), data0.end(), compare0.begin());
       CHECK(are_equal);
 
       CHECK_EQUAL(size_t(std::distance(compare0.begin(), compare0.end())), data0.size());
diff --git a/test/test_memory.cpp b/test/test_memory.cpp
index 69beb317..45c6d470 100644
--- a/test/test_memory.cpp
+++ b/test/test_memory.cpp
@@ -640,25 +640,25 @@ namespace
     //*************************************************************************
     TEST(test_create_copy)
     {
-      struct Test : etl::create_copy<Test>
+      struct Object : etl::create_copy<Object>
       {
         std::string text;
       };
 
-      char buffer[sizeof(Test)];
+      char buffer[sizeof(Object)];
 
-      Test test1;
-      test1.text = "12345678";
-      test1.create_copy_at(buffer);
-      test1.text = "87654321";
+      Object object1;
+      object1.text = "12345678";
+      object1.create_copy_at(buffer);
+      object1.text = "87654321";
 
-      Test& test2 = *reinterpret_cast<Test*>(buffer);
+      Object& object2 = *reinterpret_cast<Object*>(buffer);
 
-      CHECK_EQUAL(std::string("87654321"), test1.text);
-      CHECK_EQUAL(std::string("12345678"), test2.text);
+      CHECK_EQUAL(std::string("87654321"), object1.text);
+      CHECK_EQUAL(std::string("12345678"), object2.text);
 
       int count = 0;
-      test1.create_copy_at(buffer, count);
+      object1.create_copy_at(buffer, count);
 
       CHECK_EQUAL(1, count);
     }
@@ -666,23 +666,23 @@ namespace
     //*************************************************************************
     TEST(test_create_make_copy)
     {
-      struct Test : etl::create_copy<Test>
+      struct Object : etl::create_copy<Object>
       {
         std::string text;
       };
 
-      char buffer[sizeof(Test)];
+      char buffer[sizeof(Object)];
 
-      Test test1;
-      test1.text = "12345678";
-      Test& test2 = test1.make_copy_at(buffer);
-      test1.text = "87654321";
+      Object object1;
+      object1.text = "12345678";
+      Object& object2 = object1.make_copy_at(buffer);
+      object1.text = "87654321";
 
-      CHECK_EQUAL(std::string("87654321"), test1.text);
-      CHECK_EQUAL(std::string("12345678"), test2.text);
+      CHECK_EQUAL(std::string("87654321"), object1.text);
+      CHECK_EQUAL(std::string("12345678"), object2.text);
 
       int count = 0;
-      test1.make_copy_at(buffer, count);
+      object1.make_copy_at(buffer, count);
 
       CHECK_EQUAL(1, count);
     }
diff --git a/test/test_parameter_type.cpp b/test/test_parameter_type.cpp
index 5b30bdaa..3075f3cc 100644
--- a/test/test_parameter_type.cpp
+++ b/test/test_parameter_type.cpp
@@ -35,17 +35,17 @@ SOFTWARE.
 
 namespace
 {
-  class Test
+  class Object
   {
   public:
 
-    Test()
+    Object()
       : p(new int())
     {
       *p = 4;
     }
 
-    ~Test()
+    ~Object()
     {
       delete p;
     }
@@ -53,18 +53,18 @@ namespace
     int* p;
   };
 
-  class Test2 : public Test
+  class Object2 : public Object
   {
   };
 }
 
 namespace etl
 {
-  // Test2 is a value parameter type.
+  // Object2 is a value parameter type.
   template <>
-  struct parameter_type<Test2>
+  struct parameter_type<Object2>
   {
-    typedef Test2 type;
+    typedef Object2 type;
   };
 }
 
@@ -80,10 +80,10 @@ namespace
       b = !etl::is_reference<etl::parameter_type<int>::type>::value;
       CHECK(b);
 
-      b = etl::is_reference<etl::parameter_type<Test>::type>::value;
+      b = etl::is_reference<etl::parameter_type<Object>::type>::value;
       CHECK(b);
 
-      b = !etl::is_reference<etl::parameter_type<Test2>::type>::value;
+      b = !etl::is_reference<etl::parameter_type<Object2>::type>::value;
       CHECK(b);
     }
   };
diff --git a/test/test_pool.cpp b/test/test_pool.cpp
index 10fd4cbd..48f2881a 100644
--- a/test/test_pool.cpp
+++ b/test/test_pool.cpp
@@ -352,7 +352,7 @@ namespace
     //*************************************************************************
     TEST(test_type_error)
     {
-      struct Test
+      struct Object
       {
         uint64_t a;
         uint64_t b;
@@ -362,7 +362,7 @@ namespace
 
       etl::ipool& ip = pool;
 
-      CHECK_THROW(ip.allocate<Test>(), etl::pool_element_size);
+      CHECK_THROW(ip.allocate<Object>(), etl::pool_element_size);
     }
 
     //*************************************************************************
diff --git a/test/test_pool_external_buffer.cpp b/test/test_pool_external_buffer.cpp
index 9723abe3..6b3851ce 100644
--- a/test/test_pool_external_buffer.cpp
+++ b/test/test_pool_external_buffer.cpp
@@ -388,7 +388,7 @@ namespace
     //*************************************************************************
     TEST(test_type_error)
     {
-      struct Test
+      struct Object
       {
         uint64_t a;
         uint64_t b;
@@ -400,7 +400,7 @@ namespace
 
       etl::ipool& ip = pool;
 
-      CHECK_THROW(ip.allocate<Test>(), etl::pool_element_size);
+      CHECK_THROW(ip.allocate<Object>(), etl::pool_element_size);
 
       delete[] buffer;
     }
diff --git a/test/test_set.cpp b/test/test_set.cpp
index bf9fc7a8..ae177f19 100644
--- a/test/test_set.cpp
+++ b/test/test_set.cpp
@@ -612,12 +612,7 @@ namespace
       }
 
       // Try to insert when set is full should throw etl::set_full
-      try
-      {
-        data_result = data.insert(MAX_SIZE);
-      }
-      catch(const etl::set_full &e)
-      {}
+      CHECK_THROW(data_result = data.insert(MAX_SIZE), etl::set_full);
 
       // Try adding a duplicate (should return iterator pointing to duplicate) not throw error
       for (size_t i = 0; i < MAX_SIZE; ++i)
@@ -639,7 +634,7 @@ namespace
 
     }
 
-    //*************************************************************************
+    ////*************************************************************************
     //TEST_FIXTURE(SetupFixture, test_emplace_value)
     //{
     //  Compare_Data compare_data;
diff --git a/test/test_shared_message.cpp b/test/test_shared_message.cpp
index 749c7822..f84eb6e2 100644
--- a/test/test_shared_message.cpp
+++ b/test/test_shared_message.cpp
@@ -153,12 +153,6 @@ namespace
 
     using pool_message_parameters = etl::atomic_counted_message_pool::pool_message_parameters<Message1, Message2>;
 
-    etl::fixed_sized_memory_block_allocator<pool_message_parameters::max_size,
-                                            pool_message_parameters::max_alignment,
-                                            4U> memory_allocator;
-
-    etl::atomic_counted_message_pool message_pool(memory_allocator);
-
     //*************************************************************************
     class Message2Allocator : public etl::ireference_counted_message_pool
     {
@@ -182,6 +176,11 @@ namespace
     //*************************************************************************
     TEST(test_move_constructor)
     {
+      etl::fixed_sized_memory_block_allocator<pool_message_parameters::max_size,
+                                              pool_message_parameters::max_alignment, 4U> memory_allocator;
+
+      etl::atomic_counted_message_pool message_pool(memory_allocator);
+
 #include "etl/private/diagnostic_pessimizing_move_push.h"
       etl::shared_message sm1(std::move(etl::shared_message(message_pool, Message1(1))));
 #include "etl/private/diagnostic_pop.h"
@@ -191,6 +190,12 @@ namespace
     //*************************************************************************
     TEST(test_default_message_constructor)
     {
+      etl::fixed_sized_memory_block_allocator<pool_message_parameters::max_size,
+                                              pool_message_parameters::max_alignment, 
+                                              4U> memory_allocator;
+
+      etl::atomic_counted_message_pool message_pool(memory_allocator);
+
       etl::reference_counted_message<Message2, etl::atomic_int>* prcm = message_pool.allocate<Message2>();
 
       Message2&        m2 = prcm->get_message(); // Check that we can get a non-const reference to the message.
@@ -214,6 +219,12 @@ namespace
     //*************************************************************************
     TEST(test_move_assignment)
     {
+      etl::fixed_sized_memory_block_allocator<pool_message_parameters::max_size,
+                                              pool_message_parameters::max_alignment, 
+                                              4U> memory_allocator;
+
+      etl::atomic_counted_message_pool message_pool(memory_allocator);
+
       etl::shared_message sm2 = etl::shared_message(message_pool, Message1(2));
 #include "etl/private/diagnostic_pessimizing_move_push.h"
       sm2 = std::move(etl::shared_message(message_pool, Message1(3)));
@@ -231,6 +242,12 @@ namespace
       router1.clear();
       router2.clear();
 
+      etl::fixed_sized_memory_block_allocator<pool_message_parameters::max_size,
+                                              pool_message_parameters::max_alignment, 
+                                              4U> memory_allocator;
+
+      etl::atomic_counted_message_pool message_pool(memory_allocator);
+
       etl::shared_message sm1(message_pool, Message1(1)); // sm1 holds a Message1 that is owned by message_pool.
       etl::shared_message sm2(message_pool, Message2());  // sm2 holds a Message2 that is owned by message_pool.
       etl::shared_message sm3(Message2Allocator::Get());  // sm3 holds a Message2 that is owned by a statically allocated message pool.
@@ -263,8 +280,6 @@ namespace
     //*************************************************************************
     TEST(test_reference_counted_pool_exceptions)
     {
-      using pool_message_parameters = etl::atomic_counted_message_pool::pool_message_parameters<Message1, Message2>;
-
       etl::fixed_sized_memory_block_allocator<pool_message_parameters::max_size,
                                               pool_message_parameters::max_alignment,
                                               4U> memory_allocator;
@@ -278,27 +293,12 @@ namespace
       CHECK_NO_THROW(prcm = message_pool.allocate<Message1>(4));
       
       (void)prcm;
-
-      try
-      {
-        prcm = message_pool.allocate<Message1>(5);
-      }
-      catch (etl::exception e)
-      {
-        CHECK_EQUAL(std::string("reference_counted_message_pool:allocation failure"), std::string(e.what()));
-      }
+      CHECK_THROW(prcm = message_pool.allocate<Message1>(5), etl::reference_counted_message_pool_allocation_failure);
       
       Message1 message1(6);
       etl::reference_counted_message<Message1, etl::atomic_int> temp(message1, message_pool);
 
-      try
-      {
-        message_pool.release(temp);
-      }
-      catch (etl::exception e)
-      {
-        CHECK_EQUAL(std::string("reference_counted_message_pool:release failure"), std::string(e.what()));
-      }
+      CHECK_THROW(message_pool.release(temp), etl::reference_counted_message_pool_release_failure);
     }
   }
 }
diff --git a/test/test_type_traits.cpp b/test/test_type_traits.cpp
index dec68f39..706c1dfb 100644
--- a/test/test_type_traits.cpp
+++ b/test/test_type_traits.cpp
@@ -45,7 +45,7 @@ namespace etl
 namespace
 {
   // A class to test non-fundamental types.
-  struct Test
+  struct Object
   {
     int a;
   };
@@ -671,7 +671,7 @@ namespace
     //*************************************************************************
     TEST(test_alignment_of)
     {
-      struct Test
+      struct Object
       {
         int   a;
         char  b;
@@ -690,7 +690,7 @@ namespace
       CHECK(std::alignment_of<unsigned long long>::value == etl::alignment_of<unsigned long long>::value);
       CHECK(std::alignment_of<float>::value              == etl::alignment_of<float>::value);
       CHECK(std::alignment_of<double>::value             == etl::alignment_of<double>::value);
-      CHECK(std::alignment_of<Test>::value               == etl::alignment_of<Test>::value);
+      CHECK(std::alignment_of<Object>::value             == etl::alignment_of<Object>::value);
     }
 
     //*************************************************************************
diff --git a/test/test_vector.cpp b/test/test_vector.cpp
index e8e4f1fa..ce85bcfe 100644
--- a/test/test_vector.cpp
+++ b/test/test_vector.cpp
@@ -1365,7 +1365,7 @@ namespace
 
         }
 
-        S(int i): i(i){}
+        S(int i_): i(i_){}
 
         int i;
       };
@@ -1398,7 +1398,7 @@ namespace
 
         }
 
-        S(int i): i(i){}
+        S(int i_): i(i_){}
 
         int i;
       };
diff --git a/test/test_vector_external_buffer.cpp b/test/test_vector_external_buffer.cpp
index e1baf1cf..773e68ea 100644
--- a/test/test_vector_external_buffer.cpp
+++ b/test/test_vector_external_buffer.cpp
@@ -1199,7 +1199,7 @@ namespace
 
         }
 
-        S(int i): i(i){}
+        S(int i_): i(i_){}
 
         int i;
       };
@@ -1235,7 +1235,7 @@ namespace
 
         }
 
-        S(int i): i(i){}
+        S(int i_): i(i_){}
 
         int i;
       };
diff --git a/test/test_vector_non_trivial.cpp b/test/test_vector_non_trivial.cpp
index 58ae569d..0acb1a22 100644
--- a/test/test_vector_non_trivial.cpp
+++ b/test/test_vector_non_trivial.cpp
@@ -213,7 +213,6 @@ namespace
     //*************************************************************************
     TEST(test_move_constructor)
     {
-      const size_t SIZE = 10U;
       typedef etl::vector<std::unique_ptr<uint32_t>, SIZE> Data;
 
       std::unique_ptr<uint32_t> p1(new uint32_t(1U));
@@ -256,7 +255,6 @@ namespace
     //*************************************************************************
     TEST(test_move_assignment)
     {
-      const size_t SIZE = 10U;
       typedef etl::vector<std::unique_ptr<uint32_t>, SIZE> Data;
 
       std::unique_ptr<uint32_t> p1(new uint32_t(1U));
@@ -303,7 +301,6 @@ namespace
     //*************************************************************************
     TEST(test_move_assignment_interface)
     {
-      const size_t SIZE = 10U;
       typedef etl::vector<std::unique_ptr<uint32_t>, SIZE> Data;
       typedef etl::ivector<std::unique_ptr<uint32_t>> IData;
 
diff --git a/test/vs2022/etl.vcxproj b/test/vs2022/etl.vcxproj
index 3d746039..6fda4cba 100644
--- a/test/vs2022/etl.vcxproj
+++ b/test/vs2022/etl.vcxproj
@@ -1231,7 +1231,7 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level2</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../../../unittest-cpp/;../../include;../../test</AdditionalIncludeDirectories>
@@ -1257,7 +1257,7 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level2</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;ETL_FORCE_TEST_CPP03_IMPLEMENTATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../../../unittest-cpp/;../../include;../../test</AdditionalIncludeDirectories>
@@ -1283,7 +1283,7 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level2</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;ETL_MESSAGES_ARE_NOT_VIRTUAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../../../unittest-cpp/;../../include;../../test</AdditionalIncludeDirectories>
@@ -1309,7 +1309,7 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level2</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;ETL_IMESSAGE_IS_NON_VIRTUAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../../../unittest-cpp/;../../include;../../test</AdditionalIncludeDirectories>
@@ -1335,7 +1335,7 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level2</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../../../unittest-cpp/;../../include;../../test</AdditionalIncludeDirectories>
@@ -1360,7 +1360,7 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level2</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../../../unittest-cpp/;../../include;../../test</AdditionalIncludeDirectories>
@@ -1385,7 +1385,7 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level2</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../../../unittest-cpp/;../../include;../../test</AdditionalIncludeDirectories>
@@ -1409,7 +1409,7 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level2</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../../../unittest-cpp/;../../include;../../test</AdditionalIncludeDirectories>
@@ -1433,7 +1433,7 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level2</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;ETL_NO_STL;ETL_FORCE_STD_INITIALIZER_LIST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../../../unittest-cpp/;../../include;../../test</AdditionalIncludeDirectories>
@@ -1457,7 +1457,7 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level2</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;ETL_NO_STL;ETL_FORCE_STD_INITIALIZER_LIST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../../../unittest-cpp/;../../include;../../test</AdditionalIncludeDirectories>
@@ -1481,7 +1481,7 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level2</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;ETL_NO_STL;ETL_FORCE_STD_INITIALIZER_LIST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../../../unittest-cpp/;../../include;../../test</AdditionalIncludeDirectories>
@@ -1691,7 +1691,7 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level2</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING;ETL_NO_STL;ETL_FORCE_STD_INITIALIZER_LIST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>./;../../../unittest-cpp/;../../include;../../test</AdditionalIncludeDirectories>

From 749396669b33d80b1d7ec0eb3ec507991d4f69d5 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Thu, 25 Jan 2024 16:33:56 +0000
Subject: [PATCH 044/131] Added -Wnull-dereference flags to GCC and Clang unit
 test configurations

---
 test/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5fa7e763..bd7b480b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -384,6 +384,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 			-Wfloat-equal
 			-Wuseless-cast
 			-Wshadow
+			-Wnull-dereference
 			)
 endif ()
 
@@ -397,6 +398,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 			-Werror
 			-Wfloat-equal
 			-Wshadow
+			-Wnull-dereference
 			)
 endif ()
 

From c0f2bec6aeb44a8088446f0ec15775346c6a5237 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sun, 28 Jan 2024 09:20:15 +0000
Subject: [PATCH 045/131] Comment fix

---
 include/etl/generators/message_router_generator.h | 2 +-
 include/etl/message_router.h                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/etl/generators/message_router_generator.h b/include/etl/generators/message_router_generator.h
index 32903acf..7bb9dbe9 100644
--- a/include/etl/generators/message_router_generator.h
+++ b/include/etl/generators/message_router_generator.h
@@ -51,7 +51,7 @@ cog.outl("//********************************************************************
 // Note: You will need Python and COG installed.
 //
 // python -m cogapp -d -e -omessage_router.h -DHandlers=<n> message_router_generator.h
-// Where <n> is the number of messages to support.
+// Where <n> is the maximum number of messages to support.
 //
 // e.g.
 // To generate handlers for up to 16 messages...
diff --git a/include/etl/message_router.h b/include/etl/message_router.h
index b7807a77..8358bc68 100644
--- a/include/etl/message_router.h
+++ b/include/etl/message_router.h
@@ -39,7 +39,7 @@ SOFTWARE.
 // Note: You will need Python and COG installed.
 //
 // python -m cogapp -d -e -omessage_router.h -DHandlers=<n> message_router_generator.h
-// Where <n> is the number of messages to support.
+// Where <n> is the maximum number of messages to support.
 //
 // e.g.
 // To generate handlers for up to 16 messages...

From ad330835439df20ed23e9e4752aa6c7419732c50 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sun, 28 Jan 2024 20:35:07 +0000
Subject: [PATCH 046/131] Added safe copy to etl::array::assign

etl::array::assign now returns an iterator
---
 include/etl/array.h | 30 +++++++++++++++++-------------
 test/test_array.cpp | 17 ++++++++++++-----
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/include/etl/array.h b/include/etl/array.h
index 52f0f654..caca9e7e 100644
--- a/include/etl/array.h
+++ b/include/etl/array.h
@@ -94,15 +94,15 @@ namespace etl
 
     static ETL_CONSTANT size_t SIZE = SIZE_;
 
-    typedef T                                     value_type;
-    typedef size_t                                size_type;
-    typedef ptrdiff_t                             difference_type;
-    typedef T&                                    reference;
-    typedef const T&                              const_reference;
-    typedef T*                                    pointer;
-    typedef const T*                              const_pointer;
-    typedef T*                                    iterator;
-    typedef const T*                              const_iterator;
+    typedef T         value_type;
+    typedef size_t    size_type;
+    typedef ptrdiff_t difference_type;
+    typedef T&        reference;
+    typedef const T&  const_reference;
+    typedef T*        pointer;
+    typedef const T*  const_pointer;
+    typedef T*        iterator;
+    typedef const T*  const_iterator;
     typedef ETL_OR_STD::reverse_iterator<iterator>       reverse_iterator;
     typedef ETL_OR_STD::reverse_iterator<const_iterator> const_reverse_iterator;
 
@@ -386,11 +386,12 @@ namespace etl
     /// If the range is smaller than the array then the unused array elements are left unmodified.
     ///\param first The iterator to the first item in the range.
     ///\param last  The iterator to one past the final item in the range.
+    ///\return An iterator to the first unassigned array element, or end().
     //*************************************************************************
     template <typename TIterator>
-    void assign(TIterator first, const TIterator last)
+    iterator assign(TIterator first, const TIterator last)
     {
-      etl::copy_s(first, last, begin(), end());
+      return etl::copy_s(first, last, begin(), end());
     }
 
     //*************************************************************************
@@ -398,15 +399,18 @@ namespace etl
     /// If the range is smaller than the array then the unused array elements are initialised with the supplied value.
     ///\param first The iterator to the first item in the range.
     ///\param last  The iterator to one past the final item in the range.
+    ///\return An iterator to the first array element set to 'value', or end().
     //*************************************************************************
     template <typename TIterator>
-    void assign(TIterator first, const TIterator last, parameter_t value)
+    iterator assign(TIterator first, const TIterator last, parameter_t value)
     {
       // Copy from the range.
-      iterator p = etl::copy(first, last, begin());
+      iterator p = etl::copy_s(first, last, begin(), end());
 
       // Initialise any that are left.
       etl::fill(p, end(), value);
+
+      return p;
     }
 
     //*************************************************************************
diff --git a/test/test_array.cpp b/test/test_array.cpp
index 122755c1..bc192c53 100644
--- a/test/test_array.cpp
+++ b/test/test_array.cpp
@@ -375,20 +375,27 @@ namespace
 
       Data data = { 0 };
 
+      Data::iterator result;
+
       // Initial data.
-      data.assign(std::begin(initial), std::end(initial));
+      result = data.assign(std::begin(initial), std::end(initial));
+      CHECK(result == data.end());
       bool isEqual = std::equal(data.begin(), data.end(), std::begin(initial));
       CHECK(isEqual);
 
       // Assign smaller.
-      data.assign(std::begin(initial), std::end(initial));
-      data.assign(&source[0], &source[5]);
+      result = data.assign(std::begin(initial), std::end(initial));
+      CHECK(result == data.end());
+      result = data.assign(&source[0], &source[5]);
+      CHECK(result == &data[5]);
       isEqual = std::equal(data.begin(), data.end(), std::begin(check1));
       CHECK(isEqual);
 
       // Assign smaller + default.
-      data.assign(std::begin(initial), std::end(initial));
-      data.assign(&source[0], &source[5], 99);
+      result = data.assign(std::begin(initial), std::end(initial));
+      CHECK(result == data.end());
+      result = data.assign(&source[0], &source[5], 99);
+      CHECK(result == &data[5]);
       isEqual = std::equal(data.begin(), data.end(), std::begin(check2));
       CHECK(isEqual);
     }

From c92771088cfb2f929c9b1090afb54a0d1e97102a Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Wed, 31 Jan 2024 09:50:11 +0000
Subject: [PATCH 047/131] #834 char_traits.h throws warning for GHS compiler

---
 include/etl/char_traits.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/etl/char_traits.h b/include/etl/char_traits.h
index 8ffeb7fd..a85bf670 100644
--- a/include/etl/char_traits.h
+++ b/include/etl/char_traits.h
@@ -153,7 +153,7 @@ namespace etl
     }
 
     //*************************************************************************
-    ETL_CONSTEXPR14 static size_t length(const char_type* str, size_t max_length)
+    static ETL_CONSTEXPR14 size_t length(const char_type* str, size_t max_length)
     {
       size_t count = 0UL;
 

From 2619b9e307b56f245d75d9ab771da6bf53f43178 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Fri, 2 Feb 2024 12:42:07 +0000
Subject: [PATCH 048/131] Refactored etl::optional implementation

---
 include/etl/optional.h | 186 +++++++++++++++++++++++++++++------------
 1 file changed, 134 insertions(+), 52 deletions(-)

diff --git a/include/etl/optional.h b/include/etl/optional.h
index c638427c..69c136f4 100644
--- a/include/etl/optional.h
+++ b/include/etl/optional.h
@@ -103,6 +103,7 @@ namespace etl
   /// See http://en.cppreference.com/w/cpp/utility/optional
   ///\tparam T The type to store.
   ///\ingroup utilities
+  //*****************************************************************************
   template <typename T>
   class optional
   {
@@ -113,7 +114,7 @@ namespace etl
     //***************************************************************************
     /// Constructor.
     //***************************************************************************
-    ETL_CONSTEXPR
+    ETL_CONSTEXPR20_STL
     optional()
       : storage()
     {
@@ -122,7 +123,7 @@ namespace etl
     //***************************************************************************
     /// Constructor with nullopt.
     //***************************************************************************
-    ETL_CONSTEXPR
+    ETL_CONSTEXPR20_STL
     optional(etl::nullopt_t)
       : storage()
     {
@@ -581,7 +582,14 @@ namespace etl
 
     struct dummy_t {};
 
-    struct storage_type
+    template <typename TValue, bool IsPod = etl::is_pod<TValue>::value>
+    struct storage_type;
+
+    //*************************************
+    // Non-POD
+    //*************************************
+    template <typename TValue>
+    struct storage_type<TValue, false>
     {
       //*******************************
       ETL_CONSTEXPR20_STL
@@ -600,33 +608,29 @@ namespace etl
 
       //*******************************
       ETL_CONSTEXPR20_STL
-      void construct(const T& value_)
+      void construct(const TValue& value_)
       {
         if (valid)
         {
-          u.value = value_;
-        }
-        else
-        {
-          etl::construct_at(&u.value, value_);
-          valid = true;
+          etl::destroy_at(&u.value);
         }
+
+        etl::construct_at(&u.value, value_);
+        valid = true;
       }
 
 #if ETL_USING_CPP11
       //*******************************
       ETL_CONSTEXPR20_STL
-      void construct(T&& value_)
+      void construct(TValue&& value_)
       {
         if (valid)
         {
-          u.value = etl::move(value_);
-        }
-        else
-        {
-          etl::construct_at(&u.value, etl::move(value_));
-          valid = true;
+          etl::destroy_at(&u.value);
         }
+
+        etl::construct_at(&u.value, etl::move(value_));
+        valid = true;
       }
 
       //*******************************
@@ -634,7 +638,11 @@ namespace etl
       ETL_CONSTEXPR20_STL
       void construct(TArgs&&... args)
       {
-        destroy();
+        if (valid)
+        {
+          etl::destroy_at(&u.value);
+        }
+
         etl::construct_at(&u.value, etl::forward<TArgs>(args)...);
         valid = true;
       }
@@ -666,13 +674,87 @@ namespace etl
         }
 
         dummy_t dummy;
-        T       value;
+        TValue  value;
       } u;
 
       bool valid;
     };
 
-    storage_type storage;
+    //*************************************
+    // POD
+    //*************************************
+    template <typename TValue>
+    struct storage_type<TValue, true>
+    {
+      //*******************************
+      ETL_CONSTEXPR20_STL
+      storage_type()
+        : valid(false)
+      {
+      }
+
+      //*******************************
+      ETL_CONSTEXPR20_STL
+      ~storage_type()
+      {
+      }
+
+      //*******************************
+      ETL_CONSTEXPR20_STL
+      void construct(const TValue& value_)
+      {
+        u.value = value_;
+        valid   = true;
+      }
+
+#if ETL_USING_CPP11
+      //*******************************
+      ETL_CONSTEXPR20_STL
+      void construct(TValue&& value_)
+      {
+        u.value = value_;
+        valid   = true;
+      }
+
+      //*******************************
+      template <typename... TArgs>
+      ETL_CONSTEXPR20_STL
+      void construct(TArgs&&... args)
+      {
+        u.value = TValue(etl::forward<TArgs>(args)...);
+        valid   = true;
+      }
+#endif
+
+      //*******************************
+      ETL_CONSTEXPR20_STL
+      void destroy()
+      {
+        valid = false;
+      }
+
+      //*******************************
+      union union_type
+      {
+        ETL_CONSTEXPR20_STL
+        union_type()
+          : dummy()
+        {
+        }
+
+        ETL_CONSTEXPR20_STL
+        ~union_type()
+        {
+        }
+
+        dummy_t dummy;
+        TValue  value;
+      } u;
+
+      bool valid;
+    };
+
+    storage_type<T> storage;
   };
 
 #include "private/diagnostic_uninitialized_push.h"
@@ -681,7 +763,7 @@ namespace etl
   /// Equality operator. cppreference 1
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator ==(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator ==(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
   {
     if (lhs.has_value() != rhs.has_value())
     {
@@ -701,7 +783,7 @@ namespace etl
   /// Equality operator. cppreference 2
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator !=(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator !=(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
   {
     return !(lhs == rhs);
   }
@@ -710,7 +792,7 @@ namespace etl
   /// Less than operator. cppreference 3
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator <(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator <(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
   {
     if (!rhs.has_value())
     {
@@ -730,7 +812,7 @@ namespace etl
   /// Less than equal operator. cppreference 4
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator <=(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator <=(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
   {
     return !(rhs < lhs);
   }
@@ -739,7 +821,7 @@ namespace etl
   /// greater than operator. cppreference 5
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator >(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator >(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
   {
     return (rhs < lhs);
   }
@@ -748,7 +830,7 @@ namespace etl
   /// greater than equal operator. cppreference 6
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator >=(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator >=(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
   {
     return !(lhs < rhs);
   }
@@ -757,7 +839,7 @@ namespace etl
   /// Equality operator. cppreference 7
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator ==(const etl::optional<T>& lhs, etl::nullopt_t)
+  ETL_CONSTEXPR20_STL bool operator ==(const etl::optional<T>& lhs, etl::nullopt_t)
   {
     return !lhs.has_value();
   }
@@ -766,7 +848,7 @@ namespace etl
   /// Equality operator. cppreference 8
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator ==(etl::nullopt_t, const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator ==(etl::nullopt_t, const etl::optional<T>& rhs)
   {
     return !rhs.has_value();
   }
@@ -775,7 +857,7 @@ namespace etl
   /// Inequality operator. cppreference 9
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator !=(const etl::optional<T>& lhs, etl::nullopt_t)
+  ETL_CONSTEXPR20_STL bool operator !=(const etl::optional<T>& lhs, etl::nullopt_t)
   {
     return !(lhs == etl::nullopt);
   }
@@ -784,7 +866,7 @@ namespace etl
   /// Inequality operator. cppreference 10
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator !=(etl::nullopt_t , const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator !=(etl::nullopt_t , const etl::optional<T>& rhs)
   {
     return !(etl::nullopt == rhs);
   }
@@ -793,7 +875,7 @@ namespace etl
   /// Less than operator. cppreference 11
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator <(const etl::optional<T>&, etl::nullopt_t)
+  ETL_CONSTEXPR20_STL bool operator <(const etl::optional<T>&, etl::nullopt_t)
   {
     return false;
   }
@@ -802,7 +884,7 @@ namespace etl
   /// Less than operator. cppreference 12
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator <(etl::nullopt_t, const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator <(etl::nullopt_t, const etl::optional<T>& rhs)
   {
     return rhs.has_value();
   }
@@ -811,7 +893,7 @@ namespace etl
   /// Less than equal operator. cppreference 13
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator <=(const etl::optional<T>& lhs, etl::nullopt_t)
+  ETL_CONSTEXPR20_STL bool operator <=(const etl::optional<T>& lhs, etl::nullopt_t)
   {
     return !lhs.has_value();
   }
@@ -820,7 +902,7 @@ namespace etl
   /// Less than equal operator. cppreference 14
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator <=(etl::nullopt_t, const etl::optional<T>&)
+  ETL_CONSTEXPR20_STL bool operator <=(etl::nullopt_t, const etl::optional<T>&)
   {
     return true;
   }
@@ -829,7 +911,7 @@ namespace etl
   /// Greater than operator. cppreference 15
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator >(const etl::optional<T>& lhs, etl::nullopt_t)
+  ETL_CONSTEXPR20_STL bool operator >(const etl::optional<T>& lhs, etl::nullopt_t)
   {
     return lhs.has_value();
   }
@@ -838,7 +920,7 @@ namespace etl
   /// Greater than operator. cppreference 16
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator >(etl::nullopt_t, const etl::optional<T>&)
+  ETL_CONSTEXPR20_STL bool operator >(etl::nullopt_t, const etl::optional<T>&)
   {
     return false;
   }
@@ -847,7 +929,7 @@ namespace etl
   /// Greater than equal operator. cppreference 17
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator >=(const etl::optional<T>&, etl::nullopt_t)
+  ETL_CONSTEXPR20_STL bool operator >=(const etl::optional<T>&, etl::nullopt_t)
   {
     return true;
   }
@@ -856,7 +938,7 @@ namespace etl
   /// Greater than equal operator. cppreference 18
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 bool operator >=(etl::nullopt_t, const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator >=(etl::nullopt_t, const etl::optional<T>& rhs)
   {
     return !rhs.has_value();
   }
@@ -865,7 +947,7 @@ namespace etl
   /// Equality operator. cppreference 19
   //**************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR14 bool operator ==(const etl::optional<T>& lhs, const U& rhs)
+  ETL_CONSTEXPR20_STL bool operator ==(const etl::optional<T>& lhs, const U& rhs)
   {
     return lhs.has_value() ? lhs.value() == rhs : false;
   }
@@ -874,7 +956,7 @@ namespace etl
   /// Inequality operator. cppreference 21
   //**************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR14 bool operator !=(const etl::optional<T>& lhs, const U& rhs)
+  ETL_CONSTEXPR20_STL bool operator !=(const etl::optional<T>& lhs, const U& rhs)
   {
     return !(lhs == rhs);
   }
@@ -883,7 +965,7 @@ namespace etl
   /// Equality operator. cppreference 20
   //**************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR14 bool operator ==(const U& lhs, const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator ==(const U& lhs, const etl::optional<T>& rhs)
   {
     return rhs.has_value() ? rhs.value() == lhs : false;
   }
@@ -892,7 +974,7 @@ namespace etl
   /// Inequality operator. cppreference 22
   //**************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR14 bool operator !=(const U& lhs, const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator !=(const U& lhs, const etl::optional<T>& rhs)
   {
     return !(lhs == rhs);
   }
@@ -901,7 +983,7 @@ namespace etl
   /// Less than operator. cppreference 23
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR14 bool operator <(const etl::optional<T>& lhs, const U& rhs)
+  ETL_CONSTEXPR20_STL bool operator <(const etl::optional<T>& lhs, const U& rhs)
   {
     return lhs.has_value() ? lhs.value() < rhs : true;
   }
@@ -910,7 +992,7 @@ namespace etl
   /// Less than operator. cppreference 24
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR14 bool operator <(const U& lhs, const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator <(const U& lhs, const etl::optional<T>& rhs)
   {
     return rhs.has_value() ? lhs < rhs.value() : false;
   }
@@ -919,7 +1001,7 @@ namespace etl
   /// Less than equal operator. cppreference 25
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR14 bool operator <=(const etl::optional<T>& lhs, const U& rhs)
+  ETL_CONSTEXPR20_STL bool operator <=(const etl::optional<T>& lhs, const U& rhs)
   {
     return lhs.has_value() ? lhs.value() <= rhs : true;
   }
@@ -928,7 +1010,7 @@ namespace etl
   /// Less than equal operator. cppreference 26
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR14 bool operator <=(const U& lhs, const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator <=(const U& lhs, const etl::optional<T>& rhs)
   {
     return rhs.has_value() ? lhs <= rhs.value() : false;
   }
@@ -937,7 +1019,7 @@ namespace etl
   /// Greater than operator. cppreference 27
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR14 bool operator >(const etl::optional<T>& lhs, const U& rhs)
+  ETL_CONSTEXPR20_STL bool operator >(const etl::optional<T>& lhs, const U& rhs)
   {
     return lhs.has_value() ? lhs.value() > rhs  : false;
   }
@@ -946,7 +1028,7 @@ namespace etl
   /// Greater than operator. cppreference 28
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR14 bool operator >(const U& lhs, const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator >(const U& lhs, const etl::optional<T>& rhs)
   {
     return rhs.has_value() ? lhs > rhs.value() : true;
   }
@@ -955,7 +1037,7 @@ namespace etl
   /// Greater than equal operator. cppreference 29
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR14 bool operator >=(const etl::optional<T>& lhs, const U& rhs)
+  ETL_CONSTEXPR20_STL bool operator >=(const etl::optional<T>& lhs, const U& rhs)
   {
     return lhs.has_value() ? lhs.value() >= rhs : false;
   }
@@ -964,7 +1046,7 @@ namespace etl
   /// Greater than equal operator. cppreference 30
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR14 bool operator >=(const U& lhs, const etl::optional<T>& rhs)
+  ETL_CONSTEXPR20_STL bool operator >=(const U& lhs, const etl::optional<T>& rhs)
   {
     return rhs.has_value() ? lhs >= rhs.value() : true;
   }
@@ -975,7 +1057,7 @@ namespace etl
   /// Make an optional.
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR14 etl::optional<typename etl::decay<T>::type> make_optional(T& value)
+  ETL_CONSTEXPR20_STL etl::optional<typename etl::decay<T>::type> make_optional(T& value)
   {
     return etl::optional<typename etl::decay<T>::type>(value);
   }
@@ -993,7 +1075,7 @@ namespace etl
 /// Swaps the values.
 //*************************************************************************
 template <typename T>
-ETL_CONSTEXPR14 void swap(etl::optional<T>& lhs, etl::optional<T>& rhs)
+ETL_CONSTEXPR20_STL void swap(etl::optional<T>& lhs, etl::optional<T>& rhs)
 {
   lhs.swap(rhs);
 }

From 3cbc73e0c904c394b56f89e6c4fb8148346426b6 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Fri, 9 Feb 2024 11:04:39 +0000
Subject: [PATCH 049/131] Updated unit tests for constexpr optional

---
 include/etl/optional.h | 2237 ++++++++++++++++++++++++++++++----------
 test/test_optional.cpp |  251 ++++-
 2 files changed, 1923 insertions(+), 565 deletions(-)

diff --git a/include/etl/optional.h b/include/etl/optional.h
index 69c136f4..7b55695f 100644
--- a/include/etl/optional.h
+++ b/include/etl/optional.h
@@ -97,6 +97,1134 @@ namespace etl
     }
   };
 
+  //*****************************************************************************
+  // Implementations for trivial and non trivial types.
+  //*****************************************************************************
+  namespace private_optional
+  {
+    template <typename T, bool IsTrivialType = etl::is_pod<T>::value>
+    class optional_impl;
+
+    //*****************************************************************************
+    // Implementation for non trivial types.
+    //*****************************************************************************
+    template <typename T>
+    class optional_impl<T, false>
+    {
+    protected:
+
+      typedef T value_type;
+
+      //***************************************************************************
+      /// Constructor.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      optional_impl()
+        : storage()
+      {
+      }
+
+      //***************************************************************************
+      /// Constructor with nullopt.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      optional_impl(etl::nullopt_t)
+        : storage()
+      {
+      }
+
+#include "private/diagnostic_uninitialized_push.h"
+      //***************************************************************************
+      /// Copy constructor.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      optional_impl(const optional_impl& other)
+      {
+        if (other.has_value())
+        {
+          storage.construct(other.value());
+        }
+      }
+#include "private/diagnostic_pop.h"
+
+#if ETL_USING_CPP11
+      //***************************************************************************
+      /// Move constructor.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      optional_impl(optional_impl&& other)
+      {
+        if (other.has_value())
+        {
+          storage.construct(etl::move(other.value()));
+        }
+      }
+#endif
+
+      //***************************************************************************
+      /// Constructor from value type.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      optional_impl(const T& value_)
+      {
+        storage.construct(value_);
+      }
+
+#if ETL_USING_CPP11
+      //***************************************************************************
+      /// Constructor from value type.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      optional_impl(T&& value_)
+      {
+        storage.construct(etl::move(value_));
+      }
+#endif
+
+      //***************************************************************************
+      /// Destructor.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      ~optional_impl()
+      {
+        storage.destroy();
+      }
+
+      //***************************************************************************
+      /// Assignment operator from nullopt.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      optional_impl& operator =(etl::nullopt_t)
+      {
+        if (has_value())
+        {
+          storage.destroy();
+        }
+
+        return *this;
+      }
+
+      //***************************************************************************
+      /// Assignment operator from optional_impl.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      optional_impl& operator =(const optional_impl& other)
+      {
+        if (this != &other)
+        {
+          if (other.has_value())
+          {
+            storage.construct(other.value());
+          }
+          else
+          {
+            storage.destroy();
+          }
+        }
+
+        return *this;
+      }
+
+#if ETL_USING_CPP11
+      //***************************************************************************
+      /// Assignment operator from optional_impl.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      optional_impl& operator =(optional_impl&& other)
+      {
+        if (this != &other)
+        {
+          if (other.has_value())
+          {
+            storage.construct(etl::move(other.value()));
+          }
+          else
+          {
+            storage.destroy();
+          }
+        }
+
+        return *this;
+      }
+#endif
+
+      //***************************************************************************
+      /// Assignment operator from value type.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      optional_impl& operator =(const T& value_)
+      {
+        storage.construct(value_);
+
+        return *this;
+      }
+
+#if ETL_USING_CPP11
+      //***************************************************************************
+      /// Assignment operator from value type.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      optional_impl& operator =(T&& value_)
+      {
+        storage.construct(etl::move(value_));
+
+        return *this;
+      }
+#endif
+
+  public:
+
+      //***************************************************************************
+      /// Pointer operator.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      T* operator ->()
+      {
+#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return &storage.u.value;
+      }
+
+      //***************************************************************************
+      /// Pointer operator.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      const T* operator ->() const
+      {
+#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return &storage.u.value;
+      }
+
+      //***************************************************************************
+      /// Dereference operator.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      T& operator *() ETL_LVALUE_REF_QUALIFIER
+      {
+#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return storage.u.value;
+      }
+
+      //***************************************************************************
+      /// Dereference operator.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      const T& operator *() const ETL_LVALUE_REF_QUALIFIER
+      {
+#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return storage.u.value;
+      }
+
+#if ETL_USING_CPP11
+      //***************************************************************************
+      /// Dereference operator.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      T&& operator *()&&
+      {
+#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return etl::move(storage.u.value);
+      }
+
+      //***************************************************************************
+      /// Dereference operator.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      const T&& operator *() const&&
+      {
+#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return etl::move(storage.u.value);
+      }
+#endif
+
+      //***************************************************************************
+      // Check whether optional contains value
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      bool has_value() const ETL_NOEXCEPT
+      {
+        return storage.valid;
+      }
+
+      //***************************************************************************
+      /// Bool conversion operator.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      ETL_EXPLICIT operator bool() const
+      {
+        return has_value();
+      }
+
+      //***************************************************************************
+      /// Get a reference to the value.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      T& value() ETL_LVALUE_REF_QUALIFIER
+      {
+#if ETL_IS_DEBUG_BUILD
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return storage.u.value;
+      }
+
+      //***************************************************************************
+      /// Get a const reference to the value.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      const T& value() const ETL_LVALUE_REF_QUALIFIER
+      {
+#if ETL_IS_DEBUG_BUILD
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return storage.u.value;
+      }
+
+      //***************************************************************************
+      /// Gets the value or a default if not valid.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      T value_or(const T& default_value) const ETL_LVALUE_REF_QUALIFIER
+      {
+        return has_value() ? value() : default_value;
+      }
+
+#if ETL_USING_CPP11
+      //***************************************************************************
+      /// Get an rvalue reference to the value.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      T&& value()&&
+      {
+#if ETL_IS_DEBUG_BUILD
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return etl::move(storage.u.value);
+      }
+
+      //***************************************************************************
+      /// Get a const rvalue reference to the value.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      const T&& value() const&&
+      {
+#if ETL_IS_DEBUG_BUILD
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return etl::move(storage.u.value);
+      }
+
+      //***************************************************************************
+      /// Gets the value or a default if not valid.
+      //***************************************************************************
+      template <typename U>
+      ETL_CONSTEXPR20_STL
+      etl::enable_if_t<etl::is_convertible<U, T>::value, T>
+        value_or(U&& default_value) const&
+      {
+        return has_value() ? value() : etl::forward<T>(default_value);
+      }
+
+      //***************************************************************************
+      /// Gets the value or a default if not valid.
+      //***************************************************************************
+      template <typename U>
+      ETL_CONSTEXPR20_STL
+      etl::enable_if_t<etl::is_convertible<U, T>::value, T>
+        value_or(U&& default_value)&&
+      {
+        return has_value() ? etl::move(value()) : etl::forward<T>(default_value);
+      }
+#endif
+
+      //***************************************************************************
+      /// Swaps this value with another.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      void swap(optional_impl& other)
+      {
+        optional_impl temp(*this);
+        *this = other;
+        other = temp;
+      }
+
+      //***************************************************************************
+      /// Reset back to invalid.
+      //***************************************************************************
+      ETL_CONSTEXPR20_STL
+      void reset()
+      {
+        storage.destroy();
+      }
+
+#if ETL_USING_CPP11  && ETL_NOT_USING_STLPORT && !defined(ETL_OPTIONAL_FORCE_CPP03_IMPLEMENTATION)
+      //*************************************************************************
+      /// Emplaces a value.
+      ///\param args The arguments to construct with.
+      //*************************************************************************
+      template <typename... TArgs>
+      ETL_CONSTEXPR20_STL
+      void emplace(TArgs&& ... args)
+      {
+        storage.construct(etl::forward<TArgs>(args)...);
+      }
+#else
+      //*************************************************************************
+      /// Emplaces a value.
+      /// 1 parameter.
+      //*************************************************************************
+      T& emplace()
+      {
+        if (has_value())
+        {
+          // Destroy the old one.
+          storage.destroy();
+        }
+
+        T* p = ::new (&storage.u.value) T();
+        storage.valid = true;
+
+        return *p;
+      }
+
+      //*************************************************************************
+      /// Emplaces a value.
+      /// 1 parameter.
+      //*************************************************************************
+      template <typename T1>
+      T& emplace(const T1& value1)
+      {
+        if (has_value())
+        {
+          // Destroy the old one.
+          storage.destroy();
+        }
+
+        T* p = ::new (&storage.u.value) T(value1);
+        storage.valid = true;
+
+        return *p;
+      }
+
+      //*************************************************************************
+      /// Emplaces a value.
+      /// 2 parameters.
+      //*************************************************************************
+      template <typename T1, typename T2>
+      T& emplace(const T1& value1, const T2& value2)
+      {
+        if (has_value())
+        {
+          // Destroy the old one.
+          storage.destroy();
+        }
+
+        T* p = ::new (&storage.u.value) T(value1, value2);
+        storage.valid = true;
+
+        return *p;
+      }
+
+      //*************************************************************************
+      /// Emplaces a value.
+      /// 3 parameters.
+      //*************************************************************************
+      template <typename T1, typename T2, typename T3>
+      T& emplace(const T1& value1, const T2& value2, const T3& value3)
+      {
+        if (has_value())
+        {
+          // Destroy the old one.
+          storage.destroy();
+        }
+
+        T* p = ::new (&storage.u.value) T(value1, value2, value3);
+        storage.valid = true;
+
+        return *p;
+      }
+
+      //*************************************************************************
+      /// Emplaces a value.
+      /// 4 parameters.
+      //*************************************************************************
+      template <typename T1, typename T2, typename T3, typename T4>
+      T& emplace(const T1& value1, const T2& value2, const T3& value3, const T4& value4)
+      {
+        if (has_value())
+        {
+          // Destroy the old one.
+          storage.destroy();
+        }
+
+        T* p = ::new (&storage.u.value) T(value1, value2, value3, value4);
+        storage.valid = true;
+
+        return *p;
+      }
+#endif
+
+    private:
+
+      struct dummy_t {};
+
+      //*************************************
+      // The storage for the optional value.
+      //*************************************
+      struct storage_type
+      {
+        //*******************************
+        ETL_CONSTEXPR20_STL
+        storage_type()
+          : u()
+          , valid(false)
+        {
+        }
+
+        //*******************************
+        ETL_CONSTEXPR20_STL
+        void construct(const T& value_)
+        {
+          if (valid)
+          {
+            etl::destroy_at(&u.value);
+          }
+
+          etl::construct_at(&u.value, value_);
+          valid = true;
+        }
+
+#if ETL_USING_CPP11
+        //*******************************
+        ETL_CONSTEXPR20_STL
+        void construct(T&& value_)
+        {
+          if (valid)
+          {
+            etl::destroy_at(&u.value);
+          }
+
+          etl::construct_at(&u.value, etl::move(value_));
+          valid = true;
+        }
+
+        //*******************************
+        template <typename... TArgs>
+        ETL_CONSTEXPR20_STL
+        void construct(TArgs&&... args)
+        {
+          if (valid)
+          {
+            etl::destroy_at(&u.value);
+          }
+
+          etl::construct_at(&u.value, etl::forward<TArgs>(args)...);
+          valid = true;
+        }
+#endif
+
+        //*******************************
+        ETL_CONSTEXPR20_STL
+        void destroy()
+        {
+          if (valid)
+          {
+            etl::destroy_at(&u.value);
+            valid = false;
+          }
+        }
+
+        //*******************************
+        union union_type
+        {
+          ETL_CONSTEXPR20_STL
+          union_type()
+            : dummy()
+          {
+          }
+
+          ETL_CONSTEXPR20_STL
+          ~union_type()
+          {
+          }
+
+          dummy_t dummy;
+          T       value;
+        } u;
+
+        bool valid;
+      };
+
+      storage_type storage;
+    };
+
+    //*****************************************************************************
+    // Implementation for trivial types.
+    //*****************************************************************************
+    template <typename T>
+    class optional_impl<T, true>
+    {
+    protected:
+
+      typedef T value_type;
+
+      //***************************************************************************
+      /// Constructor.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      optional_impl()
+        : storage()
+      {
+      }
+
+      //***************************************************************************
+      /// Constructor with nullopt.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      optional_impl(etl::nullopt_t)
+        : storage()
+      {
+      }
+
+#include "private/diagnostic_uninitialized_push.h"
+      //***************************************************************************
+      /// Copy constructor.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      optional_impl(const optional_impl& other)
+      {
+        if (other.has_value())
+        {
+          storage.construct(other.value());
+        }
+      }
+#include "private/diagnostic_pop.h"
+
+#if ETL_USING_CPP11
+      //***************************************************************************
+      /// Move constructor.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      optional_impl(optional_impl&& other)
+      {
+        if (other.has_value())
+        {
+          storage.construct(etl::move(other.value()));
+        }
+      }
+#endif
+
+      //***************************************************************************
+      /// Constructor from value type.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      optional_impl(const T& value_)
+      {
+        storage.construct(value_);
+      }
+
+#if ETL_USING_CPP11
+      //***************************************************************************
+      /// Constructor from value type.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      optional_impl(T&& value_)
+      {
+        storage.construct(etl::move(value_));
+      }
+#endif
+
+      //***************************************************************************
+      /// Assignment operator from nullopt.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      optional_impl& operator =(etl::nullopt_t)
+      {
+        if (has_value())
+        {
+          storage.destroy();
+        }
+
+        return *this;
+      }
+
+      //***************************************************************************
+      /// Assignment operator from optional_impl.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      optional_impl& operator =(const optional_impl& other)
+      {
+        if (this != &other)
+        {
+          if (other.has_value())
+          {
+            storage.construct(other.value());
+          }
+          else
+          {
+            storage.destroy();
+          }
+        }
+
+        return *this;
+      }
+
+#if ETL_USING_CPP11
+      //***************************************************************************
+      /// Assignment operator from optional_impl.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      optional_impl& operator =(optional_impl&& other)
+      {
+        if (this != &other)
+        {
+          if (other.has_value())
+          {
+            storage.construct(etl::move(other.value()));
+          }
+          else
+          {
+            storage.destroy();
+          }
+        }
+
+        return *this;
+      }
+#endif
+
+      //***************************************************************************
+      /// Assignment operator from value type.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      optional_impl& operator =(const T& value_)
+      {
+        storage.construct(value_);
+
+        return *this;
+      }
+
+#if ETL_USING_CPP11
+      //***************************************************************************
+      /// Assignment operator from value type.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      optional_impl& operator =(T&& value_)
+      {
+        storage.construct(etl::move(value_));
+
+        return *this;
+      }
+#endif
+
+  public:
+
+      //***************************************************************************
+      /// Pointer operator.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      T* operator ->()
+      {
+#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return &storage.u.value;
+      }
+
+      //***************************************************************************
+      /// Pointer operator.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      const T* operator ->() const
+      {
+#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return &storage.u.value;
+      }
+
+      //***************************************************************************
+      /// Dereference operator.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      T& operator *() ETL_LVALUE_REF_QUALIFIER
+      {
+#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return storage.u.value;
+      }
+
+      //***************************************************************************
+      /// Dereference operator.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      const T& operator *() const ETL_LVALUE_REF_QUALIFIER
+      {
+#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return storage.u.value;
+      }
+
+#if ETL_USING_CPP11
+      //***************************************************************************
+      /// Dereference operator.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      T&& operator *()&&
+      {
+#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return etl::move(storage.u.value);
+      }
+
+      //***************************************************************************
+      /// Dereference operator.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      const T&& operator *() const&&
+      {
+#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return etl::move(storage.u.value);
+      }
+#endif
+
+      //***************************************************************************
+      // Check whether optional contains value
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      bool has_value() const ETL_NOEXCEPT
+      {
+        return storage.valid;
+      }
+
+      //***************************************************************************
+      /// Bool conversion operator.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      ETL_EXPLICIT operator bool() const
+      {
+        return has_value();
+      }
+
+      //***************************************************************************
+      /// Get a reference to the value.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      T& value() ETL_LVALUE_REF_QUALIFIER
+      {
+#if ETL_IS_DEBUG_BUILD
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return storage.u.value;
+      }
+
+      //***************************************************************************
+      /// Get a const reference to the value.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      const T& value() const ETL_LVALUE_REF_QUALIFIER
+      {
+#if ETL_IS_DEBUG_BUILD
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return storage.u.value;
+      }
+
+      //***************************************************************************
+      /// Gets the value or a default if not valid.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      T value_or(const T& default_value) const ETL_LVALUE_REF_QUALIFIER
+      {
+        return has_value() ? value() : default_value;
+      }
+
+#if ETL_USING_CPP11
+      //***************************************************************************
+      /// Get an rvalue reference to the value.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      T&& value()&&
+      {
+#if ETL_IS_DEBUG_BUILD
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return etl::move(storage.u.value);
+      }
+
+      //***************************************************************************
+      /// Get a const rvalue reference to the value.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      const T&& value() const&&
+      {
+#if ETL_IS_DEBUG_BUILD
+        ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
+#endif
+
+        return etl::move(storage.u.value);
+      }
+
+      //***************************************************************************
+      /// Gets the value or a default if not valid.
+      //***************************************************************************
+      template <typename U>
+      ETL_CONSTEXPR14
+      etl::enable_if_t<etl::is_convertible<U, T>::value, T>
+        value_or(U&& default_value) const&
+      {
+        return has_value() ? value() : etl::forward<T>(default_value);
+      }
+
+      //***************************************************************************
+      /// Gets the value or a default if not valid.
+      //***************************************************************************
+      template <typename U>
+      ETL_CONSTEXPR14
+      etl::enable_if_t<etl::is_convertible<U, T>::value, T>
+        value_or(U&& default_value)&&
+      {
+        return has_value() ? etl::move(value()) : etl::forward<T>(default_value);
+      }
+#endif
+
+      //***************************************************************************
+      /// Swaps this value with another.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      void swap(optional_impl& other)
+      {
+        optional_impl temp(*this);
+        *this = other;
+        other = temp;
+      }
+
+      //***************************************************************************
+      /// Reset back to invalid.
+      //***************************************************************************
+      ETL_CONSTEXPR14
+      void reset()
+      {
+        storage.destroy();
+      }
+
+#if ETL_USING_CPP11  && ETL_NOT_USING_STLPORT && !defined(ETL_OPTIONAL_FORCE_CPP03_IMPLEMENTATION)
+      //*************************************************************************
+      /// Emplaces a value.
+      ///\param args The arguments to construct with.
+      //*************************************************************************
+      template <typename... TArgs>
+      ETL_CONSTEXPR14
+      void emplace(TArgs&& ... args)
+      {
+        storage.construct(etl::forward<TArgs>(args)...);
+      }
+#else
+      //*************************************************************************
+      /// Emplaces a value.
+      /// 1 parameter.
+      //*************************************************************************
+      T& emplace()
+      {
+        if (has_value())
+        {
+          // Destroy the old one.
+          storage.destroy();
+        }
+
+        T* p = ::new (&storage.u.value) T();
+        storage.valid = true;
+
+        return *p;
+      }
+
+      //*************************************************************************
+      /// Emplaces a value.
+      /// 1 parameter.
+      //*************************************************************************
+      template <typename T1>
+      T& emplace(const T1& value1)
+      {
+        if (has_value())
+        {
+          // Destroy the old one.
+          storage.destroy();
+        }
+
+        T* p = ::new (&storage.u.value) T(value1);
+        storage.valid = true;
+
+        return *p;
+      }
+
+      //*************************************************************************
+      /// Emplaces a value.
+      /// 2 parameters.
+      //*************************************************************************
+      template <typename T1, typename T2>
+      T& emplace(const T1& value1, const T2& value2)
+      {
+        if (has_value())
+        {
+          // Destroy the old one.
+          storage.destroy();
+        }
+
+        T* p = ::new (&storage.u.value) T(value1, value2);
+        storage.valid = true;
+
+        return *p;
+      }
+
+      //*************************************************************************
+      /// Emplaces a value.
+      /// 3 parameters.
+      //*************************************************************************
+      template <typename T1, typename T2, typename T3>
+      T& emplace(const T1& value1, const T2& value2, const T3& value3)
+      {
+        if (has_value())
+        {
+          // Destroy the old one.
+          storage.destroy();
+        }
+
+        T* p = ::new (&storage.u.value) T(value1, value2, value3);
+        storage.valid = true;
+
+        return *p;
+      }
+
+      //*************************************************************************
+      /// Emplaces a value.
+      /// 4 parameters.
+      //*************************************************************************
+      template <typename T1, typename T2, typename T3, typename T4>
+      T& emplace(const T1& value1, const T2& value2, const T3& value3, const T4& value4)
+      {
+        if (has_value())
+        {
+          // Destroy the old one.
+          storage.destroy();
+        }
+
+        T* p = ::new (&storage.u.value) T(value1, value2, value3, value4);
+        storage.valid = true;
+
+        return *p;
+      }
+#endif
+
+    private:
+
+      struct dummy_t {};
+
+      //*************************************
+      // The storage for the optional value.
+      //*************************************
+      struct storage_type
+      {
+        //*******************************
+        ETL_CONSTEXPR14
+          storage_type()
+          : u()
+          , valid(false)
+        {
+        }
+
+        //*******************************
+        ETL_CONSTEXPR14
+        void construct(const T& value_)
+        {
+          u.value = value_;
+          valid   = true;
+        }
+
+#if ETL_USING_CPP11
+        //*******************************
+        ETL_CONSTEXPR14
+        void construct(T&& value_)
+        {
+          u.value = value_;
+          valid = true;
+        }
+
+        //*******************************
+        template <typename... TArgs>
+        ETL_CONSTEXPR14
+        void construct(TArgs&&... args)
+        {
+          u.value = T(etl::forward<TArgs>(args)...);
+          valid = true;
+        }
+#endif
+
+        //*******************************
+        ETL_CONSTEXPR14
+        void destroy()
+        {
+          valid = false;
+        }
+
+        //*******************************
+        union union_type
+        {
+          ETL_CONSTEXPR14
+          union_type()
+            : dummy()
+          {
+          }
+
+          dummy_t dummy;
+          T       value;
+        } u;
+
+        bool valid;
+      };
+
+      storage_type storage;
+    };
+  }
+
+#define ETL_OPTIONAL_ENABLE_CPP14     typename etl::enable_if< etl::is_pod<U>::value, int>::type = 0
+#define ETL_OPTIONAL_ENABLE_CPP20_STL typename etl::enable_if<!etl::is_pod<U>::value, int>::type = 0
+
+#define ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14     ETL_CONSTEXPR14     typename etl::enable_if< etl::is_pod<T>::value, bool>::type
+#define ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL ETL_CONSTEXPR20_STL typename etl::enable_if<!etl::is_pod<T>::value, bool>::type
+
   //*****************************************************************************
   /// An optional type.
   /// If the optional type is not initialised then a type is not constructed.
@@ -105,97 +1233,225 @@ namespace etl
   ///\ingroup utilities
   //*****************************************************************************
   template <typename T>
-  class optional
+  class optional : public private_optional::optional_impl<T>
   {
+  private:
+
+    typedef private_optional::optional_impl<T> impl_t;
+    
   public:
 
     typedef T value_type;
 
+#if ETL_USING_CPP11
     //***************************************************************************
     /// Constructor.
     //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP14>
+    ETL_CONSTEXPR14
+    optional()
+      : impl_t()
+    {
+    }
+
+    //***************************************************************************
+    /// Constructor.
+    //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP20_STL>
     ETL_CONSTEXPR20_STL
     optional()
-      : storage()
+      : impl_t()
+    {
+    }
+#else
+    optional()
+      : impl_t()
+    {
+    }
+#endif
+
+#if ETL_USING_CPP11
+    //***************************************************************************
+    /// Constructor with nullopt.
+    //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP14>
+    ETL_CONSTEXPR14
+    optional(etl::nullopt_t)
+      : impl_t(etl::nullopt_t{})
     {
     }
 
     //***************************************************************************
     /// Constructor with nullopt.
     //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP20_STL>
     ETL_CONSTEXPR20_STL
     optional(etl::nullopt_t)
-      : storage()
+      : impl_t(etl::nullopt_t{})
     {
     }
+#else
+    //***************************************************************************
+    /// Constructor with nullopt.
+    //***************************************************************************
+    optional(etl::nullopt_t)
+      : impl_t(etl::nullopt_t{})
+    {
+    }
+#endif
 
 #include "private/diagnostic_uninitialized_push.h"
+#if ETL_USING_CPP11
     //***************************************************************************
     /// Copy constructor.
     //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP14>
+    ETL_CONSTEXPR14
+    optional(const optional& other)
+      : impl_t(other)
+    {
+    }
+
+    //***************************************************************************
+    /// Copy constructor.
+    //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP20_STL>
     ETL_CONSTEXPR20_STL
     optional(const optional& other)
+      : impl_t(other)
     {
-      if (other.has_value())
-      {
-        storage.construct(other.value());
-      }
     }
+#else
+    //***************************************************************************
+    /// Copy constructor.
+    //***************************************************************************
+    optional(const optional& other)
+      : impl_t(other)
+    {
+    }
+#endif
 #include "private/diagnostic_pop.h"
 
 #if ETL_USING_CPP11
     //***************************************************************************
     /// Move constructor.
     //***************************************************************************
-    ETL_CONSTEXPR20_STL
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP14>
+    ETL_CONSTEXPR14
     optional(optional&& other)
+      : impl_t(other)
     {
-      if (other.has_value())
-      {
-        storage.construct(etl::move(other.value()));
-      }
     }
-#endif
 
     //***************************************************************************
-    /// Constructor from value type.
+    /// Move constructor.
     //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP20_STL>
     ETL_CONSTEXPR20_STL
-    optional(const T& value_)
+    optional(optional&& other)
+      : impl_t(other)
     {
-      storage.construct(value_);
     }
+#endif
 
 #if ETL_USING_CPP11
     //***************************************************************************
-    /// Constructor from value type.
+    /// Construct from value type.
     //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    optional(T&& value_)
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP14>
+    ETL_CONSTEXPR14
+    optional(const T& value_)
+      : impl_t(value_)
+    {
+    }
+
+    //***************************************************************************
+    /// Construct from value type.
+    //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP20_STL>
+    ETL_CONSTEXPR20_STL
+    optional(const T& value_)
+      : impl_t(value_)
+    {
+    }
+#else
+    //***************************************************************************
+    /// Construct from value type.
+    //***************************************************************************
+    optional(const T& value_)
+      : impl_t(value_)
     {
-      storage.construct(etl::move(value_));
     }
 #endif
 
+
+#if ETL_USING_CPP11
     //***************************************************************************
-    /// Destructor.
+    /// Move construct from value type.
     //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    ~optional()
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP14>
+    ETL_CONSTEXPR14
+    optional(T&& value_)
+      : impl_t(etl::move(value_))
     {
-      storage.destroy();
+    }
+
+    //***************************************************************************
+    /// Move construct from value type.
+    //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP20_STL>
+    ETL_CONSTEXPR20_STL
+    optional(T&& value_)
+      : impl_t(etl::move(value_))
+    {
+    }
+#endif
+
+#if ETL_USING_CPP11
+    //***************************************************************************
+    /// Assignment operator from nullopt.
+    //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP14>
+    ETL_CONSTEXPR14
+    optional& operator =(etl::nullopt_t)
+    {
+      impl_t::operator=(etl::nullopt_t{});
+
+      return *this;
     }
 
     //***************************************************************************
     /// Assignment operator from nullopt.
     //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP20_STL>
     ETL_CONSTEXPR20_STL
     optional& operator =(etl::nullopt_t)
     {
-      if (has_value())
-      {
-        storage.destroy();
-      }
+      impl_t::operator=(etl::nullopt_t{});
+
+      return *this;
+    }
+#else
+    //***************************************************************************
+    /// Assignment operator from nullopt.
+    //***************************************************************************
+    optional& operator =(etl::nullopt_t)
+    {
+      impl_t::operator=(etl::nullopt_t{});
+
+      return *this;
+    }
+#endif
+
+#if ETL_USING_CPP11
+    //***************************************************************************
+    /// Assignment operator from optional.
+    //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP14>
+    ETL_CONSTEXPR14
+    optional& operator =(const optional& other)
+    {
+      impl_t::operator=(other);
 
       return *this;
     }
@@ -203,558 +1459,113 @@ namespace etl
     //***************************************************************************
     /// Assignment operator from optional.
     //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP20_STL>
     ETL_CONSTEXPR20_STL
     optional& operator =(const optional& other)
     {
-      if (this != &other)
-      {
-        if (other.has_value())
-        {
-          storage.construct(other.value());
-        }
-        else
-        {
-          storage.destroy();
-        }
-      }
+      impl_t::operator=(other);
 
       return *this;
     }
-
-#if ETL_USING_CPP11
+#else
     //***************************************************************************
     /// Assignment operator from optional.
     //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    optional& operator =(optional&& other)
+    optional& operator =(const optional& other)
     {
-      if (this != &other)
-      {
-        if (other.has_value())
-        {
-          storage.construct(etl::move(other.value()));
-        }
-        else
-        {
-          storage.destroy();
-        }
-      }
+      impl_t::operator=(other);
 
       return *this;
     }
 #endif
 
+#if ETL_USING_CPP11
+    //***************************************************************************
+    /// Move assignment operator from optional.
+    //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP14>
+    ETL_CONSTEXPR14
+      optional& operator =(optional&& other)
+    {
+      impl_t::operator=(etl::move(other));
+
+      return *this;
+    }
+
+    //***************************************************************************
+    /// Move assignment operator from optional.
+    //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP20_STL>
+    ETL_CONSTEXPR20_STL
+      optional& operator =(optional&& other)
+    {
+      impl_t::operator=(etl::move(other));
+
+      return *this;
+    }
+#endif
+
+#if ETL_USING_CPP11
     //***************************************************************************
     /// Assignment operator from value type.
     //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP14>
+    ETL_CONSTEXPR14
+    optional& operator =(const T& value_)
+    {
+      impl_t::operator=(value_);
+
+      return *this;
+    }
+
+    //***************************************************************************
+    /// Assignment operator from value type.
+    //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP20_STL>
     ETL_CONSTEXPR20_STL
     optional& operator =(const T& value_)
     {
-      storage.construct(value_);
+      impl_t::operator=(value_);
 
       return *this;
     }
-
-#if ETL_USING_CPP11
+#else
     //***************************************************************************
     /// Assignment operator from value type.
     //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    optional& operator =(T&& value_)
+    optional& operator =(const T& value_)
     {
-      storage.construct(etl::move(value_));
+      impl_t::operator=(value_);
 
       return *this;
     }
 #endif
 
-    //***************************************************************************
-    /// Pointer operator.
-    //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    T* operator ->()
-    {
-#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
-      ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
-#endif
-
-      return &storage.u.value;
-    }
-
-    //***************************************************************************
-    /// Pointer operator.
-    //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    const T* operator ->() const
-    {
-#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
-      ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
-#endif
-
-      return &storage.u.value;
-    }
-
-    //***************************************************************************
-    /// Dereference operator.
-    //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    T& operator *() ETL_LVALUE_REF_QUALIFIER
-    {
-#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
-      ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
-#endif
-
-      return storage.u.value;
-    }
-
-    //***************************************************************************
-    /// Dereference operator.
-    //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    const T& operator *() const ETL_LVALUE_REF_QUALIFIER
-    {
-#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
-      ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
-#endif
-
-      return storage.u.value;
-    }
-
 #if ETL_USING_CPP11
     //***************************************************************************
-    /// Dereference operator.
+    /// Move assignment operator from value type.
     //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    T&& operator *()&&
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP14>
+    ETL_CONSTEXPR14
+      optional& operator =(T&& value_)
     {
-#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
-      ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
-#endif
+      impl_t::operator=(etl::move(value_));
 
-      return etl::move(storage.u.value);
+      return *this;
     }
 
     //***************************************************************************
-    /// Dereference operator.
+    /// Move assignment operator from value type.
     //***************************************************************************
+    template <typename U = T, ETL_OPTIONAL_ENABLE_CPP20_STL>
     ETL_CONSTEXPR20_STL
-    const T&& operator *() const&&
+      optional& operator =(T&& value_)
     {
-#if ETL_IS_DEBUG_BUILD && !(ETL_USING_CPP20 && ETL_USING_STL)
-      ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
-#endif
+      impl_t::operator=(etl::move(value_));
 
-      return etl::move(storage.u.value);
+      return *this;
     }
 #endif
-
-    //***************************************************************************
-    // Check whether optional contains value
-    //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    bool has_value() const ETL_NOEXCEPT
-    {
-      return storage.valid;
-    }
-
-    //***************************************************************************
-    /// Bool conversion operator.
-    //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    ETL_EXPLICIT operator bool() const
-    {
-      return has_value();
-    }
-
-    //***************************************************************************
-    /// Get a reference to the value.
-    //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    T& value() ETL_LVALUE_REF_QUALIFIER
-    {
-#if ETL_IS_DEBUG_BUILD
-      ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
-#endif
-
-      return storage.u.value;
-    }
-
-    //***************************************************************************
-    /// Get a const reference to the value.
-    //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    const T& value() const ETL_LVALUE_REF_QUALIFIER
-    {
-#if ETL_IS_DEBUG_BUILD
-      ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
-#endif
-
-      return storage.u.value;
-    }
-
-    //***************************************************************************
-    /// Gets the value or a default if not valid.
-    //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    T value_or(const T& default_value) const ETL_LVALUE_REF_QUALIFIER
-    {
-      return has_value() ? value() : default_value;
-    }
-
-#if ETL_USING_CPP11
-    //***************************************************************************
-    /// Get an rvalue reference to the value.
-    //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    T&& value()&&
-    {
-#if ETL_IS_DEBUG_BUILD
-      ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
-#endif
-
-      return etl::move(storage.u.value);
-    }
-
-    //***************************************************************************
-    /// Get a const rvalue reference to the value.
-    //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    const T&& value() const&&
-    {
-#if ETL_IS_DEBUG_BUILD
-      ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
-#endif
-
-      return etl::move(storage.u.value);
-    }
-
-    //***************************************************************************
-    /// Gets the value or a default if not valid.
-    //***************************************************************************
-    template <typename U>
-    ETL_CONSTEXPR20_STL
-    etl::enable_if_t<etl::is_convertible<U, T>::value, T>
-      value_or(U&& default_value) const&
-    {
-      return has_value() ? value() : etl::forward<T>(default_value);
-    }
-
-    //***************************************************************************
-    /// Gets the value or a default if not valid.
-    //***************************************************************************
-    template <typename U>
-    ETL_CONSTEXPR20_STL
-    etl::enable_if_t<etl::is_convertible<U, T>::value, T>
-      value_or(U&& default_value) &&
-    {
-      return has_value() ? etl::move(value()) : etl::forward<T>(default_value);
-    }
-#endif
-
-    //***************************************************************************
-    /// Swaps this value with another.
-    //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    void swap(optional& other)
-    {
-      optional temp(*this);
-      *this = other;
-      other = temp;
-    }
-
-    //***************************************************************************
-    /// Reset back to invalid.
-    //***************************************************************************
-    ETL_CONSTEXPR20_STL
-    void reset()
-    {
-      storage.destroy();
-    }
-
-#if ETL_USING_CPP11  && ETL_NOT_USING_STLPORT && !defined(ETL_OPTIONAL_FORCE_CPP03_IMPLEMENTATION)
-    //*************************************************************************
-    /// Emplaces a value.
-    ///\param args The arguments to construct with.
-    //*************************************************************************
-    template <typename ... TArgs>
-    ETL_CONSTEXPR20_STL
-    void emplace(TArgs&& ... args)
-    {
-      storage.construct(etl::forward<TArgs>(args)...);
-    }
-#else
-    //*************************************************************************
-    /// Emplaces a value.
-    /// 1 parameter.
-    //*************************************************************************
-    T& emplace()
-    {
-      if (has_value())
-      {
-        // Destroy the old one.
-        storage.destroy();
-      }
-
-      T* p = ::new (&storage.u.value) T();
-      storage.valid = true;
-
-      return *p;
-    }
-
-    //*************************************************************************
-    /// Emplaces a value.
-    /// 1 parameter.
-    //*************************************************************************
-    template <typename T1>
-    T& emplace(const T1& value1)
-    {
-      if (has_value())
-      {
-        // Destroy the old one.
-        storage.destroy();
-      }
-
-      T* p = ::new (&storage.u.value) T(value1);
-      storage.valid = true;
-
-      return *p;
-    }
-
-    //*************************************************************************
-    /// Emplaces a value.
-    /// 2 parameters.
-    //*************************************************************************
-    template <typename T1, typename T2>
-    T& emplace(const T1& value1, const T2& value2)
-    {
-      if (has_value())
-      {
-        // Destroy the old one.
-        storage.destroy();
-      }
-
-      T* p = ::new (&storage.u.value) T(value1, value2);
-      storage.valid = true;
-
-      return *p;
-    }
-
-    //*************************************************************************
-    /// Emplaces a value.
-    /// 3 parameters.
-    //*************************************************************************
-    template <typename T1, typename T2, typename T3>
-    T& emplace(const T1& value1, const T2& value2, const T3& value3)
-    {
-      if (has_value())
-      {
-        // Destroy the old one.
-        storage.destroy();
-      }
-
-      T* p = ::new (&storage.u.value) T(value1, value2, value3);
-      storage.valid = true;
-
-      return *p;
-    }
-
-    //*************************************************************************
-    /// Emplaces a value.
-    /// 4 parameters.
-    //*************************************************************************
-    template <typename T1, typename T2, typename T3, typename T4>
-    T& emplace(const T1& value1, const T2& value2, const T3& value3, const T4& value4)
-    {
-      if (has_value())
-      {
-        // Destroy the old one.
-        storage.destroy();
-      }
-
-      T* p = ::new (&storage.u.value) T(value1, value2, value3, value4);
-      storage.valid = true;
-
-      return *p;
-    }
-#endif
-
-  private:
-
-    struct dummy_t {};
-
-    template <typename TValue, bool IsPod = etl::is_pod<TValue>::value>
-    struct storage_type;
-
-    //*************************************
-    // Non-POD
-    //*************************************
-    template <typename TValue>
-    struct storage_type<TValue, false>
-    {
-      //*******************************
-      ETL_CONSTEXPR20_STL
-      storage_type()
-        : u()
-        , valid(false)
-      {
-      }
-
-      //*******************************
-      ETL_CONSTEXPR20_STL
-      ~storage_type()
-      {
-        destroy();
-      }
-
-      //*******************************
-      ETL_CONSTEXPR20_STL
-      void construct(const TValue& value_)
-      {
-        if (valid)
-        {
-          etl::destroy_at(&u.value);
-        }
-
-        etl::construct_at(&u.value, value_);
-        valid = true;
-      }
-
-#if ETL_USING_CPP11
-      //*******************************
-      ETL_CONSTEXPR20_STL
-      void construct(TValue&& value_)
-      {
-        if (valid)
-        {
-          etl::destroy_at(&u.value);
-        }
-
-        etl::construct_at(&u.value, etl::move(value_));
-        valid = true;
-      }
-
-      //*******************************
-      template <typename... TArgs>
-      ETL_CONSTEXPR20_STL
-      void construct(TArgs&&... args)
-      {
-        if (valid)
-        {
-          etl::destroy_at(&u.value);
-        }
-
-        etl::construct_at(&u.value, etl::forward<TArgs>(args)...);
-        valid = true;
-      }
-#endif
-
-      //*******************************
-      ETL_CONSTEXPR20_STL
-      void destroy()
-      {
-        if (valid)
-        {
-          etl::destroy_at(&u.value);
-          valid = false;
-        }
-      }
-
-      //*******************************
-      union union_type
-      {
-        ETL_CONSTEXPR20_STL
-        union_type()
-          : dummy()
-        {
-        }
-
-        ETL_CONSTEXPR20_STL
-        ~union_type()
-        {
-        }
-
-        dummy_t dummy;
-        TValue  value;
-      } u;
-
-      bool valid;
-    };
-
-    //*************************************
-    // POD
-    //*************************************
-    template <typename TValue>
-    struct storage_type<TValue, true>
-    {
-      //*******************************
-      ETL_CONSTEXPR20_STL
-      storage_type()
-        : valid(false)
-      {
-      }
-
-      //*******************************
-      ETL_CONSTEXPR20_STL
-      ~storage_type()
-      {
-      }
-
-      //*******************************
-      ETL_CONSTEXPR20_STL
-      void construct(const TValue& value_)
-      {
-        u.value = value_;
-        valid   = true;
-      }
-
-#if ETL_USING_CPP11
-      //*******************************
-      ETL_CONSTEXPR20_STL
-      void construct(TValue&& value_)
-      {
-        u.value = value_;
-        valid   = true;
-      }
-
-      //*******************************
-      template <typename... TArgs>
-      ETL_CONSTEXPR20_STL
-      void construct(TArgs&&... args)
-      {
-        u.value = TValue(etl::forward<TArgs>(args)...);
-        valid   = true;
-      }
-#endif
-
-      //*******************************
-      ETL_CONSTEXPR20_STL
-      void destroy()
-      {
-        valid = false;
-      }
-
-      //*******************************
-      union union_type
-      {
-        ETL_CONSTEXPR20_STL
-        union_type()
-          : dummy()
-        {
-        }
-
-        ETL_CONSTEXPR20_STL
-        ~union_type()
-        {
-        }
-
-        dummy_t dummy;
-        TValue  value;
-      } u;
-
-      bool valid;
-    };
-
-    storage_type<T> storage;
   };
 
 #include "private/diagnostic_uninitialized_push.h"
@@ -763,7 +1574,7 @@ namespace etl
   /// Equality operator. cppreference 1
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator ==(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator ==(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
   {
     if (lhs.has_value() != rhs.has_value())
     {
@@ -780,10 +1591,39 @@ namespace etl
   }
 
   //***************************************************************************
-  /// Equality operator. cppreference 2
+  /// Equality operator. cppreference 1
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator !=(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator ==(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  {
+    if (lhs.has_value() != rhs.has_value())
+    {
+      return false;
+    }
+    else if (!lhs.has_value() && !rhs.has_value())
+    {
+      return true;
+    }
+    else
+    {
+      return lhs.value() == rhs.value();
+    }
+  }
+
+  //***************************************************************************
+  /// Inequality operator. cppreference 2
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator !=(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  {
+    return !(lhs == rhs);
+  }
+
+  //***************************************************************************
+  /// Inequality operator. cppreference 2
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator !=(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
   {
     return !(lhs == rhs);
   }
@@ -792,7 +1632,27 @@ namespace etl
   /// Less than operator. cppreference 3
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator <(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator <(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  {
+    if (!rhs.has_value())
+    {
+      return false;
+    }
+    else if (!lhs.has_value())
+    {
+      return true;
+    }
+    else
+    {
+      return lhs.value() < rhs.value();
+    }
+  }
+
+  //***************************************************************************
+  /// Less than operator. cppreference 3
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator <(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
   {
     if (!rhs.has_value())
     {
@@ -812,7 +1672,16 @@ namespace etl
   /// Less than equal operator. cppreference 4
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator <=(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator <=(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  {
+    return !(rhs < lhs);
+  }
+
+  //***************************************************************************
+  /// Less than equal operator. cppreference 4
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator <=(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
   {
     return !(rhs < lhs);
   }
@@ -821,7 +1690,16 @@ namespace etl
   /// greater than operator. cppreference 5
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator >(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator >(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  {
+    return (rhs < lhs);
+  }
+
+  //***************************************************************************
+  /// greater than operator. cppreference 5
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator >(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
   {
     return (rhs < lhs);
   }
@@ -830,7 +1708,16 @@ namespace etl
   /// greater than equal operator. cppreference 6
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator >=(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator >=(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
+  {
+    return !(lhs < rhs);
+  }
+
+  //***************************************************************************
+  /// greater than equal operator. cppreference 6
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator >=(const etl::optional<T>& lhs, const etl::optional<T>& rhs)
   {
     return !(lhs < rhs);
   }
@@ -839,7 +1726,16 @@ namespace etl
   /// Equality operator. cppreference 7
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator ==(const etl::optional<T>& lhs, etl::nullopt_t)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator ==(const etl::optional<T>& lhs, etl::nullopt_t)
+  {
+    return !lhs.has_value();
+  }
+
+  //***************************************************************************
+  /// Equality operator. cppreference 7
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator ==(const etl::optional<T>& lhs, etl::nullopt_t)
   {
     return !lhs.has_value();
   }
@@ -848,7 +1744,16 @@ namespace etl
   /// Equality operator. cppreference 8
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator ==(etl::nullopt_t, const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator ==(etl::nullopt_t, const etl::optional<T>& rhs)
+  {
+    return !rhs.has_value();
+  }
+
+  //***************************************************************************
+  /// Equality operator. cppreference 8
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator ==(etl::nullopt_t, const etl::optional<T>& rhs)
   {
     return !rhs.has_value();
   }
@@ -857,7 +1762,16 @@ namespace etl
   /// Inequality operator. cppreference 9
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator !=(const etl::optional<T>& lhs, etl::nullopt_t)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator !=(const etl::optional<T>& lhs, etl::nullopt_t)
+  {
+    return !(lhs == etl::nullopt);
+  }
+
+  //***************************************************************************
+  /// Inequality operator. cppreference 9
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator !=(const etl::optional<T>& lhs, etl::nullopt_t)
   {
     return !(lhs == etl::nullopt);
   }
@@ -866,7 +1780,16 @@ namespace etl
   /// Inequality operator. cppreference 10
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator !=(etl::nullopt_t , const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator !=(etl::nullopt_t , const etl::optional<T>& rhs)
+  {
+    return !(etl::nullopt == rhs);
+  }
+
+  //***************************************************************************
+  /// Inequality operator. cppreference 10
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator !=(etl::nullopt_t, const etl::optional<T>& rhs)
   {
     return !(etl::nullopt == rhs);
   }
@@ -875,7 +1798,16 @@ namespace etl
   /// Less than operator. cppreference 11
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator <(const etl::optional<T>&, etl::nullopt_t)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator <(const etl::optional<T>&, etl::nullopt_t)
+  {
+    return false;
+  }
+
+  //***************************************************************************
+  /// Less than operator. cppreference 11
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator <(const etl::optional<T>&, etl::nullopt_t)
   {
     return false;
   }
@@ -884,7 +1816,16 @@ namespace etl
   /// Less than operator. cppreference 12
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator <(etl::nullopt_t, const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator <(etl::nullopt_t, const etl::optional<T>& rhs)
+  {
+    return rhs.has_value();
+  }
+
+  //***************************************************************************
+  /// Less than operator. cppreference 12
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator <(etl::nullopt_t, const etl::optional<T>& rhs)
   {
     return rhs.has_value();
   }
@@ -893,7 +1834,16 @@ namespace etl
   /// Less than equal operator. cppreference 13
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator <=(const etl::optional<T>& lhs, etl::nullopt_t)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator <=(const etl::optional<T>& lhs, etl::nullopt_t)
+  {
+    return !lhs.has_value();
+  }
+
+  //***************************************************************************
+  /// Less than equal operator. cppreference 13
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator <=(const etl::optional<T>& lhs, etl::nullopt_t)
   {
     return !lhs.has_value();
   }
@@ -902,7 +1852,16 @@ namespace etl
   /// Less than equal operator. cppreference 14
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator <=(etl::nullopt_t, const etl::optional<T>&)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator <=(etl::nullopt_t, const etl::optional<T>&)
+  {
+    return true;
+  }
+
+  //***************************************************************************
+  /// Less than equal operator. cppreference 14
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator <=(etl::nullopt_t, const etl::optional<T>&)
   {
     return true;
   }
@@ -911,7 +1870,16 @@ namespace etl
   /// Greater than operator. cppreference 15
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator >(const etl::optional<T>& lhs, etl::nullopt_t)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator >(const etl::optional<T>& lhs, etl::nullopt_t)
+  {
+    return lhs.has_value();
+  }
+
+  //***************************************************************************
+  /// Greater than operator. cppreference 15
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator >(const etl::optional<T>& lhs, etl::nullopt_t)
   {
     return lhs.has_value();
   }
@@ -920,7 +1888,16 @@ namespace etl
   /// Greater than operator. cppreference 16
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator >(etl::nullopt_t, const etl::optional<T>&)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator >(etl::nullopt_t, const etl::optional<T>&)
+  {
+    return false;
+  }
+
+  //***************************************************************************
+  /// Greater than operator. cppreference 16
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator >(etl::nullopt_t, const etl::optional<T>&)
   {
     return false;
   }
@@ -929,7 +1906,16 @@ namespace etl
   /// Greater than equal operator. cppreference 17
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator >=(const etl::optional<T>&, etl::nullopt_t)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator >=(const etl::optional<T>&, etl::nullopt_t)
+  {
+    return true;
+  }
+
+  //***************************************************************************
+  /// Greater than equal operator. cppreference 17
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator >=(const etl::optional<T>&, etl::nullopt_t)
   {
     return true;
   }
@@ -938,7 +1924,16 @@ namespace etl
   /// Greater than equal operator. cppreference 18
   //***************************************************************************
   template <typename T>
-  ETL_CONSTEXPR20_STL bool operator >=(etl::nullopt_t, const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator >=(etl::nullopt_t, const etl::optional<T>& rhs)
+  {
+    return !rhs.has_value();
+  }
+
+  //***************************************************************************
+  /// Greater than equal operator. cppreference 18
+  //***************************************************************************
+  template <typename T>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator >=(etl::nullopt_t, const etl::optional<T>& rhs)
   {
     return !rhs.has_value();
   }
@@ -947,7 +1942,16 @@ namespace etl
   /// Equality operator. cppreference 19
   //**************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR20_STL bool operator ==(const etl::optional<T>& lhs, const U& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator ==(const etl::optional<T>& lhs, const U& rhs)
+  {
+    return lhs.has_value() ? lhs.value() == rhs : false;
+  }
+
+  //***************************************************************************
+  /// Equality operator. cppreference 19
+  //**************************************************************************
+  template <typename T, typename U>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator ==(const etl::optional<T>& lhs, const U& rhs)
   {
     return lhs.has_value() ? lhs.value() == rhs : false;
   }
@@ -956,7 +1960,16 @@ namespace etl
   /// Inequality operator. cppreference 21
   //**************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR20_STL bool operator !=(const etl::optional<T>& lhs, const U& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator !=(const etl::optional<T>& lhs, const U& rhs)
+  {
+    return !(lhs == rhs);
+  }
+
+  //***************************************************************************
+  /// Inequality operator. cppreference 21
+  //**************************************************************************
+  template <typename T, typename U>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator !=(const etl::optional<T>& lhs, const U& rhs)
   {
     return !(lhs == rhs);
   }
@@ -965,7 +1978,16 @@ namespace etl
   /// Equality operator. cppreference 20
   //**************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR20_STL bool operator ==(const U& lhs, const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator ==(const U& lhs, const etl::optional<T>& rhs)
+  {
+    return rhs.has_value() ? rhs.value() == lhs : false;
+  }
+
+  //***************************************************************************
+  /// Equality operator. cppreference 20
+  //**************************************************************************
+  template <typename T, typename U>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator ==(const U& lhs, const etl::optional<T>& rhs)
   {
     return rhs.has_value() ? rhs.value() == lhs : false;
   }
@@ -974,7 +1996,16 @@ namespace etl
   /// Inequality operator. cppreference 22
   //**************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR20_STL bool operator !=(const U& lhs, const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator !=(const U& lhs, const etl::optional<T>& rhs)
+  {
+    return !(lhs == rhs);
+  }
+
+  //***************************************************************************
+  /// Inequality operator. cppreference 22
+  //**************************************************************************
+  template <typename T, typename U>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator !=(const U& lhs, const etl::optional<T>& rhs)
   {
     return !(lhs == rhs);
   }
@@ -983,7 +2014,16 @@ namespace etl
   /// Less than operator. cppreference 23
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR20_STL bool operator <(const etl::optional<T>& lhs, const U& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator <(const etl::optional<T>& lhs, const U& rhs)
+  {
+    return lhs.has_value() ? lhs.value() < rhs : true;
+  }
+
+  //***************************************************************************
+  /// Less than operator. cppreference 23
+  //***************************************************************************
+  template <typename T, typename U>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator <(const etl::optional<T>& lhs, const U& rhs)
   {
     return lhs.has_value() ? lhs.value() < rhs : true;
   }
@@ -992,7 +2032,16 @@ namespace etl
   /// Less than operator. cppreference 24
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR20_STL bool operator <(const U& lhs, const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator <(const U& lhs, const etl::optional<T>& rhs)
+  {
+    return rhs.has_value() ? lhs < rhs.value() : false;
+  }
+
+  //***************************************************************************
+  /// Less than operator. cppreference 24
+  //***************************************************************************
+  template <typename T, typename U>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator <(const U& lhs, const etl::optional<T>& rhs)
   {
     return rhs.has_value() ? lhs < rhs.value() : false;
   }
@@ -1001,7 +2050,16 @@ namespace etl
   /// Less than equal operator. cppreference 25
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR20_STL bool operator <=(const etl::optional<T>& lhs, const U& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator <=(const etl::optional<T>& lhs, const U& rhs)
+  {
+    return lhs.has_value() ? lhs.value() <= rhs : true;
+  }
+
+  //***************************************************************************
+  /// Less than equal operator. cppreference 25
+  //***************************************************************************
+  template <typename T, typename U>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator <=(const etl::optional<T>& lhs, const U& rhs)
   {
     return lhs.has_value() ? lhs.value() <= rhs : true;
   }
@@ -1010,7 +2068,16 @@ namespace etl
   /// Less than equal operator. cppreference 26
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR20_STL bool operator <=(const U& lhs, const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator <=(const U& lhs, const etl::optional<T>& rhs)
+  {
+    return rhs.has_value() ? lhs <= rhs.value() : false;
+  }
+
+  //***************************************************************************
+  /// Less than equal operator. cppreference 26
+  //***************************************************************************
+  template <typename T, typename U>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator <=(const U& lhs, const etl::optional<T>& rhs)
   {
     return rhs.has_value() ? lhs <= rhs.value() : false;
   }
@@ -1019,7 +2086,16 @@ namespace etl
   /// Greater than operator. cppreference 27
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR20_STL bool operator >(const etl::optional<T>& lhs, const U& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator >(const etl::optional<T>& lhs, const U& rhs)
+  {
+    return lhs.has_value() ? lhs.value() > rhs  : false;
+  }
+
+  //***************************************************************************
+  /// Greater than operator. cppreference 27
+  //***************************************************************************
+  template <typename T, typename U>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator >(const etl::optional<T>& lhs, const U& rhs)
   {
     return lhs.has_value() ? lhs.value() > rhs  : false;
   }
@@ -1028,7 +2104,16 @@ namespace etl
   /// Greater than operator. cppreference 28
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR20_STL bool operator >(const U& lhs, const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator >(const U& lhs, const etl::optional<T>& rhs)
+  {
+    return rhs.has_value() ? lhs > rhs.value() : true;
+  }
+
+  //***************************************************************************
+  /// Greater than operator. cppreference 28
+  //***************************************************************************
+  template <typename T, typename U>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator >(const U& lhs, const etl::optional<T>& rhs)
   {
     return rhs.has_value() ? lhs > rhs.value() : true;
   }
@@ -1037,7 +2122,16 @@ namespace etl
   /// Greater than equal operator. cppreference 29
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR20_STL bool operator >=(const etl::optional<T>& lhs, const U& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator >=(const etl::optional<T>& lhs, const U& rhs)
+  {
+    return lhs.has_value() ? lhs.value() >= rhs : false;
+  }
+
+  //***************************************************************************
+  /// Greater than equal operator. cppreference 29
+  //***************************************************************************
+  template <typename T, typename U>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator >=(const etl::optional<T>& lhs, const U& rhs)
   {
     return lhs.has_value() ? lhs.value() >= rhs : false;
   }
@@ -1046,7 +2140,16 @@ namespace etl
   /// Greater than equal operator. cppreference 30
   //***************************************************************************
   template <typename T, typename U>
-  ETL_CONSTEXPR20_STL bool operator >=(const U& lhs, const etl::optional<T>& rhs)
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP14 operator >=(const U& lhs, const etl::optional<T>& rhs)
+  {
+    return rhs.has_value() ? lhs >= rhs.value() : true;
+  }
+
+  //***************************************************************************
+  /// Greater than equal operator. cppreference 30
+  //***************************************************************************
+  template <typename T, typename U>
+  ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL operator >=(const U& lhs, const etl::optional<T>& rhs)
   {
     return rhs.has_value() ? lhs >= rhs.value() : true;
   }
@@ -1080,4 +2183,10 @@ ETL_CONSTEXPR20_STL void swap(etl::optional<T>& lhs, etl::optional<T>& rhs)
   lhs.swap(rhs);
 }
 
+#undef ETL_OPTIONAL_ENABLE_CPP14
+#undef ETL_OPTIONAL_ENABLE_CPP20_STL
+
+#undef ETL_OPTIONAL_ENABLE_CONSTEXPR_BOOL_RETURN_CPP20_STL
+#undef ETL_OPTIONAL_ENABLE_COMSTEXPR_BOOL_RETURN_CPP20_STL
+
 #endif
diff --git a/test/test_optional.cpp b/test/test_optional.cpp
index a6bbc650..f9ffdba7 100644
--- a/test/test_optional.cpp
+++ b/test/test_optional.cpp
@@ -53,6 +53,41 @@ std::ostream& operator << (std::ostream& os, const etl::optional<Data>& data)
 
 namespace
 {
+  //*************************************************************************
+  struct NonTrivial
+  {
+    constexpr NonTrivial() : a(0) {}
+
+    constexpr NonTrivial(int a_) : a(a_) {}
+
+    constexpr friend bool operator <(const NonTrivial& lhs, const NonTrivial& rhs)
+    {
+      return lhs.a < rhs.a;
+    }
+
+    constexpr friend bool operator <=(const NonTrivial& lhs, const NonTrivial& rhs)
+    {
+      return lhs.a <= rhs.a;
+    }
+
+    constexpr friend bool operator >(const NonTrivial& lhs, const NonTrivial& rhs)
+    {
+      return lhs.a > rhs.a;
+    }
+
+    constexpr friend bool operator >=(const NonTrivial& lhs, const NonTrivial& rhs)
+    {
+      return lhs.a >= rhs.a;
+    }
+
+    constexpr friend bool operator ==(const NonTrivial& lhs, const NonTrivial& rhs)
+    {
+      return lhs.a == rhs.a;
+    }
+
+    int a;
+  };
+
   SUITE(test_optional)
   {
     //*************************************************************************
@@ -153,10 +188,19 @@ namespace
 #include "etl/private/diagnostic_pop.h"
     }
 
+    //*************************************************************************
+    TEST(test_nullopt_pod)
+    {
+      etl::optional<int> data(etl::nullopt);
+      data = 1;
+      data = etl::nullopt;
+      CHECK(!bool(data));
+    }
+
     //*************************************************************************
     TEST(test_nullopt)
     {
-      etl::optional<Data> data;
+      etl::optional<Data> data(etl::nullopt);
       data = Data("Hello");
       data = etl::nullopt;
       CHECK(!bool(data));
@@ -239,6 +283,40 @@ namespace
       CHECK(!(Data("Data2") == data1));
     }
 
+#if ETL_USING_CPP20 && ETL_USING_STL
+    //*************************************************************************
+    TEST(test_constexpr_equality_non_trivial)
+    {
+      constexpr etl::optional<NonTrivial> data1(1);
+      constexpr etl::optional<NonTrivial> data2(2);
+
+      constexpr bool eq1 = (data1 == data2);
+      constexpr bool eq2 = (data1 == etl::nullopt);
+      constexpr bool eq3 = (etl::nullopt == data1);
+
+      CHECK(eq1);
+      CHECK(eq2);
+      CHECK(eq3);
+    }
+#endif
+
+#if ETL_USING_CPP14
+    //*************************************************************************
+    TEST(test_constexpr_equality_trivial)
+    {
+      constexpr etl::optional<int> data1(1);
+      constexpr etl::optional<int> data2(2);
+
+      constexpr bool eq1 = (data1 == data2);
+      constexpr bool eq2 = (data1 == etl::nullopt);
+      constexpr bool eq3 = (etl::nullopt == data1);
+
+      CHECK(eq1);
+      CHECK(eq2);
+      CHECK(eq3);
+    }
+#endif
+
     //*************************************************************************
     TEST(test_inequality)
     {
@@ -276,6 +354,40 @@ namespace
       CHECK(Data("Data2") != data1);
     }
 
+#if ETL_USING_CPP20 && ETL_USING_STL
+    //*************************************************************************
+    TEST(test_constexpr_inequality_non_trivial)
+    {
+      constexpr etl::optional<NonTrivial> data1(1);
+      constexpr etl::optional<NonTrivial> data2(2);
+
+      constexpr bool eq1 = (data1 == data2);
+      constexpr bool eq2 = (data1 == etl::nullopt);
+      constexpr bool eq3 = (etl::nullopt == data1);
+
+      CHECK(eq1);
+      CHECK(eq2);
+      CHECK(eq3);
+    }
+#endif
+
+#if ETL_USING_CPP14
+    //*************************************************************************
+    TEST(test_constexpr_inequality_trivial)
+    {
+      constexpr etl::optional<int> data1(1);
+      constexpr etl::optional<int> data2(2);
+
+      constexpr bool neq1 = (data1 != data2);
+      constexpr bool neq2 = (data1 != etl::nullopt);
+      constexpr bool neq3 = (etl::nullopt != data1);
+
+      CHECK(neq1);
+      CHECK(neq2);
+      CHECK(neq3);
+    }
+#endif
+
     //*************************************************************************
 #include "etl/private/diagnostic_uninitialized_push.h"
     TEST(test_less_than)
@@ -310,6 +422,41 @@ namespace
     }
 #include "etl/private/diagnostic_pop.h"
 
+
+#if ETL_USING_CPP20 && ETL_USING_STL
+    //*************************************************************************
+    TEST(test_constexpr_less_than_non_trivial)
+    {
+      constexpr etl::optional<NonTrivial> data1(1);
+      constexpr etl::optional<NonTrivial> data2(2);
+
+      constexpr bool lt1 = (data1 < data2);
+      constexpr bool lt2 = (data1 < etl::nullopt);
+      constexpr bool lt3 = (etl::nullopt < data1);
+
+      CHECK(lt1);
+      CHECK(lt2);
+      CHECK(lt3);
+    }
+#endif
+
+#if ETL_USING_CPP14
+    //*************************************************************************
+    TEST(test_constexpr_less_than_trivial)
+    {
+      constexpr etl::optional<int> data1(1);
+      constexpr etl::optional<int> data2(2);
+
+      constexpr bool lt1 = (data1 < data2);
+      constexpr bool lt2 = (data1 < etl::nullopt);
+      constexpr bool lt3 = (etl::nullopt < data1);
+
+      CHECK(lt1);
+      CHECK(lt2);
+      CHECK(lt3);
+    }
+#endif
+
     //*************************************************************************
     TEST(test_less_than_equal)
     {
@@ -344,6 +491,40 @@ namespace
       CHECK(Data("Data1") <= data1);
     }
 
+#if ETL_USING_CPP20 && ETL_USING_STL
+    //*************************************************************************
+    TEST(test_constexpr_less_than_equal_non_trivial)
+    {
+      constexpr etl::optional<NonTrivial> data1(1);
+      constexpr etl::optional<NonTrivial> data2(2);
+
+      constexpr bool lteq1 = (data1 <= data2);
+      constexpr bool lteq2 = (data1 <= etl::nullopt);
+      constexpr bool lteq3 = (etl::nullopt <= data1);
+
+      CHECK(lteq1);
+      CHECK(lteq2);
+      CHECK(lteq3);
+    }
+#endif
+
+#if ETL_USING_CPP14
+    //*************************************************************************
+    TEST(test_constexpr_less_than_equal_trivial)
+    {
+      constexpr etl::optional<int> data1(1);
+      constexpr etl::optional<int> data2(2);
+
+      constexpr bool lteq1 = (data1 <= data2);
+      constexpr bool lteq2 = (data1 <= etl::nullopt);
+      constexpr bool lteq3 = (etl::nullopt <= data1);
+
+      CHECK(lteq1);
+      CHECK(lteq2);
+      CHECK(lteq3);
+    }
+#endif
+
     //*************************************************************************
     TEST(test_greater_than)
     {
@@ -376,6 +557,40 @@ namespace
       CHECK(!(Data("Data1") > data2));
     }
 
+#if ETL_USING_CPP20 && ETL_USING_STL
+    //*************************************************************************
+    TEST(test_constexpr_greater_than_non_trivial)
+    {
+      constexpr etl::optional<NonTrivial> data1(1);
+      constexpr etl::optional<NonTrivial> data2(2);
+
+      constexpr bool gteq1 = (data1 > data2);
+      constexpr bool gteq2 = (data1 > etl::nullopt);
+      constexpr bool gteq3 = (etl::nullopt > data1);
+
+      CHECK(gteq1);
+      CHECK(gteq2);
+      CHECK(gteq3);
+    }
+#endif
+
+#if ETL_USING_CPP14
+    //*************************************************************************
+    TEST(test_constexpr_greater_than_trivial)
+    {
+      constexpr etl::optional<int> data1(1);
+      constexpr etl::optional<int> data2(2);
+
+      constexpr bool gteq1 = (data1 > data2);
+      constexpr bool gteq2 = (data1 > etl::nullopt);
+      constexpr bool gteq3 = (etl::nullopt > data1);
+
+      CHECK(gteq1);
+      CHECK(gteq2);
+      CHECK(gteq3);
+    }
+#endif
+
     //*************************************************************************
     TEST(test_greater_than_equal)
     {
@@ -410,6 +625,40 @@ namespace
       CHECK(Data("Data1") >= data1);
     }
 
+#if ETL_USING_CPP20 && ETL_USING_STL
+    //*************************************************************************
+    TEST(test_constexpr_greater_than_equal_non_trivial)
+    {
+      constexpr etl::optional<NonTrivial> data1(1);
+      constexpr etl::optional<NonTrivial> data2(2);
+
+      constexpr bool gteq1 = (data1 >= data2);
+      constexpr bool gteq2 = (data1 >= etl::nullopt);
+      constexpr bool gteq3 = (etl::nullopt >= data1);
+
+      CHECK(gteq1);
+      CHECK(gteq2);
+      CHECK(gteq3);
+    }
+#endif
+
+#if ETL_USING_CPP14
+    //*************************************************************************
+    TEST(test_constexpr_greater_than_equal_trivial)
+    {
+      constexpr etl::optional<int> data1(1);
+      constexpr etl::optional<int> data2(2);
+
+      constexpr bool gteq1 = (data1 >= data2);
+      constexpr bool gteq2 = (data1 >= etl::nullopt);
+      constexpr bool gteq3 = (etl::nullopt >= data1);
+
+      CHECK(gteq1);
+      CHECK(gteq2);
+      CHECK(gteq3);
+    }
+#endif
+
     //*************************************************************************
     TEST(test_container_of_optional)
     {

From ea74d2f02f32452c059109fbbab56953fbf2f3e4 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Thu, 15 Feb 2024 10:50:45 +0000
Subject: [PATCH 050/131] etl::optional C++ compatibility updates

---
 include/etl/optional.h          |  22 ++---
 test/test_optional.cpp          | 155 ++++++++++++++++----------------
 test/vs2022/etl.vcxproj.filters |  30 +++++--
 3 files changed, 114 insertions(+), 93 deletions(-)

diff --git a/include/etl/optional.h b/include/etl/optional.h
index 7b55695f..c9901e13 100644
--- a/include/etl/optional.h
+++ b/include/etl/optional.h
@@ -138,7 +138,7 @@ namespace etl
       /// Copy constructor.
       //***************************************************************************
       ETL_CONSTEXPR20_STL
-      optional_impl(const optional_impl& other)
+      optional_impl(const optional_impl<T>& other)
       {
         if (other.has_value())
         {
@@ -152,7 +152,7 @@ namespace etl
       /// Move constructor.
       //***************************************************************************
       ETL_CONSTEXPR20_STL
-      optional_impl(optional_impl&& other)
+      optional_impl(optional_impl<T>&& other)
       {
         if (other.has_value())
         {
@@ -208,7 +208,7 @@ namespace etl
       /// Assignment operator from optional_impl.
       //***************************************************************************
       ETL_CONSTEXPR20_STL
-      optional_impl& operator =(const optional_impl& other)
+      optional_impl& operator =(const optional_impl<T>& other)
       {
         if (this != &other)
         {
@@ -711,7 +711,7 @@ namespace etl
       /// Copy constructor.
       //***************************************************************************
       ETL_CONSTEXPR14
-      optional_impl(const optional_impl& other)
+      optional_impl(const optional_impl<T>& other)
       {
         if (other.has_value())
         {
@@ -772,7 +772,7 @@ namespace etl
       /// Assignment operator from optional_impl.
       //***************************************************************************
       ETL_CONSTEXPR14
-      optional_impl& operator =(const optional_impl& other)
+      optional_impl& operator =(const optional_impl<T>& other)
       {
         if (this != &other)
         {
@@ -1277,7 +1277,7 @@ namespace etl
     template <typename U = T, ETL_OPTIONAL_ENABLE_CPP14>
     ETL_CONSTEXPR14
     optional(etl::nullopt_t)
-      : impl_t(etl::nullopt_t{})
+      : impl_t(etl::nullopt)
     {
     }
 
@@ -1287,7 +1287,7 @@ namespace etl
     template <typename U = T, ETL_OPTIONAL_ENABLE_CPP20_STL>
     ETL_CONSTEXPR20_STL
     optional(etl::nullopt_t)
-      : impl_t(etl::nullopt_t{})
+      : impl_t(etl::nullopt)
     {
     }
 #else
@@ -1295,7 +1295,7 @@ namespace etl
     /// Constructor with nullopt.
     //***************************************************************************
     optional(etl::nullopt_t)
-      : impl_t(etl::nullopt_t{})
+      : impl_t(etl::nullopt)
     {
     }
 #endif
@@ -1415,7 +1415,7 @@ namespace etl
     ETL_CONSTEXPR14
     optional& operator =(etl::nullopt_t)
     {
-      impl_t::operator=(etl::nullopt_t{});
+      impl_t::operator=(etl::nullopt);
 
       return *this;
     }
@@ -1427,7 +1427,7 @@ namespace etl
     ETL_CONSTEXPR20_STL
     optional& operator =(etl::nullopt_t)
     {
-      impl_t::operator=(etl::nullopt_t{});
+      impl_t::operator=(etl::nullopt);
 
       return *this;
     }
@@ -1437,7 +1437,7 @@ namespace etl
     //***************************************************************************
     optional& operator =(etl::nullopt_t)
     {
-      impl_t::operator=(etl::nullopt_t{});
+      impl_t::operator=(etl::nullopt);
 
       return *this;
     }
diff --git a/test/test_optional.cpp b/test/test_optional.cpp
index f9ffdba7..61e68672 100644
--- a/test/test_optional.cpp
+++ b/test/test_optional.cpp
@@ -53,6 +53,7 @@ std::ostream& operator << (std::ostream& os, const etl::optional<Data>& data)
 
 namespace
 {
+#include "etl/private/diagnostic_unused_function_push.h"
   //*************************************************************************
   struct NonTrivial
   {
@@ -65,21 +66,6 @@ namespace
       return lhs.a < rhs.a;
     }
 
-    constexpr friend bool operator <=(const NonTrivial& lhs, const NonTrivial& rhs)
-    {
-      return lhs.a <= rhs.a;
-    }
-
-    constexpr friend bool operator >(const NonTrivial& lhs, const NonTrivial& rhs)
-    {
-      return lhs.a > rhs.a;
-    }
-
-    constexpr friend bool operator >=(const NonTrivial& lhs, const NonTrivial& rhs)
-    {
-      return lhs.a >= rhs.a;
-    }
-
     constexpr friend bool operator ==(const NonTrivial& lhs, const NonTrivial& rhs)
     {
       return lhs.a == rhs.a;
@@ -87,6 +73,7 @@ namespace
 
     int a;
   };
+#include "etl/private/diagnostic_pop.h"
 
   SUITE(test_optional)
   {
@@ -294,9 +281,9 @@ namespace
       constexpr bool eq2 = (data1 == etl::nullopt);
       constexpr bool eq3 = (etl::nullopt == data1);
 
-      CHECK(eq1);
-      CHECK(eq2);
-      CHECK(eq3);
+      CHECK_FALSE(eq1);
+      CHECK_FALSE(eq2);
+      CHECK_FALSE(eq3);
     }
 #endif
 
@@ -311,9 +298,9 @@ namespace
       constexpr bool eq2 = (data1 == etl::nullopt);
       constexpr bool eq3 = (etl::nullopt == data1);
 
-      CHECK(eq1);
-      CHECK(eq2);
-      CHECK(eq3);
+      CHECK_FALSE(eq1);
+      CHECK_FALSE(eq2);
+      CHECK_FALSE(eq3);
     }
 #endif
 
@@ -361,13 +348,13 @@ namespace
       constexpr etl::optional<NonTrivial> data1(1);
       constexpr etl::optional<NonTrivial> data2(2);
 
-      constexpr bool eq1 = (data1 == data2);
-      constexpr bool eq2 = (data1 == etl::nullopt);
-      constexpr bool eq3 = (etl::nullopt == data1);
+      constexpr bool eq1 = (data1 != data2);
+      constexpr bool eq2 = (data1 != etl::nullopt);
+      constexpr bool eq3 = (etl::nullopt != data1);
 
-      CHECK(eq1);
-      CHECK(eq2);
-      CHECK(eq3);
+      CHECK_TRUE(eq1);
+      CHECK_TRUE(eq2);
+      CHECK_TRUE(eq3);
     }
 #endif
 
@@ -382,9 +369,9 @@ namespace
       constexpr bool neq2 = (data1 != etl::nullopt);
       constexpr bool neq3 = (etl::nullopt != data1);
 
-      CHECK(neq1);
-      CHECK(neq2);
-      CHECK(neq3);
+      CHECK_TRUE(neq1);
+      CHECK_TRUE(neq2);
+      CHECK_TRUE(neq3);
     }
 #endif
 
@@ -431,12 +418,14 @@ namespace
       constexpr etl::optional<NonTrivial> data2(2);
 
       constexpr bool lt1 = (data1 < data2);
-      constexpr bool lt2 = (data1 < etl::nullopt);
-      constexpr bool lt3 = (etl::nullopt < data1);
+      constexpr bool lt2 = (data2 < data1);
+      constexpr bool lt3 = (data1 < etl::nullopt);
+      constexpr bool lt4 = (etl::nullopt < data1);
 
-      CHECK(lt1);
-      CHECK(lt2);
-      CHECK(lt3);
+      CHECK_TRUE(lt1);
+      CHECK_FALSE(lt2);
+      CHECK_FALSE(lt3);
+      CHECK_TRUE(lt4);
     }
 #endif
 
@@ -448,12 +437,14 @@ namespace
       constexpr etl::optional<int> data2(2);
 
       constexpr bool lt1 = (data1 < data2);
-      constexpr bool lt2 = (data1 < etl::nullopt);
-      constexpr bool lt3 = (etl::nullopt < data1);
+      constexpr bool lt2 = (data2 < data1);
+      constexpr bool lt3 = (data1 < etl::nullopt);
+      constexpr bool lt4 = (etl::nullopt < data1);
 
-      CHECK(lt1);
-      CHECK(lt2);
-      CHECK(lt3);
+      CHECK_TRUE(lt1);
+      CHECK_FALSE(lt2);
+      CHECK_FALSE(lt3);
+      CHECK_TRUE(lt4);
     }
 #endif
 
@@ -498,13 +489,15 @@ namespace
       constexpr etl::optional<NonTrivial> data1(1);
       constexpr etl::optional<NonTrivial> data2(2);
 
-      constexpr bool lteq1 = (data1 <= data2);
-      constexpr bool lteq2 = (data1 <= etl::nullopt);
-      constexpr bool lteq3 = (etl::nullopt <= data1);
+      constexpr bool lt1 = (data1 <= data2);
+      constexpr bool lt2 = (data2 <= data1);
+      constexpr bool lt3 = (data1 <= etl::nullopt);
+      constexpr bool lt4 = (etl::nullopt <= data1);
 
-      CHECK(lteq1);
-      CHECK(lteq2);
-      CHECK(lteq3);
+      CHECK_TRUE(lt1);
+      CHECK_FALSE(lt2);
+      CHECK_FALSE(lt3);
+      CHECK_TRUE(lt4);
     }
 #endif
 
@@ -515,13 +508,15 @@ namespace
       constexpr etl::optional<int> data1(1);
       constexpr etl::optional<int> data2(2);
 
-      constexpr bool lteq1 = (data1 <= data2);
-      constexpr bool lteq2 = (data1 <= etl::nullopt);
-      constexpr bool lteq3 = (etl::nullopt <= data1);
+      constexpr bool lt1 = (data1 <= data2);
+      constexpr bool lt2 = (data2 <= data1);
+      constexpr bool lt3 = (data1 <= etl::nullopt);
+      constexpr bool lt4 = (etl::nullopt <= data1);
 
-      CHECK(lteq1);
-      CHECK(lteq2);
-      CHECK(lteq3);
+      CHECK_TRUE(lt1);
+      CHECK_FALSE(lt2);
+      CHECK_FALSE(lt3);
+      CHECK_TRUE(lt4);
     }
 #endif
 
@@ -564,13 +559,15 @@ namespace
       constexpr etl::optional<NonTrivial> data1(1);
       constexpr etl::optional<NonTrivial> data2(2);
 
-      constexpr bool gteq1 = (data1 > data2);
-      constexpr bool gteq2 = (data1 > etl::nullopt);
-      constexpr bool gteq3 = (etl::nullopt > data1);
+      constexpr bool gt1 = (data1 > data2);
+      constexpr bool gt2 = (data2 > data1);
+      constexpr bool gt3 = (data1 > etl::nullopt);
+      constexpr bool gt4 = (etl::nullopt > data1);
 
-      CHECK(gteq1);
-      CHECK(gteq2);
-      CHECK(gteq3);
+      CHECK_FALSE(gt1);
+      CHECK_TRUE(gt2);
+      CHECK_TRUE(gt3);
+      CHECK_FALSE(gt4);
     }
 #endif
 
@@ -581,13 +578,15 @@ namespace
       constexpr etl::optional<int> data1(1);
       constexpr etl::optional<int> data2(2);
 
-      constexpr bool gteq1 = (data1 > data2);
-      constexpr bool gteq2 = (data1 > etl::nullopt);
-      constexpr bool gteq3 = (etl::nullopt > data1);
+      constexpr bool gt1 = (data1 > data2);
+      constexpr bool gt2 = (data2 > data1);
+      constexpr bool gt3 = (data1 > etl::nullopt);
+      constexpr bool gt4 = (etl::nullopt > data1);
 
-      CHECK(gteq1);
-      CHECK(gteq2);
-      CHECK(gteq3);
+      CHECK_FALSE(gt1);
+      CHECK_TRUE(gt2);
+      CHECK_TRUE(gt3);
+      CHECK_FALSE(gt4);
     }
 #endif
 
@@ -632,13 +631,15 @@ namespace
       constexpr etl::optional<NonTrivial> data1(1);
       constexpr etl::optional<NonTrivial> data2(2);
 
-      constexpr bool gteq1 = (data1 >= data2);
-      constexpr bool gteq2 = (data1 >= etl::nullopt);
-      constexpr bool gteq3 = (etl::nullopt >= data1);
+      constexpr bool gte1 = (data1 >= data2);
+      constexpr bool gte2 = (data2 >= data1);
+      constexpr bool gte3 = (data1 >= etl::nullopt);
+      constexpr bool gte4 = (etl::nullopt >= data1);
 
-      CHECK(gteq1);
-      CHECK(gteq2);
-      CHECK(gteq3);
+      CHECK_FALSE(gte1);
+      CHECK_TRUE(gte2);
+      CHECK_TRUE(gte3);
+      CHECK_FALSE(gte4);
     }
 #endif
 
@@ -649,13 +650,15 @@ namespace
       constexpr etl::optional<int> data1(1);
       constexpr etl::optional<int> data2(2);
 
-      constexpr bool gteq1 = (data1 >= data2);
-      constexpr bool gteq2 = (data1 >= etl::nullopt);
-      constexpr bool gteq3 = (etl::nullopt >= data1);
+      constexpr bool gte1 = (data1 >= data2);
+      constexpr bool gte2 = (data2 >= data1);
+      constexpr bool gte3 = (data1 >= etl::nullopt);
+      constexpr bool gte4 = (etl::nullopt >= data1);
 
-      CHECK(gteq1);
-      CHECK(gteq2);
-      CHECK(gteq3);
+      CHECK_FALSE(gte1);
+      CHECK_TRUE(gte2);
+      CHECK_TRUE(gte3);
+      CHECK_FALSE(gte4);
     }
 #endif
 
diff --git a/test/vs2022/etl.vcxproj.filters b/test/vs2022/etl.vcxproj.filters
index 2adfa862..5c457a21 100644
--- a/test/vs2022/etl.vcxproj.filters
+++ b/test/vs2022/etl.vcxproj.filters
@@ -3340,12 +3340,6 @@
     <None Include="..\..\appveyor.yml">
       <Filter>Resource Files\CI\Appveyor</Filter>
     </None>
-    <None Include="..\..\.github\workflows\clang.yml">
-      <Filter>Resource Files\CI\Github</Filter>
-    </None>
-    <None Include="..\..\.github\workflows\gcc.yml">
-      <Filter>Resource Files\CI\Github</Filter>
-    </None>
     <None Include="..\..\.clang-format">
       <Filter>Resource Files</Filter>
     </None>
@@ -3412,6 +3406,30 @@
     <None Include="..\..\scripts\update_version.py">
       <Filter>Tests\Scripts</Filter>
     </None>
+    <None Include="..\..\.github\workflows\clang-c++11.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\clang-c++14.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\clang-c++17.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\clang-c++20.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++11.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++14.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++17.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
+    <None Include="..\..\.github\workflows\gcc-c++20.yml">
+      <Filter>Resource Files\CI\Github</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\support\Release notes.txt">

From 4b12e982e6c622f7e8bb255677f712bf22c3b483 Mon Sep 17 00:00:00 2001
From: mike919192 <91038685+mike919192@users.noreply.github.com>
Date: Fri, 16 Feb 2024 04:21:25 -0500
Subject: [PATCH 051/131] In subspan function, add static checks on extents
 (#843)

* In subspan function, add static checks on extents

* Change to ETL_STATIC_ASSERT.  Add static assert for first and last functions

* Add static assert to pre c++11 subspan

* Change extent to Extent to better match existing code
---
 include/etl/span.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/include/etl/span.h b/include/etl/span.h
index 797e35e5..2caa3897 100644
--- a/include/etl/span.h
+++ b/include/etl/span.h
@@ -42,6 +42,7 @@ SOFTWARE.
 #include "memory.h"
 #include "array.h"
 #include "byte.h"
+#include "static_assert.h"
 
 #include "private/dynamic_extent.h"
 
@@ -295,6 +296,9 @@ namespace etl
     template <size_t COUNT>
     ETL_NODISCARD ETL_CONSTEXPR etl::span<element_type, COUNT> first() const ETL_NOEXCEPT
     {
+      //if Extent is static, check that original span contains at least COUNT elements
+      ETL_STATIC_ASSERT((Extent != etl::dynamic_extent) ? COUNT <= Extent : true, "Original span does not contain COUNT elements");
+
       return etl::span<element_type, COUNT>(pbegin, pbegin + COUNT);
     }
 
@@ -312,6 +316,9 @@ namespace etl
     template <size_t COUNT>
     ETL_NODISCARD ETL_CONSTEXPR etl::span<element_type, COUNT> last() const ETL_NOEXCEPT
     {
+      //if Extent is static, check that original span contains at least COUNT elements
+      ETL_STATIC_ASSERT((Extent != etl::dynamic_extent) ? COUNT <= Extent : true, "Original span does not contain COUNT elements");
+
       return etl::span<element_type, COUNT>(pbegin + Extent - COUNT, (pbegin + Extent));
     }
 
@@ -331,6 +338,12 @@ namespace etl
     ETL_NODISCARD ETL_CONSTEXPR
     etl::span<element_type, COUNT != etl::dynamic_extent ? COUNT : Extent - OFFSET> subspan() const ETL_NOEXCEPT
     {
+      //if Extent is static, check that OFFSET is within the original span
+      ETL_STATIC_ASSERT((Extent != etl::dynamic_extent) ? OFFSET <= Extent : true, "OFFSET is not within the original span");
+
+      //if count is also static, check that OFFSET + COUNT is within the original span
+      ETL_STATIC_ASSERT((Extent != etl::dynamic_extent) && (COUNT != etl::dynamic_extent) ? COUNT <= (Extent - OFFSET) : true, "OFFSET + COUNT is not within the original span");
+      
       return (COUNT == etl::dynamic_extent) ? etl::span<element_type, COUNT != etl::dynamic_extent ? COUNT : Extent - OFFSET>(pbegin + OFFSET, (pbegin + Extent))
                                             : etl::span<element_type, COUNT != etl::dynamic_extent ? COUNT : Extent - OFFSET>(pbegin + OFFSET, pbegin + OFFSET + COUNT);
     }
@@ -341,6 +354,12 @@ namespace etl
     template <size_t OFFSET, size_t COUNT>
     etl::span<element_type, COUNT != etl::dynamic_extent ? COUNT : Extent - OFFSET> subspan() const
     {
+      //if Extent is static, check that OFFSET is within the original span
+      ETL_STATIC_ASSERT((Extent != etl::dynamic_extent) ? OFFSET <= Extent : true, "OFFSET is not within the original span");
+
+      //if count is also static, check that OFFSET + COUNT is within the original span
+      ETL_STATIC_ASSERT((Extent != etl::dynamic_extent) && (COUNT != etl::dynamic_extent) ? COUNT <= (Extent - OFFSET) : true, "OFFSET + COUNT is not within the original span");
+      
       if (COUNT == etl::dynamic_extent)
       {
         return etl::span<element_type, (COUNT != etl::dynamic_extent ? COUNT : Extent - OFFSET)>(pbegin + OFFSET, (pbegin + Extent));

From aad8024ef1e4553dc293cae403b18553a5370194 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sun, 18 Feb 2024 10:48:01 +0000
Subject: [PATCH 052/131] Edited comments

---
 include/etl/span.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/etl/span.h b/include/etl/span.h
index 2caa3897..5f19ec3a 100644
--- a/include/etl/span.h
+++ b/include/etl/span.h
@@ -296,7 +296,7 @@ namespace etl
     template <size_t COUNT>
     ETL_NODISCARD ETL_CONSTEXPR etl::span<element_type, COUNT> first() const ETL_NOEXCEPT
     {
-      //if Extent is static, check that original span contains at least COUNT elements
+      // If Extent is static, check that original span contains at least COUNT elements
       ETL_STATIC_ASSERT((Extent != etl::dynamic_extent) ? COUNT <= Extent : true, "Original span does not contain COUNT elements");
 
       return etl::span<element_type, COUNT>(pbegin, pbegin + COUNT);
@@ -316,7 +316,7 @@ namespace etl
     template <size_t COUNT>
     ETL_NODISCARD ETL_CONSTEXPR etl::span<element_type, COUNT> last() const ETL_NOEXCEPT
     {
-      //if Extent is static, check that original span contains at least COUNT elements
+      // If Extent is static, check that original span contains at least COUNT elements
       ETL_STATIC_ASSERT((Extent != etl::dynamic_extent) ? COUNT <= Extent : true, "Original span does not contain COUNT elements");
 
       return etl::span<element_type, COUNT>(pbegin + Extent - COUNT, (pbegin + Extent));
@@ -338,10 +338,10 @@ namespace etl
     ETL_NODISCARD ETL_CONSTEXPR
     etl::span<element_type, COUNT != etl::dynamic_extent ? COUNT : Extent - OFFSET> subspan() const ETL_NOEXCEPT
     {
-      //if Extent is static, check that OFFSET is within the original span
+      // If Extent is static, check that OFFSET is within the original span
       ETL_STATIC_ASSERT((Extent != etl::dynamic_extent) ? OFFSET <= Extent : true, "OFFSET is not within the original span");
 
-      //if count is also static, check that OFFSET + COUNT is within the original span
+      // If count is also static, check that OFFSET + COUNT is within the original span
       ETL_STATIC_ASSERT((Extent != etl::dynamic_extent) && (COUNT != etl::dynamic_extent) ? COUNT <= (Extent - OFFSET) : true, "OFFSET + COUNT is not within the original span");
       
       return (COUNT == etl::dynamic_extent) ? etl::span<element_type, COUNT != etl::dynamic_extent ? COUNT : Extent - OFFSET>(pbegin + OFFSET, (pbegin + Extent))
@@ -354,10 +354,10 @@ namespace etl
     template <size_t OFFSET, size_t COUNT>
     etl::span<element_type, COUNT != etl::dynamic_extent ? COUNT : Extent - OFFSET> subspan() const
     {
-      //if Extent is static, check that OFFSET is within the original span
+      // If Extent is static, check that OFFSET is within the original span
       ETL_STATIC_ASSERT((Extent != etl::dynamic_extent) ? OFFSET <= Extent : true, "OFFSET is not within the original span");
 
-      //if count is also static, check that OFFSET + COUNT is within the original span
+      // If count is also static, check that OFFSET + COUNT is within the original span
       ETL_STATIC_ASSERT((Extent != etl::dynamic_extent) && (COUNT != etl::dynamic_extent) ? COUNT <= (Extent - OFFSET) : true, "OFFSET + COUNT is not within the original span");
       
       if (COUNT == etl::dynamic_extent)

From a2b7eb5d5a20a88ba491c97917efe32e3d12870f Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sun, 18 Feb 2024 12:08:11 +0000
Subject: [PATCH 053/131] Added specific copy and move constructors for C++17
 and above.

---
 include/etl/message_packet.h | 30 +++++++++++++++++++++++++-----
 test/test_message_packet.cpp | 26 ++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/include/etl/message_packet.h b/include/etl/message_packet.h
index df4d6d29..80a56165 100644
--- a/include/etl/message_packet.h
+++ b/include/etl/message_packet.h
@@ -95,11 +95,35 @@ namespace etl
     }
 #include "private/diagnostic_pop.h"
 
+    //**********************************************
+#include "private/diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+#include "private/diagnostic_pop.h"
+
+    //**********************************************
+#include "private/diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+#include "private/diagnostic_pop.h"
+
     //********************************************
     ///
     //********************************************
 #include "private/diagnostic_uninitialized_push.h"
-    template <typename T>
+    template <typename T, typename = typename etl::enable_if<IsIMessage<T> || IsInMessageList<T>>::type>
     explicit message_packet(T&& msg)
       : valid(true)
     {
@@ -121,10 +145,6 @@ namespace etl
       {
         add_new_message_type<T>(etl::forward<T>(msg));
       }
-      else if constexpr (IsMessagePacket<T>)
-      {
-        copy(etl::forward<T>(msg));
-      }
       else
       {
         ETL_STATIC_ASSERT(IsInMessageList<T>, "Message not in packet type list");
diff --git a/test/test_message_packet.cpp b/test/test_message_packet.cpp
index 6c7bda23..5589c0e2 100644
--- a/test/test_message_packet.cpp
+++ b/test/test_message_packet.cpp
@@ -194,6 +194,16 @@ namespace
 
   using Packet = etl::message_packet<Message1, Message2, Message3>;
 
+  struct Object
+  {
+    void Push(const etl::message_packet<Message1, Message2>& p)
+    {
+      ::new (buffer) etl::message_packet<Message1, Message2>(p);
+    }
+
+    char buffer[100];
+  };
+
   SUITE(test_message_packet)
   {
     //*************************************************************************
@@ -452,6 +462,22 @@ namespace
       CHECK(Packet::accepts<MESSAGE3>());
       CHECK(!Packet::accepts<MESSAGE4>());
     }
+
+    //*************************************************************************
+    TEST(test_message_packet_push_to_queue_bug_845)
+    {
+      using Packet = etl::message_packet<Message1, Message2>;
+
+      Object obj;
+
+      Message1 message1(1);
+      Message2 message2(1.2);
+      Packet packet1(message1);
+      Packet packet2(message2);
+
+      obj.Push(packet1);
+      obj.Push(packet2);
+    }
   };
 }
 

From c92d970d0928101971e4079a8584fcb0ffb3ab8f Mon Sep 17 00:00:00 2001
From: Pisit Sawangvonganan <50133174+ndrs-pst@users.noreply.github.com>
Date: Fri, 23 Feb 2024 02:06:23 +0700
Subject: [PATCH 054/131] etl: apply code spell check across entire code base
 (#818)

Utilized a spell checking tool to identify and correct spelling
throughout all files in the code base.

Signed-off-by: Pisit Sawangvonganan <pisit@ndrsolution.com>
---
 cmake/GetGitRevisionDescription.cmake         |  2 +-
 .../FunctionInterruptSimulation.cpp           |  2 +-
 .../FunctionInterruptSimulation.cpp           |  2 +-
 include/etl/algorithm.h                       |  2 +-
 include/etl/basic_string.h                    |  2 +-
 include/etl/bit_stream.h                      |  4 ++--
 include/etl/byte_stream.h                     |  4 ++--
 include/etl/fsm.h                             |  2 +-
 include/etl/generators/fsm_generator.h        |  2 +-
 .../etl/generators/type_traits_generator.h    |  2 +-
 include/etl/private/ivectorpointer.h          |  4 ++--
 include/etl/private/variant_variadic.h        | 22 +++++++++----------
 include/etl/span.h                            |  2 +-
 include/etl/to_arithmetic.h                   |  2 +-
 include/etl/type_traits.h                     |  2 +-
 include/etl/unordered_map.h                   |  2 +-
 include/etl/unordered_multimap.h              |  2 +-
 include/etl/unordered_multiset.h              |  2 +-
 include/etl/unordered_set.h                   |  2 +-
 support/Release notes.txt                     | 18 +++++++--------
 test/test_multimap.cpp                        |  2 +-
 test/test_multiset.cpp                        |  2 +-
 22 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/cmake/GetGitRevisionDescription.cmake b/cmake/GetGitRevisionDescription.cmake
index 0a203502..07ec5faf 100644
--- a/cmake/GetGitRevisionDescription.cmake
+++ b/cmake/GetGitRevisionDescription.cmake
@@ -59,7 +59,7 @@ get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
 # function returns an empty string via _git_dir_var.
 #
 # Example: Given a path C:/bla/foo/bar and assuming C:/bla/.git exists and
-# neither foo nor bar contain a file/directory .git. This wil return
+# neither foo nor bar contain a file/directory .git. This will return
 # C:/bla/.git
 #
 function(_git_find_closest_git_dir _start_dir _git_dir_var)
diff --git a/examples/FunctionInterruptSimulation-Delegates/FunctionInterruptSimulation.cpp b/examples/FunctionInterruptSimulation-Delegates/FunctionInterruptSimulation.cpp
index 2fb61c92..bbf6debf 100644
--- a/examples/FunctionInterruptSimulation-Delegates/FunctionInterruptSimulation.cpp
+++ b/examples/FunctionInterruptSimulation-Delegates/FunctionInterruptSimulation.cpp
@@ -119,7 +119,7 @@ Uart  uart1(0, USART1_IRQ_HANDLER);
 Uart  uart2(1, USART2_IRQ_HANDLER);
 
 // Declare a global callback for the timer.
-// Uses the most efficient callback type for a class, as everthing is known at compile time.
+// Uses the most efficient callback type for a class, as everything is known at compile time.
 etl::delegate<void(size_t)> timer_member_callback = etl::delegate<void(size_t)>::create<Timer, timer, &Timer::InterruptHandler>();
 
 // Declare the callbacks for the free functions.
diff --git a/examples/FunctionInterruptSimulation/FunctionInterruptSimulation.cpp b/examples/FunctionInterruptSimulation/FunctionInterruptSimulation.cpp
index cee73877..9eb6cb98 100644
--- a/examples/FunctionInterruptSimulation/FunctionInterruptSimulation.cpp
+++ b/examples/FunctionInterruptSimulation/FunctionInterruptSimulation.cpp
@@ -119,7 +119,7 @@ Uart  uart1(0, USART1_IRQ_HANDLER);
 Uart  uart2(1, USART2_IRQ_HANDLER);
 
 // Declare a global callback for the timer.
-// Uses the most efficient callback type for a class, as everthing is known at compile time.
+// Uses the most efficient callback type for a class, as everything is known at compile time.
 etl::function_imp<Timer, size_t, timer, &Timer::InterruptHandler> timer_member_callback;
 
 // Declare the callbacks for the free functions.
diff --git a/include/etl/algorithm.h b/include/etl/algorithm.h
index cc989d15..efc5b801 100644
--- a/include/etl/algorithm.h
+++ b/include/etl/algorithm.h
@@ -2177,7 +2177,7 @@ namespace etl
   //***************************************************************************
   /// copy_if
   /// A safer form of copy_if where it terminates when the first end iterator is reached.
-  /// There is currently no STL equivelent.
+  /// There is currently no STL equivalent.
   ///\ingroup algorithm
   //***************************************************************************
   template <typename TInputIterator,
diff --git a/include/etl/basic_string.h b/include/etl/basic_string.h
index 8afdf18a..6b01c61f 100644
--- a/include/etl/basic_string.h
+++ b/include/etl/basic_string.h
@@ -1262,7 +1262,7 @@ namespace etl
     /// Erases a sequence.
     ///\param position Position to start from.
     ///\param length   Number of characters.
-    ///\return A refernce to this string.
+    ///\return A reference to this string.
     //*********************************************************************
     etl::ibasic_string<T>& erase(size_type position, size_type length_ = npos)
     {
diff --git a/include/etl/bit_stream.h b/include/etl/bit_stream.h
index 6dcc50f7..7c5b557e 100644
--- a/include/etl/bit_stream.h
+++ b/include/etl/bit_stream.h
@@ -861,7 +861,7 @@ namespace etl
     }
 
     //***************************************************************************
-    /// Sets the function to call afer every write.
+    /// Sets the function to call after every write.
     //***************************************************************************
     void set_callback(callback_type callback_)
     {
@@ -869,7 +869,7 @@ namespace etl
     }
 
     //***************************************************************************
-    /// Gets the function to call afer every write.
+    /// Gets the function to call after every write.
     //***************************************************************************
     callback_type get_callback() const
     {
diff --git a/include/etl/byte_stream.h b/include/etl/byte_stream.h
index aaa9d8a4..4d0242fa 100644
--- a/include/etl/byte_stream.h
+++ b/include/etl/byte_stream.h
@@ -410,7 +410,7 @@ namespace etl
     }
 
     //***************************************************************************
-    /// Sets the function to call afer every write.
+    /// Sets the function to call after every write.
     //***************************************************************************
     void set_callback(callback_type callback_)
     {
@@ -418,7 +418,7 @@ namespace etl
     }
 
     //***************************************************************************
-    /// Gets the function to call afer every write.
+    /// Gets the function to call after every write.
     //***************************************************************************
     callback_type get_callback() const
     {
diff --git a/include/etl/fsm.h b/include/etl/fsm.h
index 19584a91..94475891 100644
--- a/include/etl/fsm.h
+++ b/include/etl/fsm.h
@@ -158,7 +158,7 @@ namespace etl
   };
 
   //***************************************************************************
-  /// Exception for forbidden state chages.
+  /// Exception for forbidden state changes.
   //***************************************************************************
   class fsm_state_composite_state_change_forbidden : public etl::fsm_exception
   {
diff --git a/include/etl/generators/fsm_generator.h b/include/etl/generators/fsm_generator.h
index a59d1fa1..6b6e5ef0 100644
--- a/include/etl/generators/fsm_generator.h
+++ b/include/etl/generators/fsm_generator.h
@@ -177,7 +177,7 @@ namespace etl
   };
 
   //***************************************************************************
-  /// Exception for forbidden state chages.
+  /// Exception for forbidden state changes.
   //***************************************************************************
   class fsm_state_composite_state_change_forbidden : public etl::fsm_exception
   {
diff --git a/include/etl/generators/type_traits_generator.h b/include/etl/generators/type_traits_generator.h
index d2cf8ce6..c94b90e7 100644
--- a/include/etl/generators/type_traits_generator.h
+++ b/include/etl/generators/type_traits_generator.h
@@ -74,7 +74,7 @@ cog.outl("//********************************************************************
 
 ///\defgroup type_traits type_traits
 /// A set of type traits definitions.
-/// Derived from either the standard or alternate definitions, dependant on whether or not ETL_NO_STL is defined.
+/// Derived from either the standard or alternate definitions, dependent on whether or not ETL_NO_STL is defined.
 /// \ingroup utilities
 
 #if ETL_USING_STL && ETL_USING_CPP11
diff --git a/include/etl/private/ivectorpointer.h b/include/etl/private/ivectorpointer.h
index 52b9924c..52f938fe 100644
--- a/include/etl/private/ivectorpointer.h
+++ b/include/etl/private/ivectorpointer.h
@@ -986,7 +986,7 @@ namespace etl
   /// Less than or equal operator.
   ///\param lhs Reference to the first vector.
   ///\param rhs Reference to the second vector.
-  ///\return <b>true</b> if the first vector is lexigraphically less than or equal to the second, otherwise <b>false</b>
+  ///\return <b>true</b> if the first vector is lexicographically less than or equal to the second, otherwise <b>false</b>
   ///\ingroup vector
   //***************************************************************************
   template <typename T>
@@ -999,7 +999,7 @@ namespace etl
   /// Greater than or equal operator.
   ///\param lhs Reference to the first vector.
   ///\param rhs Reference to the second vector.
-  ///\return <b>true</b> if the first vector is lexigraphically greater than or equal to the second, otherwise <b>false</b>
+  ///\return <b>true</b> if the first vector is lexicographically greater than or equal to the second, otherwise <b>false</b>
   ///\ingroup vector
   //***************************************************************************
   template <typename T>
diff --git a/include/etl/private/variant_variadic.h b/include/etl/private/variant_variadic.h
index 28b2d99a..651c9ff5 100644
--- a/include/etl/private/variant_variadic.h
+++ b/include/etl/private/variant_variadic.h
@@ -997,7 +997,7 @@ namespace etl
 
 #if ETL_USING_CPP17 && !defined(ETL_VARIANT_FORCE_CPP11)
     //***************************************************************************
-    /// Call the relevent visitor by attempting each one.
+    /// Call the relevant visitor by attempting each one.
     //***************************************************************************
     template <typename TVisitor, size_t... I>
     void do_visitor(TVisitor& visitor, etl::index_sequence<I...>)
@@ -1006,7 +1006,7 @@ namespace etl
     }
 
     //***************************************************************************
-    /// Call the relevent visitor by attempting each one.
+    /// Call the relevant visitor by attempting each one.
     //***************************************************************************
     template <typename TVisitor, size_t... I>
     void do_visitor(TVisitor& visitor, etl::index_sequence<I...>) const
@@ -1015,7 +1015,7 @@ namespace etl
     }
 #else
     //***************************************************************************
-    /// /// Call the relevent visitor.
+    /// /// Call the relevant visitor.
     //***************************************************************************
     template <typename TVisitor>
     void do_visitor(TVisitor& visitor)
@@ -1065,7 +1065,7 @@ namespace etl
     }
 
     //***************************************************************************
-    /// /// Call the relevent visitor.
+    /// /// Call the relevant visitor.
     //***************************************************************************
     template <typename TVisitor>
     void do_visitor(TVisitor& visitor) const
@@ -1125,7 +1125,7 @@ namespace etl
       {
         // Workaround for MSVC (2023/05/13)
         // It doesn't compile 'visitor.visit(etl::get<Index>(*this))' correctly for C++17 & C++20.
-        // Changed all of the instances for consistancy.
+        // Changed all of the instances for consistency.
         auto& v = etl::get<Index>(*this);
         visitor.visit(v);
         return true;
@@ -1146,7 +1146,7 @@ namespace etl
       {
         // Workaround for MSVC (2023/05/13)
         // It doesn't compile 'visitor.visit(etl::get<Index>(*this))' correctly for C++17 & C++20.
-        // Changed all of the instances for consistancy.
+        // Changed all of the instances for consistency.
         auto& v = etl::get<Index>(*this);
         visitor.visit(v);
         return true;
@@ -1159,7 +1159,7 @@ namespace etl
 
 #if ETL_USING_CPP17 && !defined(ETL_VARIANT_FORCE_CPP11)
     //***************************************************************************
-    /// Call the relevent visitor by attempting each one.
+    /// Call the relevant visitor by attempting each one.
     //***************************************************************************
     template <typename TVisitor, size_t... I>
     void do_operator(TVisitor& visitor, etl::index_sequence<I...>)
@@ -1168,7 +1168,7 @@ namespace etl
     }
 
     //***************************************************************************
-    /// Call the relevent visitor by attempting each one.
+    /// Call the relevant visitor by attempting each one.
     //***************************************************************************
     template <typename TVisitor, size_t... I>
     void do_operator(TVisitor& visitor, etl::index_sequence<I...>) const
@@ -1177,7 +1177,7 @@ namespace etl
     }
 #else
     //***************************************************************************
-    /// Call the relevent visitor.
+    /// Call the relevant visitor.
     //***************************************************************************
     template <typename TVisitor>
     void do_operator(TVisitor& visitor)
@@ -1241,7 +1241,7 @@ namespace etl
     }
 
     //***************************************************************************
-    /// Call the relevent visitor.
+    /// Call the relevant visitor.
     //***************************************************************************
     template <typename TVisitor>
     void do_operator(TVisitor& visitor) const
@@ -1693,7 +1693,7 @@ namespace etl
 
     //***************************************************************************
     /// Helper to instantiate the function pointers needed for the "jump table".
-    /// Embedds the 'TVarRest' (remaining variants) into its type to come around
+    /// Embeds the 'TVarRest' (remaining variants) into its type to come around
     /// the "double expansion" otherwise needed in "do_visit".
     //***************************************************************************
     template <typename TRet, typename TCallable, typename TCurVariant, typename... TVarRest>
diff --git a/include/etl/span.h b/include/etl/span.h
index 797e35e5..b37d8d2b 100644
--- a/include/etl/span.h
+++ b/include/etl/span.h
@@ -720,7 +720,7 @@ namespace etl
 
   //*************************************************************************
   /// Equality function.
-  /// Performs a comparision of the range values.
+  /// Performs a comparison of the range values.
   /// Returns <b>true</b> if one of the following are <b>true</b>
   /// 1. Both spans are empty.
   /// 2. They both point to the same range of data.
diff --git a/include/etl/to_arithmetic.h b/include/etl/to_arithmetic.h
index f2e69743..81d5499b 100644
--- a/include/etl/to_arithmetic.h
+++ b/include/etl/to_arithmetic.h
@@ -397,7 +397,7 @@ namespace etl
           TValue old_value = integral_value;
           integral_value *= radix;
 
-          // No multipication overflow?
+          // No multiplication overflow?
           is_not_overflow = ((integral_value / radix) == old_value);
 
           if (is_not_overflow)
diff --git a/include/etl/type_traits.h b/include/etl/type_traits.h
index cb4fc726..816953d5 100644
--- a/include/etl/type_traits.h
+++ b/include/etl/type_traits.h
@@ -62,7 +62,7 @@ SOFTWARE.
 
 ///\defgroup type_traits type_traits
 /// A set of type traits definitions.
-/// Derived from either the standard or alternate definitions, dependant on whether or not ETL_NO_STL is defined.
+/// Derived from either the standard or alternate definitions, dependent on whether or not ETL_NO_STL is defined.
 /// \ingroup utilities
 
 #if ETL_USING_STL && ETL_USING_CPP11
diff --git a/include/etl/unordered_map.h b/include/etl/unordered_map.h
index 0e5b9e35..5cea106d 100644
--- a/include/etl/unordered_map.h
+++ b/include/etl/unordered_map.h
@@ -1508,7 +1508,7 @@ namespace etl
     }
 
     //*********************************************************************
-    /// Delete a data noe at the specified location.
+    /// Delete a data node at the specified location.
     //*********************************************************************
     local_iterator delete_data_node(local_iterator iprevious, local_iterator icurrent, bucket_t& bucket)
     {
diff --git a/include/etl/unordered_multimap.h b/include/etl/unordered_multimap.h
index 174b5978..61ef5b07 100644
--- a/include/etl/unordered_multimap.h
+++ b/include/etl/unordered_multimap.h
@@ -1362,7 +1362,7 @@ namespace etl
     }
 
     //*********************************************************************
-    /// Delete a data noe at the specified location.
+    /// Delete a data node at the specified location.
     //*********************************************************************
     local_iterator delete_data_node(local_iterator iprevious, local_iterator icurrent, bucket_t& bucket)
     {
diff --git a/include/etl/unordered_multiset.h b/include/etl/unordered_multiset.h
index be1acee7..5af28a7e 100644
--- a/include/etl/unordered_multiset.h
+++ b/include/etl/unordered_multiset.h
@@ -1340,7 +1340,7 @@ namespace etl
     }
 
     //*********************************************************************
-    /// Delete a data noe at the specified location.
+    /// Delete a data node at the specified location.
     //*********************************************************************
     local_iterator delete_data_node(local_iterator iprevious, local_iterator icurrent, bucket_t& bucket)
     {
diff --git a/include/etl/unordered_set.h b/include/etl/unordered_set.h
index 35dce097..705622cf 100644
--- a/include/etl/unordered_set.h
+++ b/include/etl/unordered_set.h
@@ -1366,7 +1366,7 @@ namespace etl
     }
 
     //*********************************************************************
-    /// Delete a data noe at the specified location.
+    /// Delete a data node at the specified location.
     //*********************************************************************
     local_iterator delete_data_node(local_iterator iprevious, local_iterator icurrent, bucket_t& bucket)
     {
diff --git a/support/Release notes.txt b/support/Release notes.txt
index 69ad889d..fce98a24 100644
--- a/support/Release notes.txt	
+++ b/support/Release notes.txt	
@@ -156,7 +156,7 @@ Comments and noexcept updates to placement new
 etl::variant (variadic) refactor and updates for C++ standards compatibility
 etl::overload available in C++17 only
 map/flat_map speed optimisations
-Various C++03 compatibilty updates for maps
+Various C++03 compatibility updates for maps
 Refactored Bash compilation scripts to allow selection of C++ standard and optimisation level
 Renamed Bash compilation scripts. Changed 'sanity checks' to 'syntax checks
 Some internal constant case changes from all upper to capital case
@@ -222,7 +222,7 @@ Removed unused ETL_USE_MEM_BUILTINS option
 
 ===============================================================================
 20.35.7
-Updated etl::delgate to handle const functors correctly
+Updated etl::delegate to handle const functors correctly
 
 ===============================================================================
 20.35.6
@@ -270,7 +270,7 @@ Removed duplicate include in etl::array_view
 #621 No need to initialize the C-compiler, small speed improvement
 #626 Empty etl::optional ctor storage initialization performance
 Removed constexpr for etl::bit_cast due to unreliability of compiler support
-Added has_value() as an alias for is_value() for etl::result (consistancy with STL conventions)
+Added has_value() as an alias for is_value() for etl::result (consistency with STL conventions)
 Added ETL_ERROR_WITH_VALUE macro for exceptions that require a value
 Changed scaling template parameter for etl::scaled_rounding to uint32_t
 Remove redundant etl::pair functions
@@ -467,7 +467,7 @@ Fixed send_message function signatures.
 20.24.0
 #503 Algorithm transform uses expensive post increment operator - Fixed for all occurrences of iterator increment.
 #504 ETL_CONSTANT vs const in binary.h - Fixed.
-Many algorithms will leverage built-ins, if available. Dependant on compiler version.
+Many algorithms will leverage built-ins, if available. Dependent on compiler version.
 Added detection or selection of built-ins.
 Much of etl::string and etl::string_view can be constexpr.
 Added ETL initializer_list implementations that are compatible with major compilers.
@@ -835,7 +835,7 @@ Added example application for shared messages.
 Added a lockable queue with locks implemented as pure virtuals.
 Refactored the other queues.
 Fixed missing virtual destructor for C++11 observer.
-Added etl::successor class for consistant 'chain of responsibilty' pattern generation.
+Added etl::successor class for consistent 'chain of responsibilty' pattern generation.
 Added missing constructors to unique_ptr.
 Added nullptr check to unique_ptr destructor.
 Fixed VS2019 warning for etl::deque iterators.
@@ -1803,7 +1803,7 @@ Added constexpr constructors to string_view and array_view.
 
 ===============================================================================
 14.8.2
-Added missing #include "stl/interator.h" in frame_check_sequence.h
+Added missing #include "stl/iterator.h" in frame_check_sequence.h
 
 ===============================================================================
 14.8.1
@@ -2036,7 +2036,7 @@ Added SPSC & MPPC queues
 
 ===============================================================================
 11.3.0
-Improved compatibility with 64 bit pltforms.
+Improved compatibility with 64 bit platforms.
 
 ===============================================================================
 11.2.0
@@ -2073,7 +2073,7 @@ Improved etl::endianness. Added static functions.
 
 ===============================================================================
 10.19.2
-Fixed strict aliasing warnings for endianess.
+Fixed strict aliasing warnings for endianness.
 
 ===============================================================================
 10.19.1
@@ -2082,7 +2082,7 @@ Fixed strict aliasing warnings for aligned storage.
 ===============================================================================
 10.19.0
 Added 'create' and 'destroy' functions to pools.
-Modified class heirarchy.
+Modified class hierarchy.
 etl::generic_pool is derived from on etl::ipool.
 etl::pool is derived from etl::generic_pool.
 
diff --git a/test/test_multimap.cpp b/test/test_multimap.cpp
index afba0d69..90410fca 100644
--- a/test/test_multimap.cpp
+++ b/test/test_multimap.cpp
@@ -106,7 +106,7 @@ namespace
     //*************************************************************************
     struct SetupFixture
     {
-      // Multimaps of predefined data from which to constuct multimaps used in
+      // Multimaps of predefined data from which to construct multimaps used in
       // each test
       std::multimap<std::string, int> initial_data;
       std::multimap<std::string, int> excess_data;
diff --git a/test/test_multiset.cpp b/test/test_multiset.cpp
index 45d98fab..4a9fab01 100644
--- a/test/test_multiset.cpp
+++ b/test/test_multiset.cpp
@@ -121,7 +121,7 @@ namespace
     //*************************************************************************
     struct SetupFixture
     {
-      // Multisets of predefined data from which to constuct multisets used in
+      // Multisets of predefined data from which to construct multisets used in
       // each test
       std::multiset<int> initial_data;
       std::multiset<int> excess_data;

From 134f8e4209b5775625f5162a0bf667bb453dee69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Seeb=C3=B6ck?= <seeboeck@pjm.co.at>
Date: Thu, 22 Feb 2024 20:14:37 +0100
Subject: [PATCH 055/131] variant varadic default constructed state (#804)

* fixed variant varadic default constructed state

* updated testcases to account for default contructor changes
---
 include/etl/private/variant_variadic.h |  2 +-
 test/test_variant_variadic.cpp         | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/etl/private/variant_variadic.h b/include/etl/private/variant_variadic.h
index 28b2d99a..399e5e90 100644
--- a/include/etl/private/variant_variadic.h
+++ b/include/etl/private/variant_variadic.h
@@ -531,7 +531,7 @@ namespace etl
 
       default_construct_in_place<type>(data);
       operation = operation_type<type, etl::is_copy_constructible<type>::value, etl::is_move_constructible<type>::value>::do_operation;
-      type_id   = 0U;
+      type_id   = variant_npos;
     }
 #include "diagnostic_pop.h"
 
diff --git a/test/test_variant_variadic.cpp b/test/test_variant_variadic.cpp
index 34e9178c..e35d48e8 100644
--- a/test/test_variant_variadic.cpp
+++ b/test/test_variant_variadic.cpp
@@ -420,15 +420,15 @@ namespace
 
       test_variant_etl_3 variant_etl;
 
-      CHECK(etl::holds_alternative<char>(variant_etl));
+      CHECK(!etl::holds_alternative<char>(variant_etl));
       CHECK(!etl::holds_alternative<int>(variant_etl));
       CHECK(!etl::holds_alternative<std::string>(variant_etl));
 
-      CHECK(etl::holds_alternative<0U>(variant_etl));
+      CHECK(!etl::holds_alternative<0U>(variant_etl));
       CHECK(!etl::holds_alternative<1U>(variant_etl));
       CHECK(!etl::holds_alternative<2U>(variant_etl));
 
-      CHECK(etl::holds_alternative(0U, variant_etl));
+      CHECK(!etl::holds_alternative(0U, variant_etl));
       CHECK(!etl::holds_alternative(1U, variant_etl));
       CHECK(!etl::holds_alternative(2U, variant_etl));
       CHECK(!etl::holds_alternative(99U, variant_etl));
@@ -1830,7 +1830,7 @@ namespace
     //*************************************************************************
     TEST(test_variant_visit_void)
     {
-      etl::variant<int8_t, uint8_t> variant1;
+      etl::variant<int8_t, uint8_t> variant1 = int8_t{};
 
       bool       variant_was_signed{};
       auto const f = [&variant_was_signed](auto v)
@@ -1857,7 +1857,7 @@ namespace
 
       std::string result = "?";
 
-      etl::variant<TypeA, TypeB, TypeC, TypeD> package;
+      etl::variant<TypeA, TypeB, TypeC, TypeD> package = TypeA{};
 
       etl::visit(etl::overload
         {

From 26e346e11ee7a1120e08fb2e21e0f9cd309b9e18 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 4 Mar 2024 12:54:05 +0000
Subject: [PATCH 056/131] Added fixes for deque operator-(). Removed redundant
 operator that was causing compile errors for C++20

---
 include/etl/circular_buffer.h |  52 ++++++---
 include/etl/deque.h           |  70 +++++++----
 test/test_deque.cpp           | 213 +++++++++++++++++++++++-----------
 3 files changed, 231 insertions(+), 104 deletions(-)

diff --git a/include/etl/circular_buffer.h b/include/etl/circular_buffer.h
index f57d863d..0902f0da 100644
--- a/include/etl/circular_buffer.h
+++ b/include/etl/circular_buffer.h
@@ -246,6 +246,22 @@ namespace etl
         return &picb->pbuffer[current];
       }
 
+      //*************************************************************************
+      /// [] operator
+      //*************************************************************************
+      reference operator [](size_t index)
+      {
+        return pbuffer[(current + index) % picb->buffer_size];
+      }
+
+      //*************************************************************************
+      /// [] operator
+      //*************************************************************************
+      const_reference operator [](size_t index) const
+      {
+        return pbuffer[(current + index) % picb->buffer_size];
+      }
+
       //*************************************************************************
       /// Pre-increment.
       //*************************************************************************
@@ -335,6 +351,18 @@ namespace etl
         return temp;
       }
 
+      //*************************************************************************
+      /// Add offset.
+      //*************************************************************************
+      friend iterator operator +(int n, const iterator& rhs)
+      {
+        iterator temp = rhs;
+
+        temp += n;
+
+        return temp;
+      }
+
       //*************************************************************************
       /// Subtract offset.
       //*************************************************************************
@@ -517,6 +545,14 @@ namespace etl
         return &(picb->pbuffer[current]);
       }
 
+      //*************************************************************************
+      /// [] operator
+      //*************************************************************************
+      const_reference operator [](size_t index) const
+      {
+        return pbuffer[(current + index) % picb->buffer_size];
+      }
+
       //*************************************************************************
       /// Pre-increment.
       //*************************************************************************
@@ -998,22 +1034,6 @@ namespace etl
       return distance(rhs, lhs);
     }
 
-    //*************************************************************************
-    /// - operator for reverse_iterator
-    //*************************************************************************
-    friend difference_type operator -(const reverse_iterator& lhs, const reverse_iterator& rhs)
-    {
-      return distance(lhs.base(), rhs.base());
-    }
-
-    //*************************************************************************
-    /// - operator for const_reverse_iterator
-    //*************************************************************************
-    friend difference_type operator -(const const_reverse_iterator& lhs, const const_reverse_iterator& rhs)
-    {
-      return distance(lhs.base(), rhs.base());
-    }
-
   protected:
 
     //*************************************************************************
diff --git a/include/etl/deque.h b/include/etl/deque.h
index 5586360a..8235b25c 100644
--- a/include/etl/deque.h
+++ b/include/etl/deque.h
@@ -41,7 +41,6 @@ SOFTWARE.
 #include "debug_count.h"
 #include "algorithm.h"
 #include "type_traits.h"
-#include "iterator.h"
 #include "placement_new.h"
 #include "initializer_list.h"
 
@@ -258,17 +257,17 @@ namespace etl
 
       //***************************************************
       iterator(const iterator& other)
-        : index(other.index),
-        p_deque(other.p_deque),
-        p_buffer(other.p_buffer)
+        : index(other.index)
+        , p_deque(other.p_deque)
+        , p_buffer(other.p_buffer)
       {
       }
 
       //***************************************************
       iterator& operator =(const iterator& other)
       {
-        index = other.index;
-        p_deque = other.p_deque;
+        index    = other.index;
+        p_deque  = other.p_deque;
         p_buffer = other.p_buffer;
 
         return *this;
@@ -352,6 +351,24 @@ namespace etl
         return &p_buffer[index];
       }
 
+      //***************************************************
+      reference operator [](size_t index)
+      {
+        iterator result(*this);
+        result += index;
+
+        return *result;
+      }
+
+      //***************************************************
+      const_reference operator [](size_t index) const
+      {
+        iterator result(*this);
+        result += index;
+
+        return *result;
+      }
+
       //***************************************************
       friend iterator operator +(const iterator& lhs, difference_type offset)
       {
@@ -360,6 +377,14 @@ namespace etl
         return result;
       }
 
+      //***************************************************
+      friend iterator operator +(difference_type offset, const iterator& lhs)
+      {
+        iterator result(lhs);
+        result += offset;
+        return result;
+      }
+
       //***************************************************
       friend iterator operator -(const iterator& lhs, difference_type offset)
       {
@@ -596,6 +621,15 @@ namespace etl
         return &p_buffer[index];
       }
 
+      //***************************************************
+      reference operator [](size_t index)
+      {
+        iterator result(*this);
+        result += index;
+
+        return *result;
+      }
+
       //***************************************************
       friend const_iterator operator +(const const_iterator& lhs, difference_type offset)
       {
@@ -604,6 +638,14 @@ namespace etl
         return result;
       }
 
+      //***************************************************
+      friend const_iterator operator +(difference_type offset, const const_iterator& lhs)
+      {
+        const_iterator result(lhs);
+        result += offset;
+        return result;
+      }
+
       //***************************************************
       friend const_iterator operator -(const const_iterator& lhs, difference_type offset)
       {
@@ -2054,22 +2096,6 @@ namespace etl
       return distance(rhs, lhs);
     }
 
-    //*************************************************************************
-    /// - operator for reverse_iterator
-    //*************************************************************************
-    friend difference_type operator -(const reverse_iterator& lhs, const reverse_iterator& rhs)
-    {
-      return distance(lhs.base(), rhs.base());
-    }
-
-    //*************************************************************************
-    /// - operator for const_reverse_iterator
-    //*************************************************************************
-    friend difference_type operator -(const const_reverse_iterator& lhs, const const_reverse_iterator& rhs)
-    {
-      return distance(lhs.base(), rhs.base());
-    }
-
     //*************************************************************************
     /// Assignment operator.
     //*************************************************************************
diff --git a/test/test_deque.cpp b/test/test_deque.cpp
index 6aa6fbf3..de8981a0 100644
--- a/test/test_deque.cpp
+++ b/test/test_deque.cpp
@@ -29,6 +29,7 @@ SOFTWARE.
 #include "unit_test_framework.h"
 
 #include "etl/deque.h"
+#include "etl/vector.h"
 
 #include "data.h"
 
@@ -47,15 +48,15 @@ namespace
 {
   SUITE(test_deque)
   {
-    const size_t Size = 14UL;
+    const size_t SIZE = 14UL;
 
     typedef TestDataDC<std::string>  DC;
     typedef TestDataNDC<std::string> NDC;
 
-    typedef etl::deque<int, Size>    DataInt;
+    typedef etl::deque<int, SIZE>    DataInt;
     typedef etl::ideque<int>         IDataInt;
-    typedef etl::deque<DC, Size>     DataDC;
-    typedef etl::deque<NDC, Size>    DataNDC;
+    typedef etl::deque<DC, SIZE>     DataDC;
+    typedef etl::deque<NDC, SIZE>    DataNDC;
     typedef etl::ideque<NDC>         IDataNDC;
 
     typedef std::deque<NDC>          Compare_Data;
@@ -100,17 +101,26 @@ namespace
       CHECK(!data.full());
       CHECK(data.begin() == data.end());
       CHECK_EQUAL(0U, data.size());
-      CHECK_EQUAL(Size, data.max_size());
+      CHECK_EQUAL(SIZE, data.max_size());
     }
 
     //*************************************************************************
     TEST(test_constructor_fill)
     {
-      Compare_Data compare_data(Size, N999);
-      DataNDC data(Size, N999);
+      //Compare_Data compare_data(SIZE, N999);
+      //DataNDC data(SIZE, N999);
 
-      CHECK_EQUAL(compare_data.size(), data.size());
-      CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
+      etl::deque<int, 10> data;
+      using iter_type = etl::deque<int, 10>::iterator;
+
+      bool b1 = std::random_access_iterator<iter_type>;
+
+      bool b2 = std::sentinel_for<iter_type, iter_type>;
+
+      //bool b = std::equal(data.begin(), data.end(), data.begin());
+
+      //CHECK_EQUAL(compare_data.size(), data.size());
+      //CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
     }
 
     //*************************************************************************
@@ -118,8 +128,8 @@ namespace
     {
       int current_count = NDC::get_instance_count();
 
-      DataNDC* pdata = new DataNDC(Size, N999);
-      CHECK_EQUAL(int(current_count + Size), NDC::get_instance_count());
+      DataNDC* pdata = new DataNDC(SIZE, N999);
+      CHECK_EQUAL(int(current_count + SIZE), NDC::get_instance_count());
 
       IDataNDC* pidata = pdata;
       delete pidata;
@@ -129,7 +139,7 @@ namespace
     //*************************************************************************
     TEST(test_constructor_fill_excess)
     {
-      CHECK_THROW(DataNDC(Size + 1, N999), etl::deque_full);
+      CHECK_THROW(DataNDC(SIZE + 1, N999), etl::deque_full);
     }
 
     //*************************************************************************
@@ -167,7 +177,8 @@ namespace
     //*************************************************************************
     TEST(test_move_constructor)
     {
-      typedef etl::deque<std::unique_ptr<uint32_t>, Size> Data;
+      const size_t SIZE = 10UL;
+      typedef etl::deque<std::unique_ptr<uint32_t>, SIZE> Data;
 
       std::unique_ptr<uint32_t> p1(new uint32_t(1U));
       std::unique_ptr<uint32_t> p2(new uint32_t(2U));
@@ -195,7 +206,8 @@ namespace
     //*************************************************************************
     TEST(test_move_insert_erase)
     {
-      typedef etl::deque<std::unique_ptr<uint32_t>, Size> Data;
+      const size_t SIZE = 10UL;
+      typedef etl::deque<std::unique_ptr<uint32_t>, SIZE> Data;
 
       std::unique_ptr<uint32_t> p1(new uint32_t(1U));
       std::unique_ptr<uint32_t> p2(new uint32_t(2U));
@@ -247,7 +259,8 @@ namespace
     //*************************************************************************
     TEST(test_move_assignment)
     {
-      typedef etl::deque<std::unique_ptr<uint32_t>, Size> Data;
+      const size_t SIZE = 10UL;
+      typedef etl::deque<std::unique_ptr<uint32_t>, SIZE> Data;
 
       std::unique_ptr<uint32_t> p1(new uint32_t(1U));
       std::unique_ptr<uint32_t> p2(new uint32_t(2U));
@@ -291,7 +304,8 @@ namespace
     //*************************************************************************
     TEST(test_move_assignment_interface)
     {
-      typedef etl::deque<std::unique_ptr<uint32_t>, Size> Data;
+      const size_t SIZE = 10UL;
+      typedef etl::deque<std::unique_ptr<uint32_t>, SIZE> Data;
       typedef etl::ideque<std::unique_ptr<uint32_t>> IData;
 
       std::unique_ptr<uint32_t> p1(new uint32_t(1U));
@@ -362,9 +376,9 @@ namespace
       Compare_Data compare_data;
       DataNDC data;
 
-      compare_data.assign(Size, N999);
+      compare_data.assign(SIZE, N999);
 
-      CHECK_NO_THROW(data.assign(Size, N999));
+      CHECK_NO_THROW(data.assign(SIZE, N999));
 
       CHECK_EQUAL(compare_data.size(), data.size());
       CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
@@ -375,7 +389,7 @@ namespace
     {
       DataNDC data;
 
-      CHECK_THROW(data.assign(Size + 1, N999), etl::deque_full);
+      CHECK_THROW(data.assign(SIZE + 1, N999), etl::deque_full);
     }
 
     //*************************************************************************
@@ -535,7 +549,7 @@ namespace
     //*************************************************************************
     TEST(test_iterator_comparison)
     {
-      DataNDC data(Size, N0);
+      DataNDC data(SIZE, N0);
 
       DataNDC::iterator first  = data.begin() + 1;
       DataNDC::iterator second = data.begin() + 1;
@@ -575,7 +589,7 @@ namespace
     //*************************************************************************
     TEST(test_const_iterator_comparison)
     {
-      DataNDC data(Size, N0);
+      DataNDC data(SIZE, N0);
 
       DataNDC::const_iterator first  = data.begin() + 1;
       DataNDC::const_iterator second = data.begin() + 1;
@@ -615,7 +629,7 @@ namespace
     //*************************************************************************
     TEST(test_iterator_comparison_rollover_left)
     {
-      DataNDC data(Size, N0);
+      DataNDC data(SIZE, N0);
 
       data.pop_back();
       data.pop_back();
@@ -636,7 +650,7 @@ namespace
     //*************************************************************************
     TEST(test_const_iterator_comparison_rollover_left)
     {
-      DataNDC data(Size, N0);
+      DataNDC data(SIZE, N0);
 
       data.pop_back();
       data.pop_back();
@@ -657,7 +671,7 @@ namespace
     //*************************************************************************
     TEST(test_iterator_comparison_rollover_right)
     {
-      DataNDC data(Size, N0);
+      DataNDC data(SIZE, N0);
 
       data.pop_front();
       data.pop_front();
@@ -678,7 +692,7 @@ namespace
     //*************************************************************************
     TEST(test_const_iterator_comparison_rollover_right)
     {
-      DataNDC data(Size, N0);
+      DataNDC data(SIZE, N0);
 
       data.pop_front();
       data.pop_front();
@@ -696,10 +710,76 @@ namespace
       CHECK(!(second < first));
     }
 
+    //*************************************************************************
+    TEST(test_reverse_iterator_difference)
+    {
+      DataNDC data(SIZE, N0);
+
+      DataNDC::reverse_iterator first  = data.rbegin() + 1;
+      DataNDC::reverse_iterator second = data.rbegin() + 4;
+
+      CHECK_EQUAL(-3, first - second);
+      CHECK_EQUAL( 3, second - first);
+    }
+
+    //*************************************************************************
+    TEST(test_const_reverse_iterator_difference)
+    {
+      DataNDC data(SIZE, N0);
+
+      DataNDC::const_reverse_iterator first  = data.crbegin() + 1;
+      DataNDC::const_reverse_iterator second = data.crbegin() + 4;
+
+      CHECK_EQUAL(-3, first - second);
+      CHECK_EQUAL( 3, second - first);
+    }
+
+    //*************************************************************************
+    TEST(test_reverse_iterator_difference_rollover)
+    {
+      DataNDC data(SIZE, N0);
+
+      data.pop_back();
+      data.pop_back();
+      data.pop_back();
+      data.pop_back();
+      data.push_front(N1);
+      data.push_front(N1);
+      data.push_front(N1);
+      data.push_front(N1);
+
+      DataNDC::reverse_iterator first  = data.rbegin() + 1;
+      DataNDC::reverse_iterator second = data.rbegin() + 4;
+
+      CHECK_EQUAL(-3,  first - second);
+      CHECK_EQUAL( 3, second - first);
+    }
+
+    //*************************************************************************
+    TEST(test_const_reverse_iterator_difference_rollover)
+    {
+      DataNDC data(SIZE, N0);
+
+      data.pop_back();
+      data.pop_back();
+      data.pop_back();
+      data.pop_back();
+      data.push_front(N1);
+      data.push_front(N1);
+      data.push_front(N1);
+      data.push_front(N1);
+
+      DataNDC::const_reverse_iterator first  = data.crbegin() + 1;
+      DataNDC::const_reverse_iterator second = data.crbegin() + 4;
+
+      CHECK_EQUAL(-3,  first - second);
+      CHECK_EQUAL( 3, second - first);
+    }
+
     //*************************************************************************
     TEST(test_reverse_iterator_comparison)
     {
-      DataNDC data(Size, N0);
+      DataNDC data(SIZE, N0);
 
       DataNDC::reverse_iterator first  = data.rbegin() + 1;
       DataNDC::reverse_iterator second = data.rbegin() + 4;
@@ -711,7 +791,7 @@ namespace
     //*************************************************************************
     TEST(test_const_reverse_iterator_comparison)
     {
-      DataNDC data(Size, N0);
+      DataNDC data(SIZE, N0);
 
       DataNDC::const_reverse_iterator first  = data.crbegin() + 1;
       DataNDC::const_reverse_iterator second = data.crbegin() + 4;
@@ -723,7 +803,7 @@ namespace
     //*************************************************************************
     TEST(test_reverse_iterator_comparison_rollover_left)
     {
-      DataNDC data(Size, N0);
+      DataNDC data(SIZE, N0);
 
       data.pop_back();
       data.pop_back();
@@ -744,7 +824,7 @@ namespace
     //*************************************************************************
     TEST(test_const_reverse_iterator_comparison_rollover_left)
     {
-      DataNDC data(Size, N0);
+      DataNDC data(SIZE, N0);
 
       data.pop_back();
       data.pop_back();
@@ -765,7 +845,7 @@ namespace
     //*************************************************************************
     TEST(test_reverse_iterator_comparison_rollover_right)
     {
-      DataNDC data(Size, N0);
+      DataNDC data(SIZE, N0);
 
       data.pop_front();
       data.pop_front();
@@ -786,7 +866,7 @@ namespace
     //*************************************************************************
     TEST(test_const_reverse_iterator_comparison_rollover_right)
     {
-      DataNDC data(Size, N0);
+      DataNDC data(SIZE, N0);
 
       data.pop_front();
       data.pop_front();
@@ -816,7 +896,7 @@ namespace
     TEST(test_full)
     {
       DataDC data;
-      data.resize(Size);
+      data.resize(SIZE);
 
       CHECK(data.full());
     }
@@ -826,13 +906,13 @@ namespace
     {
       DataDC data;
 
-      data.resize(Size);
+      data.resize(SIZE);
       data.clear();
       CHECK(data.empty());
 
       // Do it again to check that clear() didn't screw up the internals.
-      data.resize(Size);
-      CHECK_EQUAL(Size, data.size());
+      data.resize(SIZE);
+      CHECK_EQUAL(SIZE, data.size());
       data.clear();
       CHECK(data.empty());
     }
@@ -842,12 +922,12 @@ namespace
     {
       DataInt data;
 
-      data.resize(Size);
+      data.resize(SIZE);
       data.clear();
       CHECK(data.empty());
 
       // Do it again to check that clear() didn't screw up the internals.
-      data.resize(Size);
+      data.resize(SIZE);
       data.clear();
       CHECK(data.empty());
     }
@@ -1008,18 +1088,18 @@ namespace
       };
 
       // First fill with Initial values.
-      etl::deque<S, Size> data;
-      data.resize(Size, S(Initial));
+      etl::deque<S, SIZE> data;
+      data.resize(SIZE, S(Initial));
       data.clear();
 
       // Then emplace Default values.
-      for (size_t i = 0; i < Size; ++i)
+      for (size_t i = 0; i < SIZE; ++i)
       {
         data.emplace(data.end());
       }
 
       // Compare with an array of default values.
-      std::array<S, Size> compare_data;
+      std::array<S, SIZE> compare_data;
       compare_data.fill(S());
 
       CHECK_TRUE(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
@@ -1052,18 +1132,18 @@ namespace
       };
 
       // First fill with Initial values.
-      etl::deque<S, Size> data;
-      data.resize(Size, S(Initial));
+      etl::deque<S, SIZE> data;
+      data.resize(SIZE, S(Initial));
       data.clear();
 
       // Then emplace Default values.
-      for (size_t i = 0; i < Size; ++i)
+      for (size_t i = 0; i < SIZE; ++i)
       {
         data.emplace_front();
       }
 
       // Compare with an array of default values.
-      std::array<S, Size> compare_data;
+      std::array<S, SIZE> compare_data;
       compare_data.fill(S());
 
       CHECK_TRUE(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
@@ -1096,18 +1176,18 @@ namespace
       };
 
       // First fill with Initial values.
-      etl::deque<S, Size> data;
-      data.resize(Size, S(Initial));
+      etl::deque<S, SIZE> data;
+      data.resize(SIZE, S(Initial));
       data.clear();
 
       // Then emplace Default values.
-      for (size_t i = 0; i < Size; ++i)
+      for (size_t i = 0; i < SIZE; ++i)
       {
         data.emplace_back();
       }
 
       // Compare with an array of default values.
-      std::array<S, Size> compare_data;
+      std::array<S, SIZE> compare_data;
       compare_data.fill(S());
 
       CHECK_TRUE(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
@@ -1116,7 +1196,7 @@ namespace
     //*************************************************************************
     TEST(test_insert_n_value_position)
     {
-      size_t max_insert = Size - initial_data_small.size();
+      size_t max_insert = SIZE - initial_data_small.size();
 
       for (size_t insert_size = 1UL; insert_size <= max_insert; ++insert_size)
       {
@@ -1139,7 +1219,7 @@ namespace
     {
       DataNDC data(initial_data_under.begin(), initial_data_under.end());
 
-      size_t insert_size = Size - initial_data_under.size() + 1;
+      size_t insert_size = SIZE - initial_data_under.size() + 1;
 
       CHECK_THROW(data.insert(data.cbegin(),     insert_size, N14), etl::deque_full);
       CHECK_THROW(data.insert(data.cend(),       insert_size, N14), etl::deque_full);
@@ -1149,7 +1229,7 @@ namespace
     //*************************************************************************
     TEST(test_insert_range)
     {
-      size_t max_insert = Size - initial_data_small.size();
+      size_t max_insert = SIZE - initial_data_small.size();
 
       for (size_t insert_size = 1UL; insert_size <= max_insert; ++insert_size)
       {
@@ -1639,7 +1719,7 @@ namespace
     {
       DataNDC data;
 
-      for (size_t i = 0UL; i < Size; ++i)
+      for (size_t i = 0UL; i < SIZE; ++i)
       {
         CHECK_NO_THROW(data.push_back(N0));
       }
@@ -1761,7 +1841,7 @@ namespace
     {
       DataNDC data;
 
-      for (size_t i = 0UL; i < Size; ++i)
+      for (size_t i = 0UL; i < SIZE; ++i)
       {
         CHECK_NO_THROW(data.push_front(N1));
       }
@@ -1869,7 +1949,7 @@ namespace
       data.push_back(DC("15"));
       data.push_back(DC("16"));
       data.push_back(DC("17"));
-      data.resize(Size);
+      data.resize(SIZE);
 
       compare_data.pop_front();
       compare_data.pop_front();
@@ -1881,9 +1961,9 @@ namespace
       compare_data.push_back(DC("15"));
       compare_data.push_back(DC("16"));
       compare_data.push_back(DC("17"));
-      compare_data.resize(Size);
+      compare_data.resize(SIZE);
 
-      CHECK_EQUAL(size_t(Size), data.size());
+      CHECK_EQUAL(size_t(SIZE), data.size());
       CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
     }
 
@@ -1904,7 +1984,7 @@ namespace
       data.push_back(DC("15"));
       data.push_back(DC("16"));
       data.push_back(DC("17"));
-      data.resize(Size / 2);
+      data.resize(SIZE / 2);
 
       compare_data.pop_front();
       compare_data.pop_front();
@@ -1916,7 +1996,7 @@ namespace
       compare_data.push_back(DC("15"));
       compare_data.push_back(DC("16"));
       compare_data.push_back(DC("17"));
-      compare_data.resize(Size / 2);
+      compare_data.resize(SIZE / 2);
 
       CHECK_EQUAL(compare_data.size(), data.size());
       CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
@@ -1930,9 +2010,9 @@ namespace
 
       data.push_front(N1);
       data.push_back(N2);
-      data.resize(Size, N3);
+      data.resize(SIZE, N3);
 
-      CHECK_EQUAL(size_t(Size), data.size());
+      CHECK_EQUAL(size_t(SIZE), data.size());
       CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
     }
 
@@ -1941,7 +2021,7 @@ namespace
     {
       DataDC data;
 
-      CHECK_THROW(data.resize(Size + 1), etl::deque_full);
+      CHECK_THROW(data.resize(SIZE + 1), etl::deque_full);
     }
 
     //*************************************************************************
@@ -2068,7 +2148,8 @@ namespace
     //*************************************************************************
     TEST(test_move)
     {
-      typedef etl::deque<std::unique_ptr<uint32_t>, Size> Data;
+      const size_t SIZE = 10UL;
+      typedef etl::deque<std::unique_ptr<uint32_t>, SIZE> Data;
 
       Data data1;
 
@@ -2085,7 +2166,7 @@ namespace
       data1.insert(data1.begin() + 1, std::move(p4));
       data1.insert(data1.end(),       std::move(p5));
 
-      const size_t ACTUAL_Size = data1.size();
+      const size_t ACTUAL_SIZE = data1.size();
 
       CHECK(!bool(p1));
       CHECK(!bool(p2));
@@ -2108,7 +2189,7 @@ namespace
       CHECK_EQUAL(2U, *(*(data2.begin() + 3)));
       CHECK_EQUAL(5U, *(*(data2.begin() + 4)));
 
-      CHECK_EQUAL(ACTUAL_Size, data2.size());
+      CHECK_EQUAL(ACTUAL_SIZE, data2.size());
 
       // Move assignment.
       Data data3;
@@ -2120,7 +2201,7 @@ namespace
       CHECK_EQUAL(2U, *(*(data3.begin() + 3)));
       CHECK_EQUAL(5U, *(*(data3.begin() + 4)));
 
-      CHECK_EQUAL(ACTUAL_Size, data3.size());
+      CHECK_EQUAL(ACTUAL_SIZE, data3.size());
     }
 
     //*************************************************************************

From 573333586fce9c337790250b439ee6b4768610c1 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 4 Mar 2024 12:55:03 +0000
Subject: [PATCH 057/131] Comment spelling fix

---
 include/etl/hfsm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/etl/hfsm.h b/include/etl/hfsm.h
index d61ac70b..c9ca12f3 100644
--- a/include/etl/hfsm.h
+++ b/include/etl/hfsm.h
@@ -55,7 +55,7 @@ namespace etl
     /// Can only be called once.
     /// Subsequent calls will do nothing.
     ///\param call_on_enter_state If true will call on_enter_state() for the first state. Default = true.
-    /// If the first state has child states then they will be recersively entered.
+    /// If the first state has child states then they will be recursively entered.
     //*******************************************
     void start(bool call_on_enter_state = true) ETL_OVERRIDE
     {

From 9a25ccbbae228ea04cd8ee5ae09baa9a3b8e4ec6 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 4 Mar 2024 12:55:22 +0000
Subject: [PATCH 058/131] Removed duplicated include

---
 include/etl/list.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/etl/list.h b/include/etl/list.h
index 07e51693..eefedf83 100644
--- a/include/etl/list.h
+++ b/include/etl/list.h
@@ -43,7 +43,6 @@ SOFTWARE.
 #include "type_traits.h"
 #include "algorithm.h"
 #include "memory.h"
-#include "iterator.h"
 #include "static_assert.h"
 #include "parameter_type.h"
 #include "placement_new.h"

From 2e6ecf620b7d3be9b3cfdcd0f1d167be77ae8872 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 4 Mar 2024 12:56:14 +0000
Subject: [PATCH 059/131] Updated initializer_list project file platform
 toolset

---
 test/etl_initializer_list/etl_initializer_list.vcxproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/etl_initializer_list/etl_initializer_list.vcxproj b/test/etl_initializer_list/etl_initializer_list.vcxproj
index 61eaaf3c..c20c4ed5 100644
--- a/test/etl_initializer_list/etl_initializer_list.vcxproj
+++ b/test/etl_initializer_list/etl_initializer_list.vcxproj
@@ -40,26 +40,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

From 9689b69d2f339d18cae07819bb1ddd4bd9b6e8f7 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 4 Mar 2024 12:57:02 +0000
Subject: [PATCH 060/131] Re-committed UML diagrams after HD crash

---
 uml/FSM example.png                | Bin 3455 -> 0 bytes
 uml/Framework.png                  | Bin 4445 -> 0 bytes
 uml/MessageFramework.png           | Bin 8529 -> 0 bytes
 uml/source/FSM example.zargo       | Bin 6601 -> 0 bytes
 uml/source/Message Framework.zargo | Bin 9028 -> 0 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/uml/FSM example.png b/uml/FSM example.png
index 4bc0bfbceb8125f54f47f1dc55a3690523b755ba..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
GIT binary patch
literal 0
HcmV?d00001

literal 3455
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
G|M@S9;2EI+

diff --git a/uml/Framework.png b/uml/Framework.png
index 3ff74411286880d0f68ad5ee8a7583c81ac117c4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
GIT binary patch
literal 0
HcmV?d00001

literal 4445
zcmcIoc{J4D`&YxLG@tq;OT813ElS7?LnEcBsbsJ0gEEX^8cQG9MZQ^vC@I^>knDpP
zSsTj`p|OrE6JrT6G4}O0eLClNe&_uD{+@I1eeQid&+EDO+<TvU@3|31x357C96!Lv
z#|J@O*Eiwg0|C7H)IJce)T^lC=LtbCl)+WOQ9;T5B2eq=#nwD%|HJDRo_u^KX}|NH
z1{X6^9>|Z;GtlGXD~=V~vKQdB0i#=HS9f=JS5{VLXJ@~E|K8WvN2Af|>+5++b@ewZ
zF|!(ce21G*`g&$Q-{w-Ie92OWpAMJruiX{Kck556wYZ_d7pFGM%Olh<&n2rVmCA?t
z_5M$CQ)^gSHiX}GzKzmAsVmb+D%0@rNwXqo5;mUA^zn~9AYgNIn0fueX97-#1~$ub
z|1B<1?+>73Pm1n?rr&roE|@UU8V#U94lmX!>_xd7>#I~Pn=Lo)x~oznj#RyS%rO96
z5`D=?zo&xHWxeW9GQiw%o71j5-)v`fY8-p*qZU$1K{}ooK3OT|c>yIH>*_Wy%5fJB
zD?boX^7rwO^dk&5GQe}Vj+K;oijh8Wp44zE=(!s0%(YYeMVsK5zxSOnjU;yQ*j)Gc
zztzUr;jV4^Qe}P8%|rp*rS?{F*pP;BySLqD5sKcqB;0J)69*7#i;eO=mVW}9<!m|T
zR{!P>o+hH2yhCL>)^cXecCahnxefdH%@t@!g6DA5<Fq&eG~<^$2%2uGF~WN0?tYL{
zqq}-y=&QWecsLrAYYGA|?cMh<a|<lwxL9}k+SlrtUSvfx(N|`vVh=R^Wo0pA)Suk7
zj~SfX6H82)HIq5Q4;ZETmc-T8sY>fn_Vnhc06Cjue_(iN+-pOPKd?5C&3$<7G;gxu
z5Ok>Qd@GJ0cS%u%Me49oX+pl~dr%Ny)Ca;{GC$+yG60-Tqj8tHKB7MoiSfN>Fa8jG
z5CT!is)ug0Ax&QlEpuk8E)~h-mfZ*4Tmp&Gz%NZKfbHZ*gI%YU%FaPBCo(^Q8<jS8
zv0nYy?fYN&pD^#|lVr-^LUc2!XQ)vbk#OhbSJ63_4o5{(Ph=*n5zmV4b9jC#5I9BI
z<C1t7a2@}r@V?Z0bGb!7d<f)vRT%T0&2kI)Nz&;pg}o!%L1@reqFM4@;Q6Bv$i55#
zsMIr2X0Vhc8uY~Z{{a!jH01^x^xMo;nMRdpKnL-Z!T(c&A4=ayx%yB0peR#()>Cv?
z18;?P%<r`D>aTVSAr>Pr3>$8_z<<-o+AViUBBiM)!l2p|f|KIB#IkM;ebe-d)s<T~
z*U`6zJ9sl{x+XgDKG}*kMJ&|@BL2~Yl`;l)71pbAM2lw-A<L;bU%a~uzH{jVsYH2Z
zOKZcR0hxP)$cdk6rVHb4N!6u=m&S>+WM#h~9oN<-(K70XT%c)avY|DFafU(|JG<HN
zy^4$dauW7s(YL#O(+xK1wLpz4W<_yF9u4eDund~O*8=*(!2kh2APHs>ii@`g2Yqn%
zF?Ho8@8>+~Lx}}nO`xx9Zr9UCtlO(TCN)j>%prX3XyT6eH>3|2-Hk5r_dQ#Y95|QP
zAwr>9vC8B=A=M<N)|#;Hcd~0&8Fvh8H3ijI7H*3Glfo?BcfZ3?@hve0p6C=>Q|lTq
zUd$k}#{-X4_q#|7)%E_JS~(cC>20L#-dHP72V>8_8GjvFSL;f=Phq@Zk8CO`6nzi8
z;WhNo*ENXqrsnqh7=-+EkE)1w2H{cdXb|;j>~j7Lo!GZgxE$w1R%&h-P^cgsnawTm
zs(*K*U}DO+0XeoeA!z7B>_p=~oL|i%=jY)VCZ>AX#x=uf2tDqj2?$KVio>rgK~^fJ
zZKZP08z*?ukVU@+N77d!_d-+ZlV+=+UZd+^STncSKHqlidOw^6kAW$@IM*?7Q4lt-
zr6n?Q%<hS~cQMU~RrXe?(3Id|T~E(G(*-v4aB(6N+D`}%ZR;7;qPB)D12MZY(py&*
zokA1Y^#qyh#_j|fxVOfqf6)@Ow5)r&-tOqD&9P<MHacYEz~WAg-#XJMc*Q;xHoe0}
zI(&CNTUWYkoD{`VmXw|G?lSd=c&3<Fo>^78u!Yba{iE(ekRqKN2`YGa9{t?usV2Zg
zY!RoNEtYH9#`ziaa?(*oXK<j7itnfri!WtEa)cl_WqFw9AMFQ9oM&vGPv~BPqO!*+
ztu#&!bp#a~Gy5OTWiazQk@Qb&AAYS-)qL@?8dD)JG<Q*ZQ&JX!8y_LJ>%3FLh{e;u
z%$ANTDa6`UXVdkx!a)@mifTyXfOFk7E3XEuGSJf-{9!*O?(Sqc`}3I?F~Wz$Fk^dY
zC5vn@;aBPI_rdTK;uktJ=N5aX<?PtDYc64;LnB&@y+X`dj<39?)QMc?9{j2FU|zP=
zio#esv2V4yEA=ozU-glWAH;J=rku?D3vyAsX*Oa+1>@H?4Mc6O_gu6T!13R$aS+0c
z)ox4DL`g|j6k~IITd^DETS-w(e^y&~8J!*uH09ZEv^smin(oSHs|o}-?!D@(n`-^u
z<P-h!oOypzM3KW!Z)($7=KCC2UYG)~l5_!RV~BqqGaR^=QKblXXWrTnGX;fjx3e2i
zGbanqK^IAwU;?>t<P~}_z<xWil36h-dMt3f_k453s9sPXOwK5pBkvelo;QLoV295t
zLD45zTB(+45o7GG7;hso-B*aJ5hyg2I9g$kKL#EA)MW8sl7tVV4v9At^)GTGW?x6b
z(Q+}#)0U`W<M(3_xNhj{tdVEE`3Jl&AA_GTj+{N;TM^mOR8w*7UZ;GG_nobHH`ks<
zWE1xwb{_A)t&=9OL9{B_;I9AJ`sw@1mwQL(<ji<sg@nUXQ@J6N6aN`~&nDVtO#x92
z^o6&O>!^#l7;@&rlft{TwL(i&*bV5~&iq!#3-{%|CJP;(Hr3vp)Sw`l7zedL4tAD~
z{2Xwj544l6B62sNX89w_Z$3YP7?|LB4C?!)MLp-hU*=Ahi+n(X!`(M67jkkgVi&t!
z{%6Vh3WagU3||CEa}r~Ui&eGi7hb&zF^Nkk*ZD-JFwNyW&Yr<OkIertu?HI7RHzm=
zXJi=F!_HKVjiS)JT<ve!1QQiA(;)MYg}piA;>li*v}`35;*QG{JXXNSc<$)0R7b?G
z9~qw9QZ-!Z?i0PXZs9leHicNdE-b*6yD{R@=hh*~xv%Sui)K{jr^@K~FyB9Toh>w{
zj?WlO(VhGp_>HNMPqo}GVZegxlEc-%FrGe2f-&&_vfOYld#ws=YZku2!l=n--V`~#
z&Jr?L#b0*sAVHyYXPXTY;S0yKsd_(6D~NjEu`Dq6l>z{thX}>kz?`n=o+vq(hrZ(R
zvr-1gqnarhhno)pq7&S3Tz(_|jBML^CLe&6o$anVt!ye#;y)5g)L5*7=b-QHY!svj
zQ{I}x{abD85+thJo9Qz*zI8+}S~!kbZv(DB{`$Ns?C6yR)%T(HkU0=8I>8tEa;@hp
z;uHNIiu%#QAL}g1yD&2chm;W-9}ZDe?{vAji;|9i6J&}jO+#T(hLE|?wkuP+?M}C*
zFjr&ay^@ogrm~nn=1RHRU?i%ty?sm=cl0G|efR?T^zfw9!hYz1R?gP#Qsa1c&(bx1
zKwu)2XtmA{tUm}Q`u(r0mImm)bCp^)M)((Ac6w9(f>8GfZafahxi-wZne?ikzW(OE
z`4?`ebxL;Np2G2=ON<pmH)_DYW-~bdoldidw;nt(PjMsM%DPnJ-*Le%gIh5g=z7Gl
zVeF8c=DW%y!<AL2cZ!PYBrjSRn%XR>S`d)<>vIRPdHsmQz;)~NNZag;y5E@MdabTv
zk;ueRx4qE9QDI!>-G4f0>L<N_x4N|(Zb6fKKwy;?<l}WT`v}5dDYj<=En|sbR)iT&
zMTBsGCQf&^BmC;Gg4Kqzhj78fsI{eL;x@9MKv=xTAj#XmN`D&yp%6q!M}a86$K4i;
zkLqCPk3||?)*n0t&{OTO0gwIdSF9XpdLq1qzPo@*jRN9{PZ94H+du%CEsb!T0&e<`
zxtuQ@RNVV-2g-<dYJ)lvo7UN93j8Pp2#H#)V*Ae9LWufF-RIn>dVq|MV|-Z620!jk
zxIZA@U!LNIV5m0rQxeU@AUl@8h9A}MGnmElnVgdKABiKX6}0ITgz0jR@k4p<v;q>W
zTNxD!F^0Z#k(V&Jt3o-|K%Y6w$+YkQ1JbznKGdq0PN-wJV93XDZz0@u%3JpEyh)O*
zqYKo79ZH;aeii+cH2g{z@9+fk>%ObE2E6)%6RIMy^UJ#M09VepBk{TK{10Wf@xsTe
zi*H~-8R(Hl{?0As-hZLCjUH9}UYr!(8<FrOnGa~ON;Q<_%6$Sa_D!0$Rqv;SR41&P
zdE&)+CJzv_aNIYCBw4%`$#)(S3K=hGlV`rpA`WTbRY{SP2Ejapk?pmW_?!O26uxs4
z4SMXlq$sf~%k!hL@iJ!j2=mg&@qio6LHl_QiHIzA9Y6Fr6-nw^u-nV)oNPF~rV{es
zaPvYvaCERzYg{MdgBQE2KMJUpU%7*@7!aQy(KMvYORy9I>U>raAvt!>XR5GW1%=tq
zfIZL@n4}km%=Qya@+Ur{eO0->Y@^ov({a;HddE`%kYIIokGtw03=h=H<s5NvbgnaK
z6a+wvldU$`-F?M+<?SrTf)uv~-N+Z3_GEgP7Hc2w$BNb-K&~^UUzsX7w=ip<JO#L5
z$mQDSr)DV=^FK)&g|1d%59FBWm}!5}zT>^nSkhoQ{^p=0sWVoxIk6d8{M6iCIWRP$
z^AH=CROshYwuBnJHZC}X>+!p|V)8ZhH`RqIn%g&qJ7F6=5UIJNiD1IiNOD!m7$G(;
z!GX-=7tyd;?ZQsKctRWjj^`aMAKJcSHc^%YnSV{{tR{AB&ZS$N6w15Vfo{k#sBE7s
zjeAhfgoOPtkViL^kcK6`)_gTSaCct+kk$OM=H+imUyQL}z+W}Cv*oPPfDcU1^8zxN
z$mYWnL|5k3CQk=O?Z-@fj>(y+0$p(%_dc9D(6Wp@n>^r5oKC|ZrPy~|tPtT40e1o9
zjYv9PwU~cD+*?Nrh@1cP9FTA=ov^J(=Fh^**%-3)J1uDY43)UqNmFf=XV^ThYL(o~
zSg^X~Gdk%=F40bJhUD#qr{a(Lm93gUcte`&8|%0H;Z)QNf%|>1joH)kGyB4dR%gif
z%gW`_`Q{l5c?ROTDW(}7(4<OGhL~ka>hLt&y!dXN!DJ~-qI>fT%i~wT^m*`n)ZpX(
zWz;724i#;eJ=Qkt(p+XMHmg||&6_j2EvumHtHEmdv7zccfXtuekA6>jnY?iF6a88B
zM-M@upLhuBwaE{7EYQN;N$4x*5X`T0!nl?uL7+0=3FPA%`U=&Ma!O2+w?Xzp$Hzh;
z!@Ov-_NTlZ%*I0Lv#J+%Qb{xrG->GfG2^)WFl|qd_6}RR)BVMaSf<WjIi#>;-dRJQ
z(9tgR^UvzsI>C@9ED4ze^sgb3^XTb!Ak#0zHw1EOZ>D!T<*M#`BK2=duh;<vyC}(T
Un7|ZxUmJX=tGD$FFQcFQ53fJyxBvhE

diff --git a/uml/MessageFramework.png b/uml/MessageFramework.png
index a4b8a42443b4f76ba717ca9a36619dd9adf731d1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
GIT binary patch
literal 0
HcmV?d00001

literal 8529
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
bo68MfdN9>5n~(f1h_X6*@<`4hw}1T`Tg;Co

diff --git a/uml/source/FSM example.zargo b/uml/source/FSM example.zargo
index 89bfb9b50f952d480def9bed304673e8a1b15066..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
GIT binary patch
literal 0
HcmV?d00001

literal 6601
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
b!*~!q>dL4O<%58L@o)(~{8(?&UvK{dEVH1<

diff --git a/uml/source/Message Framework.zargo b/uml/source/Message Framework.zargo
index f874146ed6811dd854cf1574f94efac19806f1fc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
GIT binary patch
literal 0
HcmV?d00001

literal 9028
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
D-&TvI


From 7f13eeb06cfff2965eaa8a4e41ec12d0be3c25b9 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 4 Mar 2024 12:54:05 +0000
Subject: [PATCH 061/131] Added fixes for deque operator-(). Removed redundant
 operator that was causing compile errors for C++20

# Conflicts:
#	test/test_deque.cpp
---
 include/etl/circular_buffer.h | 52 +++++++++++++++-------
 include/etl/deque.h           | 70 ++++++++++++++++++++---------
 test/test_deque.cpp           | 84 +++++++++++++++++++++++++++++++++--
 3 files changed, 164 insertions(+), 42 deletions(-)

diff --git a/include/etl/circular_buffer.h b/include/etl/circular_buffer.h
index a099ca4a..a2f67a1a 100644
--- a/include/etl/circular_buffer.h
+++ b/include/etl/circular_buffer.h
@@ -246,6 +246,22 @@ namespace etl
         return &picb->pbuffer[current];
       }
 
+      //*************************************************************************
+      /// [] operator
+      //*************************************************************************
+      reference operator [](size_t index)
+      {
+        return pbuffer[(current + index) % picb->buffer_size];
+      }
+
+      //*************************************************************************
+      /// [] operator
+      //*************************************************************************
+      const_reference operator [](size_t index) const
+      {
+        return pbuffer[(current + index) % picb->buffer_size];
+      }
+
       //*************************************************************************
       /// Pre-increment.
       //*************************************************************************
@@ -335,6 +351,18 @@ namespace etl
         return temp;
       }
 
+      //*************************************************************************
+      /// Add offset.
+      //*************************************************************************
+      friend iterator operator +(int n, const iterator& rhs)
+      {
+        iterator temp = rhs;
+
+        temp += n;
+
+        return temp;
+      }
+
       //*************************************************************************
       /// Subtract offset.
       //*************************************************************************
@@ -517,6 +545,14 @@ namespace etl
         return &(picb->pbuffer[current]);
       }
 
+      //*************************************************************************
+      /// [] operator
+      //*************************************************************************
+      const_reference operator [](size_t index) const
+      {
+        return pbuffer[(current + index) % picb->buffer_size];
+      }
+
       //*************************************************************************
       /// Pre-increment.
       //*************************************************************************
@@ -998,22 +1034,6 @@ namespace etl
       return distance(rhs, lhs);
     }
 
-    //*************************************************************************
-    /// - operator for reverse_iterator
-    //*************************************************************************
-    friend difference_type operator -(const reverse_iterator& lhs, const reverse_iterator& rhs)
-    {
-      return distance(lhs.base(), rhs.base());
-    }
-
-    //*************************************************************************
-    /// - operator for const_reverse_iterator
-    //*************************************************************************
-    friend difference_type operator -(const const_reverse_iterator& lhs, const const_reverse_iterator& rhs)
-    {
-      return distance(lhs.base(), rhs.base());
-    }
-
   protected:
 
     //*************************************************************************
diff --git a/include/etl/deque.h b/include/etl/deque.h
index 8a11063e..e38c939d 100644
--- a/include/etl/deque.h
+++ b/include/etl/deque.h
@@ -41,7 +41,6 @@ SOFTWARE.
 #include "debug_count.h"
 #include "algorithm.h"
 #include "type_traits.h"
-#include "iterator.h"
 #include "placement_new.h"
 #include "initializer_list.h"
 
@@ -258,17 +257,17 @@ namespace etl
 
       //***************************************************
       iterator(const iterator& other)
-        : index(other.index),
-        p_deque(other.p_deque),
-        p_buffer(other.p_buffer)
+        : index(other.index)
+        , p_deque(other.p_deque)
+        , p_buffer(other.p_buffer)
       {
       }
 
       //***************************************************
       iterator& operator =(const iterator& other)
       {
-        index = other.index;
-        p_deque = other.p_deque;
+        index    = other.index;
+        p_deque  = other.p_deque;
         p_buffer = other.p_buffer;
 
         return *this;
@@ -352,6 +351,24 @@ namespace etl
         return &p_buffer[index];
       }
 
+      //***************************************************
+      reference operator [](size_t index)
+      {
+        iterator result(*this);
+        result += index;
+
+        return *result;
+      }
+
+      //***************************************************
+      const_reference operator [](size_t index) const
+      {
+        iterator result(*this);
+        result += index;
+
+        return *result;
+      }
+
       //***************************************************
       friend iterator operator +(const iterator& lhs, difference_type offset)
       {
@@ -360,6 +377,14 @@ namespace etl
         return result;
       }
 
+      //***************************************************
+      friend iterator operator +(difference_type offset, const iterator& lhs)
+      {
+        iterator result(lhs);
+        result += offset;
+        return result;
+      }
+
       //***************************************************
       friend iterator operator -(const iterator& lhs, difference_type offset)
       {
@@ -596,6 +621,15 @@ namespace etl
         return &p_buffer[index];
       }
 
+      //***************************************************
+      reference operator [](size_t index)
+      {
+        iterator result(*this);
+        result += index;
+
+        return *result;
+      }
+
       //***************************************************
       friend const_iterator operator +(const const_iterator& lhs, difference_type offset)
       {
@@ -604,6 +638,14 @@ namespace etl
         return result;
       }
 
+      //***************************************************
+      friend const_iterator operator +(difference_type offset, const const_iterator& lhs)
+      {
+        const_iterator result(lhs);
+        result += offset;
+        return result;
+      }
+
       //***************************************************
       friend const_iterator operator -(const const_iterator& lhs, difference_type offset)
       {
@@ -2054,22 +2096,6 @@ namespace etl
       return distance(rhs, lhs);
     }
 
-    //*************************************************************************
-    /// - operator for reverse_iterator
-    //*************************************************************************
-    friend difference_type operator -(const reverse_iterator& lhs, const reverse_iterator& rhs)
-    {
-      return distance(lhs.base(), rhs.base());
-    }
-
-    //*************************************************************************
-    /// - operator for const_reverse_iterator
-    //*************************************************************************
-    friend difference_type operator -(const const_reverse_iterator& lhs, const const_reverse_iterator& rhs)
-    {
-      return distance(lhs.base(), rhs.base());
-    }
-
     //*************************************************************************
     /// Assignment operator.
     //*************************************************************************
diff --git a/test/test_deque.cpp b/test/test_deque.cpp
index 42db7899..de8981a0 100644
--- a/test/test_deque.cpp
+++ b/test/test_deque.cpp
@@ -29,6 +29,7 @@ SOFTWARE.
 #include "unit_test_framework.h"
 
 #include "etl/deque.h"
+#include "etl/vector.h"
 
 #include "data.h"
 
@@ -106,11 +107,20 @@ namespace
     //*************************************************************************
     TEST(test_constructor_fill)
     {
-      Compare_Data compare_data(SIZE, N999);
-      DataNDC data(SIZE, N999);
+      //Compare_Data compare_data(SIZE, N999);
+      //DataNDC data(SIZE, N999);
 
-      CHECK_EQUAL(compare_data.size(), data.size());
-      CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
+      etl::deque<int, 10> data;
+      using iter_type = etl::deque<int, 10>::iterator;
+
+      bool b1 = std::random_access_iterator<iter_type>;
+
+      bool b2 = std::sentinel_for<iter_type, iter_type>;
+
+      //bool b = std::equal(data.begin(), data.end(), data.begin());
+
+      //CHECK_EQUAL(compare_data.size(), data.size());
+      //CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
     }
 
     //*************************************************************************
@@ -700,6 +710,72 @@ namespace
       CHECK(!(second < first));
     }
 
+    //*************************************************************************
+    TEST(test_reverse_iterator_difference)
+    {
+      DataNDC data(SIZE, N0);
+
+      DataNDC::reverse_iterator first  = data.rbegin() + 1;
+      DataNDC::reverse_iterator second = data.rbegin() + 4;
+
+      CHECK_EQUAL(-3, first - second);
+      CHECK_EQUAL( 3, second - first);
+    }
+
+    //*************************************************************************
+    TEST(test_const_reverse_iterator_difference)
+    {
+      DataNDC data(SIZE, N0);
+
+      DataNDC::const_reverse_iterator first  = data.crbegin() + 1;
+      DataNDC::const_reverse_iterator second = data.crbegin() + 4;
+
+      CHECK_EQUAL(-3, first - second);
+      CHECK_EQUAL( 3, second - first);
+    }
+
+    //*************************************************************************
+    TEST(test_reverse_iterator_difference_rollover)
+    {
+      DataNDC data(SIZE, N0);
+
+      data.pop_back();
+      data.pop_back();
+      data.pop_back();
+      data.pop_back();
+      data.push_front(N1);
+      data.push_front(N1);
+      data.push_front(N1);
+      data.push_front(N1);
+
+      DataNDC::reverse_iterator first  = data.rbegin() + 1;
+      DataNDC::reverse_iterator second = data.rbegin() + 4;
+
+      CHECK_EQUAL(-3,  first - second);
+      CHECK_EQUAL( 3, second - first);
+    }
+
+    //*************************************************************************
+    TEST(test_const_reverse_iterator_difference_rollover)
+    {
+      DataNDC data(SIZE, N0);
+
+      data.pop_back();
+      data.pop_back();
+      data.pop_back();
+      data.pop_back();
+      data.push_front(N1);
+      data.push_front(N1);
+      data.push_front(N1);
+      data.push_front(N1);
+
+      DataNDC::const_reverse_iterator first  = data.crbegin() + 1;
+      DataNDC::const_reverse_iterator second = data.crbegin() + 4;
+
+      CHECK_EQUAL(-3,  first - second);
+      CHECK_EQUAL( 3, second - first);
+    }
+
     //*************************************************************************
     TEST(test_reverse_iterator_comparison)
     {

From 37ac046068165a8cc8128fb8befe24235c450f6c Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 4 Mar 2024 18:41:33 +0000
Subject: [PATCH 062/131] Added fixes for deque operator-(). Removed redundant
 operator that was causing compile errors for C++20

# Conflicts:
#	test/test_deque.cpp
---
 test/test_deque.cpp | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/test/test_deque.cpp b/test/test_deque.cpp
index de8981a0..41edb13c 100644
--- a/test/test_deque.cpp
+++ b/test/test_deque.cpp
@@ -107,20 +107,11 @@ namespace
     //*************************************************************************
     TEST(test_constructor_fill)
     {
-      //Compare_Data compare_data(SIZE, N999);
-      //DataNDC data(SIZE, N999);
+      Compare_Data compare_data(SIZE, N999);
+      DataNDC data(SIZE, N999);
 
-      etl::deque<int, 10> data;
-      using iter_type = etl::deque<int, 10>::iterator;
-
-      bool b1 = std::random_access_iterator<iter_type>;
-
-      bool b2 = std::sentinel_for<iter_type, iter_type>;
-
-      //bool b = std::equal(data.begin(), data.end(), data.begin());
-
-      //CHECK_EQUAL(compare_data.size(), data.size());
-      //CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
+      CHECK_EQUAL(compare_data.size(), data.size());
+      CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
     }
 
     //*************************************************************************

From c6dc700cf3c6ba7d245c4aa8b925f0dbf05b61e9 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Thu, 22 Feb 2024 19:04:57 +0000
Subject: [PATCH 063/131] Added message type traits

---
 include/etl/message.h        |  84 ++++++++++++++++++++++++-
 include/etl/message_packet.h |  96 +++++++++++++++++++---------
 test/test_message.cpp        | 117 +++++++++++++++++++++++++++++++++++
 test/test_message_packet.cpp |   3 +-
 test/vs2022/etl.vcxproj      |   1 +
 5 files changed, 268 insertions(+), 33 deletions(-)
 create mode 100644 test/test_message.cpp

diff --git a/include/etl/message.h b/include/etl/message.h
index 22a802e6..efd87210 100644
--- a/include/etl/message.h
+++ b/include/etl/message.h
@@ -62,6 +62,8 @@ namespace etl
     }
   };
 
+  class message_tag {};
+
 #if ETL_HAS_VIRTUAL_MESSAGES
   //***************************************************************************
   /// Message interface.
@@ -85,10 +87,14 @@ namespace etl
   /// Virtual.
   //***************************************************************************
   template <etl::message_id_t ID_, typename TBase = etl::imessage>
-  class message : public TBase
+  class message : public TBase, public etl::message_tag
   {
   public:
 
+    ETL_STATIC_ASSERT((etl::is_base_of<etl::imessage, TBase>::value), "TBase is not derived from etl::imessage");
+
+    typedef TBase base_type;
+
     //***********************************
     ETL_NODISCARD virtual etl::message_id_t get_message_id() const ETL_NOEXCEPT ETL_OVERRIDE
     {
@@ -149,12 +155,14 @@ namespace etl
   /// Non-virtual.
   //***************************************************************************
   template <etl::message_id_t ID_, typename TBase = etl::imessage>
-  class message : public TBase
+  class message : public TBase, public etl::message_tag
   {
   public:
 
     ETL_STATIC_ASSERT((etl::is_base_of<etl::imessage, TBase>::value), "TBase is not derived from etl::imessage");
 
+    typedef TBase base_type;
+
     //***********************************
     message() ETL_NOEXCEPT
       : TBase(ID)
@@ -183,6 +191,78 @@ namespace etl
   //***************************************************************************
   template <etl::message_id_t ID_, typename TBase>
   ETL_CONSTANT etl::message_id_t etl::message<ID_, TBase>::ID;
+
+  //***************************************************************************
+  /// Is T an etl::imessage?
+  //***************************************************************************
+  template <typename T>
+  struct is_imessage : public etl::bool_constant<etl::is_same<etl::imessage, typename etl::remove_cvref<T>::type>::value>
+  {
+  };
+
+  //***************************************************************************
+  /// Is T ultimately derived from etl::imessage?
+  //***************************************************************************
+  template <typename T>
+  struct is_message : public etl::bool_constant<etl::is_base_of<etl::imessage, typename etl::remove_cvref<T>::type>::value>
+  {
+  };
+
+  //***************************************************************************
+  /// Is T derived from etl::message<>
+  //***************************************************************************
+  template <typename T>
+  struct is_message_type : public etl::bool_constant<etl::is_base_of<etl::message_tag, typename etl::remove_cvref<T>::type>::value>
+  {
+  };
+
+  //***************************************************************************
+  /// Is T a base of etl::message<T>
+  //***************************************************************************
+  template <typename T>
+  struct is_message_base : public etl::bool_constant<etl::is_message<T>::value && !is_message_type<T>::value>
+  {
+  };
+
+  //***************************************************************************
+  /// Is T a user defined base of etl::message<T>
+  //***************************************************************************
+  template <typename T>
+  struct is_user_message_base : public etl::bool_constant<etl::is_message_base<T>::value && !is_imessage<T>::value>
+  {
+  };
+
+#if ETL_USING_CPP17
+  //***************************************************************************
+  /// Is T an etl::imessage?
+  //***************************************************************************
+  template <typename T>
+  inline constexpr bool is_imessage_v = is_imessage<T>::value;
+
+  //***************************************************************************
+  /// Is T ultimately derived from etl::imessage?
+  //***************************************************************************
+  template <typename T>
+  inline constexpr bool is_message_v = is_message<T>::value;
+
+  //***************************************************************************
+  /// Is T derived from etl::message<>
+  //***************************************************************************
+  template <typename T>
+  inline constexpr bool is_message_type_v = is_message_type<T>::value;
+
+  //***************************************************************************
+  /// Is T a base of etl::message<T>
+  //***************************************************************************
+  template <typename T>
+  inline constexpr bool is_message_base_v = is_message_base<T>::value;
+
+  //***************************************************************************
+  /// Is T a user defined base of etl::message<T>
+  //***************************************************************************
+  template <typename T>
+  inline constexpr bool is_user_message_base_v = is_user_message_base<T>::value;
+#endif
 }
 
 #endif
diff --git a/include/etl/message_packet.h b/include/etl/message_packet.h
index 80a56165..da5141e3 100644
--- a/include/etl/message_packet.h
+++ b/include/etl/message_packet.h
@@ -76,18 +76,25 @@ namespace etl
 
   private:
 
-    template <typename T>
-    static constexpr bool IsMessagePacket = etl::is_same_v< etl::remove_const_t<etl::remove_reference_t<T>>, etl::message_packet<TMessageTypes...>>;
+    using ThisPacketType = etl::message_packet<TMessageTypes...>;
 
     template <typename T>
-    static constexpr bool IsInMessageList = etl::is_one_of_v<etl::remove_const_t<etl::remove_reference_t<T>>, TMessageTypes...>;
+    static constexpr bool IsMessagePacket = etl::is_same_v<remove_cvref_t<T>, ThisPacketType>;
 
     template <typename T>
-    static constexpr bool IsIMessage = etl::is_same_v<remove_const_t<etl::remove_reference_t<T>>, etl::imessage>;
+    static constexpr bool IsInMessageList = etl::is_one_of_v<etl::remove_cvref_t<T>, TMessageTypes...>;
+
+    template <typename T>
+    static constexpr bool IsIMessage = etl::is_same_v<etl::remove_cvref_t<T>, etl::imessage>;   
+
+    template <typename T>
+    static constexpr bool IsDerivedFromIMessage = etl::is_base_of_v<etl::imessage, etl::remove_cvref_t<T>>;
 
   public:
 
     //********************************************
+    /// Default constructor
+    //********************************************
 #include "private/diagnostic_uninitialized_push.h"
     message_packet()
       : valid(false)
@@ -95,7 +102,9 @@ namespace etl
     }
 #include "private/diagnostic_pop.h"
 
-    //**********************************************
+    //********************************************
+    /// Copy constructor
+    //********************************************
 #include "private/diagnostic_uninitialized_push.h"
     message_packet(const message_packet& other)
       : valid(other.is_valid())
@@ -107,7 +116,9 @@ namespace etl
     }
 #include "private/diagnostic_pop.h"
 
-    //**********************************************
+    //********************************************
+    /// Move constructor
+    //********************************************
 #include "private/diagnostic_uninitialized_push.h"
     message_packet(message_packet&& other)
       : valid(other.is_valid())
@@ -119,36 +130,61 @@ namespace etl
     }
 #include "private/diagnostic_pop.h"
 
+#include "private/diagnostic_uninitialized_push.h"
     //********************************************
     ///
     //********************************************
-#include "private/diagnostic_uninitialized_push.h"
-    template <typename T, typename = typename etl::enable_if<IsIMessage<T> || IsInMessageList<T>>::type>
-    explicit message_packet(T&& msg)
+    explicit message_packet(const etl::imessage& msg)
       : valid(true)
     {
-      if constexpr (IsIMessage<T>)
+      if (accepts(msg))
       {
-        if (accepts(msg))
-        {
-          add_new_message(etl::forward<T>(msg));
-          valid = true;
-        }
-        else
-        {
-          valid = false;
-        }
-
-        ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-      }
-      else if constexpr (IsInMessageList<T>)
-      {
-        add_new_message_type<T>(etl::forward<T>(msg));
+        add_new_message(msg);
+        valid = true;
       }
       else
       {
-        ETL_STATIC_ASSERT(IsInMessageList<T>, "Message not in packet type list");
+        valid = false;
       }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+#include "private/diagnostic_pop.h"
+
+#include "private/diagnostic_uninitialized_push.h"
+    //********************************************
+    ///
+    //********************************************
+    explicit message_packet(etl::imessage&& msg)
+      : valid(true)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+#include "private/diagnostic_pop.h"
+
+#include "private/diagnostic_uninitialized_push.h"
+    //********************************************
+    /// Enabled for types that are not a message packet or etl::imessage
+    /// Invokes a static assert for types not in the message type list.
+    //********************************************
+    template <typename T, typename = etl::enable_if_t<!IsMessagePacket<T> &&
+                                                      !IsIMessage<T>, int>>
+      explicit message_packet(T&& msg)
+      : valid(true)
+    {
+      ETL_STATIC_ASSERT(IsInMessageList<T>, "Message type not in packet type list");
+
+      add_new_message_type(etl::forward<T>(msg));
     }
 #include "private/diagnostic_pop.h"
 
@@ -250,7 +286,7 @@ namespace etl
     //**********************************************
     template <typename TMessage>
     static ETL_CONSTEXPR
-      typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+    typename etl::enable_if_t<etl::is_base_of_v<etl::imessage, TMessage>, bool>
       accepts()
     {
       return accepts<TMessage::ID>();
@@ -258,7 +294,7 @@ namespace etl
 
     enum
     {
-      SIZE = etl::largest<TMessageTypes...>::size,
+      SIZE      = etl::largest<TMessageTypes...>::size,
       ALIGNMENT = etl::largest<TMessageTypes...>::alignment
     };
 
@@ -308,11 +344,11 @@ namespace etl
     /// Only enabled for types that are in the typelist.
     //********************************************
     template <typename TMessage>
-    etl::enable_if_t<etl::is_one_of_v<etl::remove_const_t<etl::remove_reference_t<TMessage>>, TMessageTypes...>, void>
+    etl::enable_if_t<IsInMessageList<TMessage>>
       add_new_message_type(TMessage&& msg)
     {
       void* p = data;
-      new (p) etl::remove_reference_t<TMessage>((etl::forward<TMessage>(msg)));
+      new (p) etl::remove_cvref_t<TMessage>((etl::forward<TMessage>(msg)));
     }
 #include "private/diagnostic_pop.h"
 
diff --git a/test/test_message.cpp b/test/test_message.cpp
new file mode 100644
index 00000000..8ce9afa8
--- /dev/null
+++ b/test/test_message.cpp
@@ -0,0 +1,117 @@
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+https://github.com/ETLCPP/etl
+https://www.etlcpp.com
+
+Copyright(c) 2024 John Wellbelove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+******************************************************************************/
+
+#include "unit_test_framework.h"
+
+#include "etl/message.h"
+
+SUITE(test_message)
+{
+  //*************************************************************************
+  TEST(test_message_traits)
+  {
+    // imessage
+    //   ^
+    // MessageBase 
+    //   ^
+    // etl::message<I, MessageBase>
+    //   ^
+    // Message
+
+    //             | is_imessage | is_message | is_message_type | is_message_base | is_user_message_base
+    // imessage    |     T       |     T      |     F           |     T           |     F
+    // MessageBase |     F       |     T      |     F           |     T           |     T
+    // Message     |     F       |     T      |     T           |     F           |     F
+    // int         |     F       |     F      |     F           |     F           |     F
+
+    struct MessageBase : public etl::imessage {};
+    struct Message : public etl::message<1, MessageBase> {};
+
+#if ETL_USING_CPP17
+    // Is an imessage?
+    CHECK_TRUE(etl::is_imessage_v<etl::imessage>);
+    CHECK_FALSE(etl::is_imessage_v<MessageBase>);
+    CHECK_FALSE(etl::is_imessage_v<Message>);
+    CHECK_FALSE(etl::is_imessage_v<int>);
+
+    // Is an imessage, or derived from imessage?
+    CHECK_TRUE(etl::is_message_v<etl::imessage>);
+    CHECK_TRUE(etl::is_message_v<MessageBase>);
+    CHECK_TRUE(etl::is_message_v<Message>);
+    CHECK_FALSE(etl::is_message_v<int>);
+
+    // Is a concrete message?
+    CHECK_FALSE(etl::is_message_type_v<etl::imessage>);
+    CHECK_FALSE(etl::is_message_type_v<MessageBase>);
+    CHECK_TRUE(etl::is_message_type_v<Message>);
+    CHECK_FALSE(etl::is_message_type_v<int>);
+
+    // Is a message base?
+    CHECK_TRUE(etl::is_message_base_v<etl::imessage>);
+    CHECK_TRUE(etl::is_message_base_v<MessageBase>);
+    CHECK_FALSE(etl::is_message_base_v<Message>);
+    CHECK_FALSE(etl::is_message_base_v<int>);
+
+    // Is a user message base?
+    CHECK_FALSE(etl::is_user_message_base_v<etl::imessage>);
+    CHECK_TRUE(etl::is_user_message_base_v<MessageBase>);
+    CHECK_FALSE(etl::is_user_message_base_v<Message>);
+    CHECK_FALSE(etl::is_user_message_base_v<int>);
+#else
+    // Is an imessage?
+    CHECK_TRUE(etl::is_imessage<etl::imessage>::value);
+    CHECK_FALSE(etl::is_imessage<MessageBase>::value);
+    CHECK_FALSE(etl::is_imessage<Message>::value);
+    CHECK_FALSE(etl::is_imessage<int>::value);
+
+    // Is an imessage, or derived from imessage?
+    CHECK_TRUE(etl::is_message<etl::imessage>::value);
+    CHECK_TRUE(etl::is_message<MessageBase>::value);
+    CHECK_TRUE(etl::is_message<Message>::value);
+    CHECK_FALSE(etl::is_message<int>::value);
+
+    // Is a concrete message?
+    CHECK_FALSE(etl::is_message_type<etl::imessage>::value);
+    CHECK_FALSE(etl::is_message_type<MessageBase>::value);
+    CHECK_TRUE(etl::is_message_type<Message>::value);
+    CHECK_FALSE(etl::is_message_type<int>::value);
+
+    // Is a message base?
+    CHECK_TRUE(etl::is_message_base<etl::imessage>::value);
+    CHECK_TRUE(etl::is_message_base<MessageBase>::value);
+    CHECK_FALSE(etl::is_message_base<Message>::value);
+    CHECK_FALSE(etl::is_message_base<int>::value);
+
+    // Is a user message base?
+    CHECK_TRUE(etl::is_user_message_base<etl::imessage>::value);
+    CHECK_TRUE(etl::is_user_message_base<MessageBase>::value);
+    CHECK_FALSE(etl::is_user_message_base<Message>::value);
+    CHECK_FALSE(etl::is_user_message_base<int>::value);
+#endif
+  }
+};
diff --git a/test/test_message_packet.cpp b/test/test_message_packet.cpp
index 5589c0e2..426c520c 100644
--- a/test/test_message_packet.cpp
+++ b/test/test_message_packet.cpp
@@ -220,6 +220,7 @@ namespace
 
       // Should cause a static assert.
       //Packet packet4(message4);
+      //Packet packet4((Message4()));
 
       CHECK_EQUAL(MESSAGE1, packet1.get().get_message_id());
       CHECK_EQUAL(MESSAGE2, packet2.get().get_message_id());
@@ -455,7 +456,7 @@ namespace
       CHECK(Packet::accepts<Message2>());
       CHECK(Packet::accepts<Message3>());
       CHECK(!Packet::accepts<Message4>());
-
+       
       // From static message id.
       CHECK(Packet::accepts<MESSAGE1>());
       CHECK(Packet::accepts<MESSAGE2>());
diff --git a/test/vs2022/etl.vcxproj b/test/vs2022/etl.vcxproj
index 6fda4cba..0450a78f 100644
--- a/test/vs2022/etl.vcxproj
+++ b/test/vs2022/etl.vcxproj
@@ -7396,6 +7396,7 @@
     <ClCompile Include="..\test_macros.cpp" />
     <ClCompile Include="..\test_math.cpp" />
     <ClCompile Include="..\test_math_functions.cpp" />
+    <ClCompile Include="..\test_message.cpp" />
     <ClCompile Include="..\test_message_broker.cpp" />
     <ClCompile Include="..\test_poly_span_dynamic_extent.cpp" />
     <ClCompile Include="..\test_poly_span_fixed_extent.cpp" />

From de6e6ab13cdf3abc86b94eae2647f5a12ff2a98d Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 24 Feb 2024 10:46:24 +0000
Subject: [PATCH 064/131] Added tests for message base_type

---
 include/etl/message.h |  4 ++--
 test/test_message.cpp | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/include/etl/message.h b/include/etl/message.h
index efd87210..6d3bb4c4 100644
--- a/include/etl/message.h
+++ b/include/etl/message.h
@@ -209,7 +209,7 @@ namespace etl
   };
 
   //***************************************************************************
-  /// Is T derived from etl::message<>
+  /// Is T an etl::message<> or derived from etl::message<>
   //***************************************************************************
   template <typename T>
   struct is_message_type : public etl::bool_constant<etl::is_base_of<etl::message_tag, typename etl::remove_cvref<T>::type>::value>
@@ -225,7 +225,7 @@ namespace etl
   };
 
   //***************************************************************************
-  /// Is T a user defined base of etl::message<T>
+  /// Is T a user defined base of etl::message<T> and not an etl::imessage
   //***************************************************************************
   template <typename T>
   struct is_user_message_base : public etl::bool_constant<etl::is_message_base<T>::value && !is_imessage<T>::value>
diff --git a/test/test_message.cpp b/test/test_message.cpp
index 8ce9afa8..14d40418 100644
--- a/test/test_message.cpp
+++ b/test/test_message.cpp
@@ -114,4 +114,19 @@ SUITE(test_message)
     CHECK_FALSE(etl::is_user_message_base<int>::value);
 #endif
   }
+
+  //*************************************************************************
+  TEST(test_message_base_type)
+  {
+    struct Message1 : public etl::message<1> {};
+    
+    struct MessageBase : public etl::imessage {};
+    struct Message2 : public etl::message<2, MessageBase> {};
+
+    CHECK_TRUE((std::is_same_v<etl::imessage, Message1::base_type>));
+    CHECK_TRUE((std::is_same_v<MessageBase,   Message2::base_type>));
+
+    CHECK_FALSE((std::is_same_v<MessageBase,   Message1::base_type>));
+    CHECK_FALSE((std::is_same_v<etl::imessage, Message2::base_type>));
+  }
 };

From 131ed46598d84353e6945cc7fd18fe6f4ac6084c Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 5 Mar 2024 12:17:09 +0000
Subject: [PATCH 065/131] Changed shadowed variables

---
 include/etl/deque.h | 12 ++++++------
 test/test_deque.cpp | 22 ++++------------------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/include/etl/deque.h b/include/etl/deque.h
index 8235b25c..8e7c3571 100644
--- a/include/etl/deque.h
+++ b/include/etl/deque.h
@@ -352,19 +352,19 @@ namespace etl
       }
 
       //***************************************************
-      reference operator [](size_t index)
+      reference operator [](size_t i)
       {
         iterator result(*this);
-        result += index;
+        result += i;
 
         return *result;
       }
 
       //***************************************************
-      const_reference operator [](size_t index) const
+      const_reference operator [](size_t i) const
       {
         iterator result(*this);
-        result += index;
+        result += i;
 
         return *result;
       }
@@ -622,10 +622,10 @@ namespace etl
       }
 
       //***************************************************
-      reference operator [](size_t index)
+      reference operator [](size_t i)
       {
         iterator result(*this);
-        result += index;
+        result += i;
 
         return *result;
       }
diff --git a/test/test_deque.cpp b/test/test_deque.cpp
index de8981a0..dcd9558b 100644
--- a/test/test_deque.cpp
+++ b/test/test_deque.cpp
@@ -107,20 +107,11 @@ namespace
     //*************************************************************************
     TEST(test_constructor_fill)
     {
-      //Compare_Data compare_data(SIZE, N999);
-      //DataNDC data(SIZE, N999);
+      Compare_Data compare_data(SIZE, N999);
+      DataNDC data(SIZE, N999);
 
-      etl::deque<int, 10> data;
-      using iter_type = etl::deque<int, 10>::iterator;
-
-      bool b1 = std::random_access_iterator<iter_type>;
-
-      bool b2 = std::sentinel_for<iter_type, iter_type>;
-
-      //bool b = std::equal(data.begin(), data.end(), data.begin());
-
-      //CHECK_EQUAL(compare_data.size(), data.size());
-      //CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
+      CHECK_EQUAL(compare_data.size(), data.size());
+      CHECK(std::equal(compare_data.begin(), compare_data.end(), data.begin()));
     }
 
     //*************************************************************************
@@ -177,7 +168,6 @@ namespace
     //*************************************************************************
     TEST(test_move_constructor)
     {
-      const size_t SIZE = 10UL;
       typedef etl::deque<std::unique_ptr<uint32_t>, SIZE> Data;
 
       std::unique_ptr<uint32_t> p1(new uint32_t(1U));
@@ -206,7 +196,6 @@ namespace
     //*************************************************************************
     TEST(test_move_insert_erase)
     {
-      const size_t SIZE = 10UL;
       typedef etl::deque<std::unique_ptr<uint32_t>, SIZE> Data;
 
       std::unique_ptr<uint32_t> p1(new uint32_t(1U));
@@ -259,7 +248,6 @@ namespace
     //*************************************************************************
     TEST(test_move_assignment)
     {
-      const size_t SIZE = 10UL;
       typedef etl::deque<std::unique_ptr<uint32_t>, SIZE> Data;
 
       std::unique_ptr<uint32_t> p1(new uint32_t(1U));
@@ -304,7 +292,6 @@ namespace
     //*************************************************************************
     TEST(test_move_assignment_interface)
     {
-      const size_t SIZE = 10UL;
       typedef etl::deque<std::unique_ptr<uint32_t>, SIZE> Data;
       typedef etl::ideque<std::unique_ptr<uint32_t>> IData;
 
@@ -2148,7 +2135,6 @@ namespace
     //*************************************************************************
     TEST(test_move)
     {
-      const size_t SIZE = 10UL;
       typedef etl::deque<std::unique_ptr<uint32_t>, SIZE> Data;
 
       Data data1;

From b89f62a789d6780fd7df790a934f4b7be5783494 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Wed, 6 Mar 2024 19:00:51 +0000
Subject: [PATCH 066/131] Changed optional 'simple' types implementation for
 C++14 constexpr compatibility

---
 include/etl/optional.h | 64 +++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 39 deletions(-)

diff --git a/include/etl/optional.h b/include/etl/optional.h
index c9901e13..002d010a 100644
--- a/include/etl/optional.h
+++ b/include/etl/optional.h
@@ -98,15 +98,15 @@ namespace etl
   };
 
   //*****************************************************************************
-  // Implementations for trivial and non trivial types.
+  // Implementations for fundamental and non fundamental types.
   //*****************************************************************************
   namespace private_optional
   {
-    template <typename T, bool IsTrivialType = etl::is_pod<T>::value>
+    template <typename T, bool IsDefaultConstructible = etl::is_integral<T>::value>
     class optional_impl;
 
     //*****************************************************************************
-    // Implementation for non trivial types.
+    // Implementation for non fundamental types.
     //*****************************************************************************
     template <typename T>
     class optional_impl<T, false>
@@ -679,7 +679,7 @@ namespace etl
     };
 
     //*****************************************************************************
-    // Implementation for trivial types.
+    // Implementation for fundamental types.
     //*****************************************************************************
     template <typename T>
     class optional_impl<T, true>
@@ -848,7 +848,7 @@ namespace etl
         ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
 #endif
 
-        return &storage.u.value;
+        return &storage.value;
       }
 
       //***************************************************************************
@@ -861,7 +861,7 @@ namespace etl
         ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
 #endif
 
-        return &storage.u.value;
+        return &storage.value;
       }
 
       //***************************************************************************
@@ -874,7 +874,7 @@ namespace etl
         ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
 #endif
 
-        return storage.u.value;
+        return storage.value;
       }
 
       //***************************************************************************
@@ -887,7 +887,7 @@ namespace etl
         ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
 #endif
 
-        return storage.u.value;
+        return storage.value;
       }
 
 #if ETL_USING_CPP11
@@ -901,7 +901,7 @@ namespace etl
         ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
 #endif
 
-        return etl::move(storage.u.value);
+        return etl::move(storage.value);
       }
 
       //***************************************************************************
@@ -914,7 +914,7 @@ namespace etl
         ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
 #endif
 
-        return etl::move(storage.u.value);
+        return etl::move(storage.value);
       }
 #endif
 
@@ -946,7 +946,7 @@ namespace etl
         ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
 #endif
 
-        return storage.u.value;
+        return storage.value;
       }
 
       //***************************************************************************
@@ -959,7 +959,7 @@ namespace etl
         ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
 #endif
 
-        return storage.u.value;
+        return storage.value;
       }
 
       //***************************************************************************
@@ -982,7 +982,7 @@ namespace etl
         ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
 #endif
 
-        return etl::move(storage.u.value);
+        return etl::move(storage.value);
       }
 
       //***************************************************************************
@@ -995,7 +995,7 @@ namespace etl
         ETL_ASSERT(has_value(), ETL_ERROR(optional_invalid));
 #endif
 
-        return etl::move(storage.u.value);
+        return etl::move(storage.value);
       }
 
       //***************************************************************************
@@ -1065,7 +1065,7 @@ namespace etl
           storage.destroy();
         }
 
-        T* p = ::new (&storage.u.value) T();
+        T* p = ::new (&storage.value) T();
         storage.valid = true;
 
         return *p;
@@ -1084,7 +1084,7 @@ namespace etl
           storage.destroy();
         }
 
-        T* p = ::new (&storage.u.value) T(value1);
+        T* p = ::new (&storage.value) T(value1);
         storage.valid = true;
 
         return *p;
@@ -1103,7 +1103,7 @@ namespace etl
           storage.destroy();
         }
 
-        T* p = ::new (&storage.u.value) T(value1, value2);
+        T* p = ::new (&storage.value) T(value1, value2);
         storage.valid = true;
 
         return *p;
@@ -1122,7 +1122,7 @@ namespace etl
           storage.destroy();
         }
 
-        T* p = ::new (&storage.u.value) T(value1, value2, value3);
+        T* p = ::new (&storage.value) T(value1, value2, value3);
         storage.valid = true;
 
         return *p;
@@ -1141,7 +1141,7 @@ namespace etl
           storage.destroy();
         }
 
-        T* p = ::new (&storage.u.value) T(value1, value2, value3, value4);
+        T* p = ::new (&storage.value) T(value1, value2, value3, value4);
         storage.valid = true;
 
         return *p;
@@ -1150,8 +1150,6 @@ namespace etl
 
     private:
 
-      struct dummy_t {};
-
       //*************************************
       // The storage for the optional value.
       //*************************************
@@ -1159,8 +1157,8 @@ namespace etl
       {
         //*******************************
         ETL_CONSTEXPR14
-          storage_type()
-          : u()
+        storage_type()
+          : value()
           , valid(false)
         {
         }
@@ -1169,7 +1167,7 @@ namespace etl
         ETL_CONSTEXPR14
         void construct(const T& value_)
         {
-          u.value = value_;
+          value = value_;
           valid   = true;
         }
 
@@ -1178,7 +1176,7 @@ namespace etl
         ETL_CONSTEXPR14
         void construct(T&& value_)
         {
-          u.value = value_;
+          value = value_;
           valid = true;
         }
 
@@ -1187,7 +1185,7 @@ namespace etl
         ETL_CONSTEXPR14
         void construct(TArgs&&... args)
         {
-          u.value = T(etl::forward<TArgs>(args)...);
+          value = T(etl::forward<TArgs>(args)...);
           valid = true;
         }
 #endif
@@ -1199,19 +1197,7 @@ namespace etl
           valid = false;
         }
 
-        //*******************************
-        union union_type
-        {
-          ETL_CONSTEXPR14
-          union_type()
-            : dummy()
-          {
-          }
-
-          dummy_t dummy;
-          T       value;
-        } u;
-
+        T    value;
         bool valid;
       };
 

From 95af36acd3b158290c92737e1ca018bf065336c5 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Wed, 6 Mar 2024 19:02:00 +0000
Subject: [PATCH 067/131] Refactored message_packet constructors

---
 include/etl/message_packet.h | 120 ++++++++++-------------------------
 1 file changed, 32 insertions(+), 88 deletions(-)

diff --git a/include/etl/message_packet.h b/include/etl/message_packet.h
index da5141e3..df4d6d29 100644
--- a/include/etl/message_packet.h
+++ b/include/etl/message_packet.h
@@ -76,25 +76,18 @@ namespace etl
 
   private:
 
-    using ThisPacketType = etl::message_packet<TMessageTypes...>;
+    template <typename T>
+    static constexpr bool IsMessagePacket = etl::is_same_v< etl::remove_const_t<etl::remove_reference_t<T>>, etl::message_packet<TMessageTypes...>>;
 
     template <typename T>
-    static constexpr bool IsMessagePacket = etl::is_same_v<remove_cvref_t<T>, ThisPacketType>;
+    static constexpr bool IsInMessageList = etl::is_one_of_v<etl::remove_const_t<etl::remove_reference_t<T>>, TMessageTypes...>;
 
     template <typename T>
-    static constexpr bool IsInMessageList = etl::is_one_of_v<etl::remove_cvref_t<T>, TMessageTypes...>;
-
-    template <typename T>
-    static constexpr bool IsIMessage = etl::is_same_v<etl::remove_cvref_t<T>, etl::imessage>;   
-
-    template <typename T>
-    static constexpr bool IsDerivedFromIMessage = etl::is_base_of_v<etl::imessage, etl::remove_cvref_t<T>>;
+    static constexpr bool IsIMessage = etl::is_same_v<remove_const_t<etl::remove_reference_t<T>>, etl::imessage>;
 
   public:
 
     //********************************************
-    /// Default constructor
-    //********************************************
 #include "private/diagnostic_uninitialized_push.h"
     message_packet()
       : valid(false)
@@ -102,89 +95,40 @@ namespace etl
     }
 #include "private/diagnostic_pop.h"
 
-    //********************************************
-    /// Copy constructor
-    //********************************************
-#include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-#include "private/diagnostic_pop.h"
-
-    //********************************************
-    /// Move constructor
-    //********************************************
-#include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-#include "private/diagnostic_pop.h"
-
-#include "private/diagnostic_uninitialized_push.h"
     //********************************************
     ///
     //********************************************
-    explicit message_packet(const etl::imessage& msg)
+#include "private/diagnostic_uninitialized_push.h"
+    template <typename T>
+    explicit message_packet(T&& msg)
       : valid(true)
     {
-      if (accepts(msg))
+      if constexpr (IsIMessage<T>)
       {
-        add_new_message(msg);
-        valid = true;
+        if (accepts(msg))
+        {
+          add_new_message(etl::forward<T>(msg));
+          valid = true;
+        }
+        else
+        {
+          valid = false;
+        }
+
+        ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+      }
+      else if constexpr (IsInMessageList<T>)
+      {
+        add_new_message_type<T>(etl::forward<T>(msg));
+      }
+      else if constexpr (IsMessagePacket<T>)
+      {
+        copy(etl::forward<T>(msg));
       }
       else
       {
-        valid = false;
+        ETL_STATIC_ASSERT(IsInMessageList<T>, "Message not in packet type list");
       }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-#include "private/diagnostic_pop.h"
-
-#include "private/diagnostic_uninitialized_push.h"
-    //********************************************
-    ///
-    //********************************************
-    explicit message_packet(etl::imessage&& msg)
-      : valid(true)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-#include "private/diagnostic_pop.h"
-
-#include "private/diagnostic_uninitialized_push.h"
-    //********************************************
-    /// Enabled for types that are not a message packet or etl::imessage
-    /// Invokes a static assert for types not in the message type list.
-    //********************************************
-    template <typename T, typename = etl::enable_if_t<!IsMessagePacket<T> &&
-                                                      !IsIMessage<T>, int>>
-      explicit message_packet(T&& msg)
-      : valid(true)
-    {
-      ETL_STATIC_ASSERT(IsInMessageList<T>, "Message type not in packet type list");
-
-      add_new_message_type(etl::forward<T>(msg));
     }
 #include "private/diagnostic_pop.h"
 
@@ -286,7 +230,7 @@ namespace etl
     //**********************************************
     template <typename TMessage>
     static ETL_CONSTEXPR
-    typename etl::enable_if_t<etl::is_base_of_v<etl::imessage, TMessage>, bool>
+      typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
       accepts()
     {
       return accepts<TMessage::ID>();
@@ -294,7 +238,7 @@ namespace etl
 
     enum
     {
-      SIZE      = etl::largest<TMessageTypes...>::size,
+      SIZE = etl::largest<TMessageTypes...>::size,
       ALIGNMENT = etl::largest<TMessageTypes...>::alignment
     };
 
@@ -344,11 +288,11 @@ namespace etl
     /// Only enabled for types that are in the typelist.
     //********************************************
     template <typename TMessage>
-    etl::enable_if_t<IsInMessageList<TMessage>>
+    etl::enable_if_t<etl::is_one_of_v<etl::remove_const_t<etl::remove_reference_t<TMessage>>, TMessageTypes...>, void>
       add_new_message_type(TMessage&& msg)
     {
       void* p = data;
-      new (p) etl::remove_cvref_t<TMessage>((etl::forward<TMessage>(msg)));
+      new (p) etl::remove_reference_t<TMessage>((etl::forward<TMessage>(msg)));
     }
 #include "private/diagnostic_pop.h"
 

From e1d563a32f4c4b4b473482b69b932c22588896e7 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Wed, 6 Mar 2024 19:02:45 +0000
Subject: [PATCH 068/131] Added etl::is_default_constructible

---
 .../etl/generators/type_traits_generator.h    | 13 +++++++++
 include/etl/type_traits.h                     | 13 +++++++++
 test/test_type_traits.cpp                     | 29 +++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/include/etl/generators/type_traits_generator.h b/include/etl/generators/type_traits_generator.h
index c94b90e7..f7c5580a 100644
--- a/include/etl/generators/type_traits_generator.h
+++ b/include/etl/generators/type_traits_generator.h
@@ -1642,6 +1642,11 @@ typedef integral_constant<bool, true>  true_type;
   template<typename T, typename... TArgs>
   using is_constructible = std::is_constructible<T, TArgs...>;
 
+  //*********************************************
+  // is_default_constructible
+  template<typename T, typename... TArgs>
+  using is_default_constructible = std::is_default_constructible<T>;
+
   //*********************************************
   // is_copy_constructible
   template <typename T>
@@ -1879,6 +1884,14 @@ typedef integral_constant<bool, true>  true_type;
   };
 #endif
 
+  //*********************************************
+  // is_default_constructible
+  template<typename T, typename = void>
+  struct is_default_constructible : etl::false_type { };
+
+  template<typename T>
+  struct is_default_constructible<T, etl::void_t<decltype(T())>> : etl::true_type { };
+
   //*********************************************
   // is_copy_constructible
   template <typename T, bool B = etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
diff --git a/include/etl/type_traits.h b/include/etl/type_traits.h
index 816953d5..f64a5b4d 100644
--- a/include/etl/type_traits.h
+++ b/include/etl/type_traits.h
@@ -1635,6 +1635,11 @@ typedef integral_constant<bool, true>  true_type;
   template<typename T, typename... TArgs>
   using is_constructible = std::is_constructible<T, TArgs...>;
 
+  //*********************************************
+  // is_default_constructible
+  template<typename T, typename... TArgs>
+  using is_default_constructible = std::is_default_constructible<T>;
+
   //*********************************************
   // is_copy_constructible
   template <typename T>
@@ -1872,6 +1877,14 @@ typedef integral_constant<bool, true>  true_type;
   };
 #endif
 
+  //*********************************************
+  // is_default_constructible
+  template<typename T, typename = void>
+  struct is_default_constructible : etl::false_type { };
+
+  template<typename T>
+  struct is_default_constructible<T, etl::void_t<decltype(T())>> : etl::true_type { };
+
   //*********************************************
   // is_copy_constructible
   template <typename T, bool B = etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
diff --git a/test/test_type_traits.cpp b/test/test_type_traits.cpp
index 706c1dfb..af5feaca 100644
--- a/test/test_type_traits.cpp
+++ b/test/test_type_traits.cpp
@@ -111,6 +111,17 @@ namespace
     MoveableCopyable(const MoveableCopyable&) {}
     MoveableCopyable& operator =(const MoveableCopyable&) { return *this; }
   };
+
+  //*********************************************
+  struct NotDefaultConstructible
+  {
+    NotDefaultConstructible() = delete;
+    NotDefaultConstructible(const NotDefaultConstructible&) noexcept {}
+    NotDefaultConstructible& operator =(const NotDefaultConstructible&) noexcept { return *this; }
+
+    NotDefaultConstructible(NotDefaultConstructible&&) = delete;
+    NotDefaultConstructible& operator =(NotDefaultConstructible&) = delete;
+  };
 }
 
 // Definitions for when the STL and compiler built-ins are not available.
@@ -1137,10 +1148,28 @@ namespace
     CHECK((etl::is_constructible_v<Copyable>) == (std::is_constructible_v<Copyable>));
     CHECK((etl::is_constructible_v<Moveable>) == (std::is_constructible_v<Moveable>));
     CHECK((etl::is_constructible_v<MoveableCopyable>) == (std::is_constructible_v<MoveableCopyable>));
+    CHECK((etl::is_constructible_v<NotDefaultConstructible>) == (std::is_constructible_v<NotDefaultConstructible>));
 #else
     CHECK((etl::is_constructible<Copyable>::value) == (std::is_constructible<Copyable>::value));
     CHECK((etl::is_constructible<Moveable>::value) == (std::is_constructible<Moveable>::value));
     CHECK((etl::is_constructible<MoveableCopyable>::value) == (std::is_constructible<MoveableCopyable>::value));
+    CHECK((etl::is_constructible<NotDefaultConstructible>::value) == (std::is_constructible<NotDefaultConstructible>::value));
+#endif
+  }
+
+  //*************************************************************************
+  TEST(test_is_default_constructible)
+  {
+#if ETL_USING_CPP17
+    CHECK((etl::is_default_constructible_v<Copyable>) == (std::is_default_constructible_v<Copyable>));
+    CHECK((etl::is_default_constructible_v<Moveable>) == (std::is_default_constructible_v<Moveable>));
+    CHECK((etl::is_default_constructible_v<MoveableCopyable>) == (std::is_default_constructible_v<MoveableCopyable>));
+    CHECK((etl::is_default_constructible_v<NotDefaultConstructible>) == (std::is_default_constructible_v<NotDefaultConstructible>));
+#else
+    CHECK((etl::is_default_constructible<Copyable>::value) == (std::is_default_constructible<Copyable>::value));
+    CHECK((etl::is_default_constructible<Moveable>::value) == (std::is_default_constructible<Moveable>::value));
+    CHECK((etl::is_default_constructible<MoveableCopyable>::value) == (std::is_default_constructible<MoveableCopyable>::value));
+    CHECK((etl::is_default_constructible<NotDefaultConstructible>::value) == (std::is_default_constructible<NotDefaultConstructible>::value));
 #endif
   }
 

From 5fe759b44ef87a9f57bd86fe1c8762d88b59f143 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 24 Feb 2024 10:56:14 +0000
Subject: [PATCH 069/131] #850 Fixed names according to Arduino's guidelines

---
 support/Release notes.txt | 1 +
 version.txt               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/support/Release notes.txt b/support/Release notes.txt
index 43e61513..82f4905d 100644
--- a/support/Release notes.txt	
+++ b/support/Release notes.txt	
@@ -1,6 +1,7 @@
 ===============================================================================
 20.38.11
 #812-Implement-SAE-J1850-CRC8
+#850 Fixed names according to Arduino's guidelines
 
 ===============================================================================
 20.38.10
diff --git a/version.txt b/version.txt
index 86319d55..769a31cb 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-20.38.10
+20.38.11

From 1e1ce38113067dfb9c8d8426717fbf3ac228f363 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 24 Feb 2024 11:49:54 +0000
Subject: [PATCH 070/131] #850 Fixed names according to Arduino's guidelines

---
 arduino/library-arduino.json       | 2 +-
 arduino/library-arduino.properties | 6 +++---
 include/etl/version.h              | 2 +-
 library.json                       | 2 +-
 library.properties                 | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arduino/library-arduino.json b/arduino/library-arduino.json
index 55190899..69f69416 100644
--- a/arduino/library-arduino.json
+++ b/arduino/library-arduino.json
@@ -1,6 +1,6 @@
 {
   "name": "Embedded Template Library ETL",
-  "version": "20.38.10",
+  "version": "20.38.11",
   "authors": {
     "name": "John Wellbelove",
     "email": "john.wellbelove@etlcpp.com"
diff --git a/arduino/library-arduino.properties b/arduino/library-arduino.properties
index 0cd7b657..d13b639a 100644
--- a/arduino/library-arduino.properties
+++ b/arduino/library-arduino.properties
@@ -1,7 +1,7 @@
 name=Embedded Template Library ETL
-version=20.38.10
-author= John Wellbelove <arduino@etlcpp.com>
-maintainer=John Wellbelove <arduino@etlcpp.com>
+version=20.38.11
+author= John Wellbelove <john.wellbelove@etlcpp.com>
+maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
 license=MIT
 sentence=ETL. A C++ template library tailored for embedded systems.
 paragraph=
diff --git a/include/etl/version.h b/include/etl/version.h
index 1a4e347a..eb1b2fb9 100644
--- a/include/etl/version.h
+++ b/include/etl/version.h
@@ -40,7 +40,7 @@ SOFTWARE.
 
 #define ETL_VERSION_MAJOR 20
 #define ETL_VERSION_MINOR 38
-#define ETL_VERSION_PATCH 10
+#define ETL_VERSION_PATCH 11
 
 #define ETL_VERSION       ETL_STRING(ETL_VERSION_MAJOR) "." ETL_STRING(ETL_VERSION_MINOR) "." ETL_STRING(ETL_VERSION_PATCH)
 #define ETL_VERSION_W     ETL_WIDE_STRING(ETL_VERSION_MAJOR) L"." ETL_WIDE_STRING(ETL_VERSION_MINOR) L"." ETL_WIDE_STRING(ETL_VERSION_PATCH)
diff --git a/library.json b/library.json
index 6993d1af..c982e687 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Embedded Template Library",
-  "version": "20.38.10",
+  "version": "20.38.11",
   "authors": {
     "name": "John Wellbelove",
     "email": "john.wellbelove@etlcpp.com"
diff --git a/library.properties b/library.properties
index b3571589..a10585ee 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=Embedded Template Library
-version=20.38.10
+version=20.38.11
 author= John Wellbelove <john.wellbelove@etlcpp.com>
 maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
 license=MIT

From 268ca4e04b0714a12d45fdfe8c7366fb71f0e9db Mon Sep 17 00:00:00 2001
From: SanderSmeenkInspiro
 <162050829+SanderSmeenkInspiro@users.noreply.github.com>
Date: Fri, 8 Mar 2024 11:02:47 +0100
Subject: [PATCH 071/131] Add support for in-place instantiation of a shared
 message in the message pool (#854)

* #850 Fixed names according to Arduino's guidelines

* #850 Fixed names according to Arduino's guidelines

* Add support for in-place instantiation of a shared message in the message pool

---------

Co-authored-by: John Wellbelove <john.wellbelove@etlcpp.com>
Co-authored-by: John Wellbelove <jwellbelove@users.noreply.github.com>
---
 include/etl/reference_counted_message.h      |  7 +-
 include/etl/reference_counted_message_pool.h | 27 +++++++
 include/etl/reference_counted_object.h       |  9 +++
 include/etl/shared_message.h                 | 29 ++++++-
 test/test_shared_message.cpp                 | 85 +++++++++++++++++++-
 5 files changed, 151 insertions(+), 6 deletions(-)

diff --git a/include/etl/reference_counted_message.h b/include/etl/reference_counted_message.h
index 69c35e2f..76c1a102 100644
--- a/include/etl/reference_counted_message.h
+++ b/include/etl/reference_counted_message.h
@@ -72,9 +72,12 @@ namespace etl
     //***************************************************************************
     /// Constructor
     /// \param owner The message owner.
+    /// \param args  The constructor arguments.
     //***************************************************************************
-    reference_counted_message(etl::ireference_counted_message_pool& owner_)
-      : owner(owner_)
+    template <typename... Args>
+    reference_counted_message(etl::ireference_counted_message_pool& owner_, Args&&... args)
+      : rc_object(etl::forward<Args>(args)...)
+      , owner(owner_)
     {
     }
 
diff --git a/include/etl/reference_counted_message_pool.h b/include/etl/reference_counted_message_pool.h
index d678f9fe..a0c8779a 100644
--- a/include/etl/reference_counted_message_pool.h
+++ b/include/etl/reference_counted_message_pool.h
@@ -100,6 +100,33 @@ namespace etl
     {
     }
 
+    //*************************************************************************
+    /// Allocate a reference counted message from the pool.
+    //*************************************************************************
+    template <typename TMessage, typename... Args>
+    etl::reference_counted_message<TMessage, TCounter>* allocate(const TMessage*, Args&&... args)
+    {
+      ETL_STATIC_ASSERT((etl::is_base_of<etl::imessage, TMessage>::value), "Not a message type");
+
+      typedef etl::reference_counted_message<TMessage, TCounter> rcm_t;
+      typedef rcm_t* prcm_t;
+
+      prcm_t p = ETL_NULLPTR;
+
+      lock();
+      p = static_cast<prcm_t>(memory_block_allocator.allocate(sizeof(rcm_t), etl::alignment_of<rcm_t>::value));
+      unlock();
+
+      if (p != ETL_NULLPTR)
+      {
+        ::new(p) rcm_t(*this, etl::forward<Args>(args)...);
+      }
+
+      ETL_ASSERT((p != ETL_NULLPTR), ETL_ERROR(etl::reference_counted_message_pool_allocation_failure));
+
+      return p;
+    }
+
     //*************************************************************************
     /// Allocate a reference counted message from the pool.
     //*************************************************************************
diff --git a/include/etl/reference_counted_object.h b/include/etl/reference_counted_object.h
index e3458611..82f0af56 100644
--- a/include/etl/reference_counted_object.h
+++ b/include/etl/reference_counted_object.h
@@ -223,6 +223,15 @@ namespace etl
     {
     }
 
+    //***************************************************************************
+    /// Constructor.
+    //***************************************************************************
+    template <typename... Args>
+    reference_counted_object(Args&&... args)
+      : object(etl::forward<Args>(args)...)
+    {
+    }
+
     //***************************************************************************
     /// Get a reference to the counted object.
     //***************************************************************************
diff --git a/include/etl/shared_message.h b/include/etl/shared_message.h
index 013ea887..dbfce236 100644
--- a/include/etl/shared_message.h
+++ b/include/etl/shared_message.h
@@ -49,6 +49,16 @@ namespace etl
   {
   public:
 
+    //*************************************************************************
+    /// Creator for in-place instantiation
+    //*************************************************************************
+    template <typename TMessage, typename TPool, typename... Args>
+    static shared_message create(TPool& owner, Args&&... args)
+    {
+      const TMessage* msg = nullptr;
+      return shared_message(owner, msg, etl::forward<Args>(args)...);
+    }
+
     //*************************************************************************
     /// Constructor
     //*************************************************************************
@@ -59,7 +69,24 @@ namespace etl
       ETL_STATIC_ASSERT((etl::is_base_of<etl::imessage, TMessage>::value), "TMessage not derived from etl::imessage");
 
       p_rcmessage = owner.allocate(message);
-      
+
+      if (p_rcmessage != ETL_NULLPTR)
+      {
+        p_rcmessage->get_reference_counter().set_reference_count(1U);
+      }
+    }
+
+    //*************************************************************************
+    /// Constructor
+    //*************************************************************************
+    template <typename TPool, typename TMessage, typename... Args>
+    shared_message(TPool& owner, const TMessage* message, Args&&... args)
+    {
+      ETL_STATIC_ASSERT((etl::is_base_of<etl::ireference_counted_message_pool, TPool>::value), "TPool not derived from etl::ireference_counted_message_pool");
+      ETL_STATIC_ASSERT((etl::is_base_of<etl::imessage, TMessage>::value), "TMessage not derived from etl::imessage");
+
+      p_rcmessage = owner.allocate(message, etl::forward<Args>(args)...);
+
       if (p_rcmessage != ETL_NULLPTR)
       {
         p_rcmessage->get_reference_counter().set_reference_count(1U);
diff --git a/test/test_shared_message.cpp b/test/test_shared_message.cpp
index f84eb6e2..da4e4db7 100644
--- a/test/test_shared_message.cpp
+++ b/test/test_shared_message.cpp
@@ -44,12 +44,33 @@ namespace
   constexpr etl::message_router_id_t RouterId1 = 1U;
   constexpr etl::message_router_id_t RouterId2 = 2U;
 
+  int message_1_instantiations = 0;
+
   //*************************************************************************
   struct Message1 : public etl::message<MessageId1>
   {
+    Message1()
+      : i(0)
+    {
+      ++message_1_instantiations;
+    }
+
     Message1(int i_)
       : i(i_)
     {
+      ++message_1_instantiations;
+    }
+
+    Message1(const Message1& msg)
+    : i(msg.i)
+    {
+      ++message_1_instantiations;
+    }
+
+    Message1(Message1&& msg)
+    : i(msg.i)
+    {
+      ++message_1_instantiations;
     }
 
     ~Message1()
@@ -153,6 +174,27 @@ namespace
 
     using pool_message_parameters = etl::atomic_counted_message_pool::pool_message_parameters<Message1, Message2>;
 
+    etl::fixed_sized_memory_block_allocator<pool_message_parameters::max_size,
+                                            pool_message_parameters::max_alignment,
+                                            4U> memory_allocator;
+
+    class atomic_counted_message_factory : public etl::atomic_counted_message_pool
+    {
+      public:
+        atomic_counted_message_factory(etl::imemory_block_allocator& memory_block_allocator_)
+          : etl::atomic_counted_message_pool(memory_block_allocator_)
+        {
+        }
+
+        template <typename TMessage, typename... Args>
+        etl::shared_message create_message(Args&&... args)
+        {
+          return etl::shared_message::create<TMessage>(*this, etl::forward<Args>(args)...);
+        }
+    };
+
+    atomic_counted_message_factory message_pool(memory_allocator);
+
     //*************************************************************************
     class Message2Allocator : public etl::ireference_counted_message_pool
     {
@@ -174,7 +216,7 @@ namespace
     };
 
     //*************************************************************************
-    TEST(test_move_constructor)
+    TEST(test_move_constructor_with_default_constructed_message)
     {
       etl::fixed_sized_memory_block_allocator<pool_message_parameters::max_size,
                                               pool_message_parameters::max_alignment, 4U> memory_allocator;
@@ -182,9 +224,46 @@ namespace
       etl::atomic_counted_message_pool message_pool(memory_allocator);
 
 #include "etl/private/diagnostic_pessimizing_move_push.h"
-      etl::shared_message sm1(std::move(etl::shared_message(message_pool, Message1(1))));
+      etl::shared_message sm(std::move(etl::shared_message(message_pool, Message1())));
 #include "etl/private/diagnostic_pop.h"
-      CHECK_EQUAL(1, sm1.get_reference_count());
+
+      CHECK_EQUAL(1, sm.get_reference_count());
+    }
+
+    //*************************************************************************
+    TEST(test_move_constructor_with_default_constructed_message_inplace_in_message_pool)
+    {
+      message_1_instantiations = 0;
+
+#include "etl/private/diagnostic_pessimizing_move_push.h"
+      etl::shared_message sm (std::move(message_pool.create_message<Message1>()));
+#include "etl/private/diagnostic_pop.h"
+
+      CHECK_EQUAL(1, sm.get_reference_count());
+      CHECK_EQUAL(1, message_1_instantiations);
+    }
+
+    //*************************************************************************
+    TEST(test_move_constructor_with_parametrized_constructed_message)
+    {
+#include "etl/private/diagnostic_pessimizing_move_push.h"
+      etl::shared_message sm(std::move(etl::shared_message(message_pool, Message1(1))));
+#include "etl/private/diagnostic_pop.h"
+
+      CHECK_EQUAL(1, sm.get_reference_count());
+    }
+
+    //*************************************************************************
+    TEST(test_move_constructor_with_parametrized_constructed_message_inplace_in_message_pool)
+    {
+      message_1_instantiations = 0;
+
+#include "etl/private/diagnostic_pessimizing_move_push.h"
+      etl::shared_message sm (std::move(message_pool.create_message<Message1>(1)));
+#include "etl/private/diagnostic_pop.h"
+
+      CHECK_EQUAL(1, sm.get_reference_count());
+      CHECK_EQUAL(1, message_1_instantiations);
     }
 
     //*************************************************************************

From 3ca09462a83cffe32e32670b9bcebea7f97ddd09 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Fri, 8 Mar 2024 12:02:41 +0000
Subject: [PATCH 072/131] Fixed implicitly disabled copy constructor

---
 include/etl/message_packet.h | 40 ++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/include/etl/message_packet.h b/include/etl/message_packet.h
index df4d6d29..a47b1e20 100644
--- a/include/etl/message_packet.h
+++ b/include/etl/message_packet.h
@@ -77,13 +77,10 @@ namespace etl
   private:
 
     template <typename T>
-    static constexpr bool IsMessagePacket = etl::is_same_v< etl::remove_const_t<etl::remove_reference_t<T>>, etl::message_packet<TMessageTypes...>>;
+    static constexpr bool IsInMessageList = etl::is_one_of_v<etl::remove_cvref_t<T>, TMessageTypes...>;
 
     template <typename T>
-    static constexpr bool IsInMessageList = etl::is_one_of_v<etl::remove_const_t<etl::remove_reference_t<T>>, TMessageTypes...>;
-
-    template <typename T>
-    static constexpr bool IsIMessage = etl::is_same_v<remove_const_t<etl::remove_reference_t<T>>, etl::imessage>;
+    static constexpr bool IsIMessage = etl::is_same_v<etl::remove_cvref_t<T>, etl::imessage>;
 
   public:
 
@@ -96,10 +93,11 @@ namespace etl
 #include "private/diagnostic_pop.h"
 
     //********************************************
-    ///
+    /// Explicit construction from imessage 
+    /// or concrete message that's in TMessageTypes.
     //********************************************
 #include "private/diagnostic_uninitialized_push.h"
-    template <typename T>
+    template <typename T, typename = typename etl::enable_if<IsIMessage<T> || IsInMessageList<T>, int>::type>
     explicit message_packet(T&& msg)
       : valid(true)
     {
@@ -121,10 +119,6 @@ namespace etl
       {
         add_new_message_type<T>(etl::forward<T>(msg));
       }
-      else if constexpr (IsMessagePacket<T>)
-      {
-        copy(etl::forward<T>(msg));
-      }
       else
       {
         ETL_STATIC_ASSERT(IsInMessageList<T>, "Message not in packet type list");
@@ -132,6 +126,30 @@ namespace etl
     }
 #include "private/diagnostic_pop.h"
 
+    //**********************************************
+    message_packet(const message_packet& other)
+    {
+      valid = other.is_valid();
+
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+
+#if ETL_USING_CPP11
+    //**********************************************
+    message_packet(message_packet&& other)
+    {
+      valid = other.is_valid();
+
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+#endif
+
     //**********************************************
     void copy(const message_packet& other)
     {

From d527816a2d962f1f0d39229d3147eb8b49fcf252 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Fri, 8 Mar 2024 12:03:45 +0000
Subject: [PATCH 073/131] Synchronised CMakeLists compiler options across
 projects

---
 test/CMakeLists.txt                           | 278 +-----------------
 .../exceptions/CMakeLists.txt                 |  50 +++-
 .../log_errors/CMakeLists.txt                 |  48 ++-
 .../log_errors_and_exceptions/CMakeLists.txt  |  48 ++-
 test/etl_initializer_list/CMakeLists.txt      |  48 ++-
 5 files changed, 178 insertions(+), 294 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index bd7b480b..b2dc7815 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -12,283 +12,7 @@ project(etl_unit_tests LANGUAGES CXX)
 
 add_executable(etl_tests
 	main.cpp
-	murmurhash3.cpp
-	test_algorithm.cpp
-	test_alignment.cpp
-	test_array.cpp
-	test_array_view.cpp
-	test_array_wrapper.cpp
-	test_atomic.cpp
-	test_base64.cpp
-    test_binary.cpp
-	test_bip_buffer_spsc_atomic.cpp
-	test_bit.cpp
-	test_bitset_legacy.cpp
-	test_bitset_new_default_element_type.cpp
-	test_bitset_new_explicit_single_element_type.cpp
-	test_bitset_new_ext_default_element_type.cpp
-	test_bitset_new_ext_explicit_single_element_type.cpp
-	test_bit_stream.cpp
-	test_bit_stream_reader_big_endian.cpp
-	test_bit_stream_reader_little_endian.cpp
-	test_bit_stream_writer_big_endian.cpp
-	test_bit_stream_writer_little_endian.cpp
-	test_byte.cpp
-	test_byte_stream.cpp
-	test_bloom_filter.cpp
-	test_bresenham_line.cpp
-	test_bsd_checksum.cpp
-	test_buffer_descriptors.cpp
-	test_callback_service.cpp
-	test_callback_timer.cpp
-	test_callback_timer_atomic.cpp
-	test_callback_timer_interrupt.cpp
-	test_callback_timer_locked.cpp
-	test_char_traits.cpp
-	test_checksum.cpp
-	test_circular_buffer.cpp
-	test_circular_buffer_external_buffer.cpp
-	test_circular_iterator.cpp
-	test_compare.cpp
-	test_constant.cpp
-	test_container.cpp
-	test_correlation.cpp
-	test_covariance.cpp
-	test_crc.cpp
-	test_crc16.cpp
-	test_crc16_a.cpp
-	test_crc16_arc.cpp
-	test_crc16_aug_ccitt.cpp
-	test_crc16_buypass.cpp
-	test_crc16_ccitt.cpp
-	test_crc16_cdma2000.cpp
-	test_crc16_dds110.cpp
-	test_crc16_dectr.cpp
-	test_crc16_dectx.cpp
-	test_crc16_dnp.cpp
-	test_crc16_en13757.cpp
-	test_crc16_genibus.cpp
-	test_crc16_kermit.cpp
-	test_crc16_m17.cpp
-	test_crc16_maxim.cpp
-	test_crc16_mcrf4xx.cpp
-	test_crc16_modbus.cpp
-	test_crc16_profibus.cpp
-	test_crc16_riello.cpp
-	test_crc16_t10dif.cpp
-	test_crc16_teledisk.cpp
-	test_crc16_tms37157.cpp
-	test_crc16_usb.cpp
-	test_crc16_x25.cpp
-	test_crc16_xmodem.cpp
-	test_crc32.cpp
-	test_crc32_bzip2.cpp
-	test_crc32_c.cpp
-	test_crc32_d.cpp
-	test_crc32_jamcrc.cpp
-	test_crc32_mpeg2.cpp
-	test_crc32_posix.cpp
-	test_crc32_q.cpp
-	test_crc32_xfer.cpp
-	test_crc64_ecma.cpp
-	test_crc8_ccitt.cpp
-	test_crc8_cdma2000.cpp
-	test_crc8_darc.cpp
-	test_crc8_dvbs2.cpp
-	test_crc8_ebu.cpp
-	test_crc8_icode.cpp
-	test_crc8_itu.cpp
-	test_crc8_j1850_zero.cpp
-	test_crc8_j1850.cpp
-	test_crc8_maxim.cpp
-	test_crc8_rohc.cpp
-	test_crc8_wcdma.cpp
-	test_cyclic_value.cpp
-	test_debounce.cpp
-	test_delegate.cpp
-	test_delegate_cpp03.cpp
-	test_delegate_service.cpp
-	test_delegate_service_compile_time.cpp
-	test_deque.cpp
-	test_endian.cpp
-	test_enum_type.cpp
-	test_error_handler.cpp
-	test_etl_traits.cpp
-	test_exception.cpp
-	test_expected.cpp
-	test_fixed_iterator.cpp
-	test_fixed_sized_memory_block_allocator.cpp
-	test_flags.cpp
-	test_flat_map.cpp
-	test_flat_multimap.cpp
-	test_flat_multiset.cpp
-	test_flat_set.cpp
-	test_fnv_1.cpp
-	test_format_spec.cpp
-	test_forward_list.cpp
-	test_forward_list_shared_pool.cpp
-	test_fsm.cpp
-	test_function.cpp
-	test_functional.cpp
-	test_gamma.cpp
-	test_hash.cpp
-	test_hfsm.cpp
-	test_histogram.cpp
-	test_indirect_vector.cpp
-	test_indirect_vector_external_buffer.cpp
-	test_instance_count.cpp
-	test_integral_limits.cpp
-	test_intrusive_forward_list.cpp
-	test_intrusive_links.cpp
-	test_intrusive_list.cpp
-	test_intrusive_queue.cpp
-	test_intrusive_stack.cpp
-	test_invert.cpp
-	test_io_port.cpp
-	test_iterator.cpp
-	test_jenkins.cpp
-	test_largest.cpp
-	test_limiter.cpp
-	test_limits.cpp
-	test_list.cpp
-	test_list_shared_pool.cpp
-	test_make_string.cpp
-	test_map.cpp
-	test_math.cpp
-	test_math_functions.cpp
-	test_mean.cpp
-	test_mem_cast.cpp
-	test_mem_cast_ptr.cpp
-	test_memory.cpp
-	test_message_broker.cpp
-	test_message_bus.cpp
 	test_message_packet.cpp
-	test_message_router.cpp
-	test_message_router_registry.cpp
-	test_message_timer.cpp
-	test_message_timer_atomic.cpp
-	test_message_timer_interrupt.cpp
-	test_message_timer_locked.cpp
-	test_multimap.cpp
-	test_multiset.cpp
-	test_multi_array.cpp
-	test_multi_range.cpp
-	test_multi_vector.cpp
-	test_murmur3.cpp
-	test_nth_type.cpp
-	test_numeric.cpp
-	test_observer.cpp
-	test_optional.cpp
-	test_packet.cpp
-	test_parameter_pack.cpp
-	test_parameter_type.cpp
-	test_parity_checksum.cpp
-	test_pearson.cpp
-	test_poly_span_dynamic_extent.cpp
-	test_poly_span_fixed_extent.cpp
-	test_pool.cpp
-	test_pool_external_buffer.cpp
-	test_priority_queue.cpp
-	test_pseudo_moving_average.cpp
-	test_quantize.cpp
-	test_queue.cpp
-	test_queue_lockable.cpp
-	test_queue_lockable_small.cpp
-	test_queue_memory_model_small.cpp
-	test_queue_mpmc_mutex.cpp
-	test_queue_mpmc_mutex_small.cpp
-	test_queue_spsc_atomic.cpp
-	test_queue_spsc_atomic_small.cpp
-	test_queue_spsc_isr.cpp
-	test_queue_spsc_isr_small.cpp
-	test_queue_spsc_locked.cpp
-	test_queue_spsc_locked_small.cpp
-	test_random.cpp
-	test_reference_flat_map.cpp
-	test_reference_flat_multimap.cpp
-	test_reference_flat_multiset.cpp
-	test_reference_flat_set.cpp
-	test_rescale.cpp
-	test_result.cpp
-	test_rms.cpp
-	test_scaled_rounding.cpp
-	test_set.cpp
-	test_shared_message.cpp
-	test_singleton.cpp
-	test_smallest.cpp
-	test_span_dynamic_extent.cpp
-	test_span_fixed_extent.cpp
-	test_stack.cpp
-	test_standard_deviation.cpp
-	test_state_chart.cpp
-	test_state_chart_with_data_parameter.cpp
-	test_state_chart_with_rvalue_data_parameter.cpp
-	test_state_chart_compile_time.cpp
-	test_state_chart_compile_time_with_data_parameter.cpp
-	test_string_char.cpp
-	test_string_char_external_buffer.cpp
-	test_string_stream.cpp
-	test_string_stream_u8.cpp
-	test_string_stream_u16.cpp
-	test_string_stream_u32.cpp
-	test_string_stream_wchar_t.cpp
-	test_string_u8.cpp
-	test_string_u8_external_buffer.cpp
-	test_string_u16.cpp
-	test_string_u16_external_buffer.cpp
-	test_string_u32.cpp
-	test_string_u32_external_buffer.cpp
-	test_string_utilities.cpp
-	test_string_utilities_std.cpp
-	test_string_utilities_std_u8.cpp
-	test_string_utilities_std_u16.cpp
-	test_string_utilities_std_u32.cpp
-	test_string_utilities_std_wchar_t.cpp
-	test_string_utilities_u8.cpp
-	test_string_utilities_u16.cpp
-	test_string_utilities_u32.cpp
-	test_string_utilities_wchar_t.cpp
-	test_string_view.cpp
-	test_string_wchar_t.cpp
-	test_string_wchar_t_external_buffer.cpp
-	test_successor.cpp
-	test_task_scheduler.cpp
-	test_threshold.cpp
-	test_to_arithmetic.cpp
-	test_to_arithmetic_u8.cpp
-	test_to_arithmetic_u16.cpp
-	test_to_arithmetic_u32.cpp
-	test_to_arithmetic_wchar_t.cpp
-	test_to_string.cpp
-	test_to_u8string.cpp
-	test_to_u16string.cpp
-	test_to_u32string.cpp
-	test_to_wstring.cpp
-	test_type_def.cpp
-	test_type_lookup.cpp
-	test_type_select.cpp
-	test_type_traits.cpp
-	test_unaligned_type.cpp
-	test_unaligned_type_constexpr.cpp
-	test_unordered_map.cpp
-	test_unordered_multimap.cpp
-	test_unordered_multiset.cpp
-	test_unordered_set.cpp
-	test_user_type.cpp
-	test_utility.cpp
-	test_variance.cpp
-	test_variant_legacy.cpp
-	test_variant_variadic.cpp
-	test_variant_pool.cpp
-	test_variant_pool_external_buffer.cpp
-	test_vector.cpp
-	test_vector_external_buffer.cpp
-	test_vector_non_trivial.cpp
-	test_vector_pointer.cpp
-	test_vector_pointer_external_buffer.cpp
-	test_visitor.cpp
-	test_xor_checksum.cpp
-	test_xor_rotate_checksum.cpp 
   )
 
 target_compile_definitions(etl_tests PRIVATE -DETL_DEBUG)
@@ -403,7 +127,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif ()
 
 if ((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
-	if (ETL_ENABLE_SANITIZER)
+	if (ETL_ENABLE_SANITIZER MATCHES "ON")
 		message(STATUS "Compiling with Sanitizer enabled")
 		# MinGW doesn't presently support sanitization
 		if (NOT MINGW)
diff --git a/test/etl_error_handler/exceptions/CMakeLists.txt b/test/etl_error_handler/exceptions/CMakeLists.txt
index 3eb91a71..fcbbdc48 100644
--- a/test/etl_error_handler/exceptions/CMakeLists.txt
+++ b/test/etl_error_handler/exceptions/CMakeLists.txt
@@ -54,21 +54,61 @@ target_include_directories(etl_tests
   ${CMAKE_CURRENT_LIST_DIR}
   )
 
-if ((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+	message(STATUS "Using GCC compiler")
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    message(STATUS "Using Clang compiler")
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 	target_compile_options(etl_tests
 			PRIVATE
-			-fsanitize=address,undefined,bounds
 			-fno-omit-frame-pointer
+			-fno-common
 			-Wall
 			-Wextra
-			-Werror 
+			-Werror
+			-Wfloat-equal
+			-Wuseless-cast
+			-Wshadow
+			-Wnull-dereference
 			)
-	target_link_options(etl_tests
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	target_compile_options(etl_tests
 			PRIVATE
-			-fsanitize=address,undefined,bounds
+			-fno-omit-frame-pointer
+			-fno-common
+			-Wall
+			-Wextra
+			-Werror
+			-Wfloat-equal
+			-Wshadow
+			-Wnull-dereference
 			)
 endif ()
 
+if ((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+	if (ETL_ENABLE_SANITIZER MATCHES "ON")
+		message(STATUS "Compiling with Sanitizer enabled")
+		# MinGW doesn't presently support sanitization
+		if (NOT MINGW)
+			target_compile_options(etl_tests
+				PRIVATE
+				-fsanitize=address,undefined,bounds
+				)
+
+			target_link_options(etl_tests
+				PRIVATE
+				-fsanitize=address,undefined,bounds
+				)	
+		endif()
+	endif ()
+endif ()
+
 # Enable the 'make test' CMake target using the executable defined above
 add_test(etl_error_handler_unit_tests etl_tests)
 
diff --git a/test/etl_error_handler/log_errors/CMakeLists.txt b/test/etl_error_handler/log_errors/CMakeLists.txt
index cbea8e44..4019cf25 100644
--- a/test/etl_error_handler/log_errors/CMakeLists.txt
+++ b/test/etl_error_handler/log_errors/CMakeLists.txt
@@ -54,21 +54,61 @@ target_include_directories(etl_tests
   ${CMAKE_CURRENT_LIST_DIR}
   )
 
-if ((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+	message(STATUS "Using GCC compiler")
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    message(STATUS "Using Clang compiler")
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 	target_compile_options(etl_tests
 			PRIVATE
-			-fsanitize=address,undefined,bounds
 			-fno-omit-frame-pointer
+			-fno-common
 			-Wall
 			-Wextra
 			-Werror
+			-Wfloat-equal
+			-Wuseless-cast
+			-Wshadow
+			-Wnull-dereference
 			)
-	target_link_options(etl_tests
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	target_compile_options(etl_tests
 			PRIVATE
-			-fsanitize=address,undefined,bounds
+			-fno-omit-frame-pointer
+			-fno-common
+			-Wall
+			-Wextra
+			-Werror
+			-Wfloat-equal
+			-Wshadow
+			-Wnull-dereference
 			)
 endif ()
 
+if ((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+	if (ETL_ENABLE_SANITIZER MATCHES "ON")
+		message(STATUS "Compiling with Sanitizer enabled")
+		# MinGW doesn't presently support sanitization
+		if (NOT MINGW)
+			target_compile_options(etl_tests
+				PRIVATE
+				-fsanitize=address,undefined,bounds
+				)
+
+			target_link_options(etl_tests
+				PRIVATE
+				-fsanitize=address,undefined,bounds
+				)	
+		endif()
+	endif ()
+endif ()
+
 # Enable the 'make test' CMake target using the executable defined above
 add_test(etl_error_handler_unit_tests etl_tests)
 
diff --git a/test/etl_error_handler/log_errors_and_exceptions/CMakeLists.txt b/test/etl_error_handler/log_errors_and_exceptions/CMakeLists.txt
index 6ef1fa64..a043c9c2 100644
--- a/test/etl_error_handler/log_errors_and_exceptions/CMakeLists.txt
+++ b/test/etl_error_handler/log_errors_and_exceptions/CMakeLists.txt
@@ -55,21 +55,61 @@ target_include_directories(etl_tests
   ${CMAKE_CURRENT_LIST_DIR}
   )
 
-if ((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+	message(STATUS "Using GCC compiler")
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    message(STATUS "Using Clang compiler")
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 	target_compile_options(etl_tests
 			PRIVATE
-			-fsanitize=address,undefined,bounds
 			-fno-omit-frame-pointer
+			-fno-common
 			-Wall
 			-Wextra
 			-Werror
+			-Wfloat-equal
+			-Wuseless-cast
+			-Wshadow
+			-Wnull-dereference
 			)
-	target_link_options(etl_tests
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	target_compile_options(etl_tests
 			PRIVATE
-			-fsanitize=address,undefined,bounds
+			-fno-omit-frame-pointer
+			-fno-common
+			-Wall
+			-Wextra
+			-Werror
+			-Wfloat-equal
+			-Wshadow
+			-Wnull-dereference
 			)
 endif ()
 
+if ((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+	if (ETL_ENABLE_SANITIZER MATCHES "ON")
+		message(STATUS "Compiling with Sanitizer enabled")
+		# MinGW doesn't presently support sanitization
+		if (NOT MINGW)
+			target_compile_options(etl_tests
+				PRIVATE
+				-fsanitize=address,undefined,bounds
+				)
+
+			target_link_options(etl_tests
+				PRIVATE
+				-fsanitize=address,undefined,bounds
+				)	
+		endif()
+	endif ()
+endif ()
+
 # Enable the 'make test' CMake target using the executable defined above
 add_test(etl_error_handler_unit_tests etl_tests)
 
diff --git a/test/etl_initializer_list/CMakeLists.txt b/test/etl_initializer_list/CMakeLists.txt
index 132fb00f..647b590a 100644
--- a/test/etl_initializer_list/CMakeLists.txt
+++ b/test/etl_initializer_list/CMakeLists.txt
@@ -55,21 +55,61 @@ target_include_directories(etl_tests
   ${CMAKE_CURRENT_LIST_DIR}
   )
 
-if ((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+	message(STATUS "Using GCC compiler")
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    message(STATUS "Using Clang compiler")
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 	target_compile_options(etl_tests
 			PRIVATE
-			-fsanitize=address,undefined,bounds
 			-fno-omit-frame-pointer
+			-fno-common
 			-Wall
 			-Wextra
 			-Werror
+			-Wfloat-equal
+			-Wuseless-cast
+			-Wshadow
+			-Wnull-dereference
 			)
-	target_link_options(etl_tests
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	target_compile_options(etl_tests
 			PRIVATE
-			-fsanitize=address,undefined,bounds
+			-fno-omit-frame-pointer
+			-fno-common
+			-Wall
+			-Wextra
+			-Werror
+			-Wfloat-equal
+			-Wshadow
+			-Wnull-dereference
 			)
 endif ()
 
+if ((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+	if (ETL_ENABLE_SANITIZER MATCHES "ON")
+		message(STATUS "Compiling with Sanitizer enabled")
+		# MinGW doesn't presently support sanitization
+		if (NOT MINGW)
+			target_compile_options(etl_tests
+				PRIVATE
+				-fsanitize=address,undefined,bounds
+				)
+
+			target_link_options(etl_tests
+				PRIVATE
+				-fsanitize=address,undefined,bounds
+				)	
+		endif()
+	endif ()
+endif ()
+
 # Enable the 'make test' CMake target using the executable defined above
 add_test(etl_initializer_list_unit_tests etl_tests)
 

From cbf08d1efa64256da22d563f157ef7d98059d376 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 9 Mar 2024 10:03:01 +0000
Subject: [PATCH 074/131] Refactored message_packet constructors

---
 include/etl/message_packet.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/etl/message_packet.h b/include/etl/message_packet.h
index a47b1e20..5c315d89 100644
--- a/include/etl/message_packet.h
+++ b/include/etl/message_packet.h
@@ -76,6 +76,9 @@ namespace etl
 
   private:
 
+    template <typename T>
+    static constexpr bool IsMessagePacket = etl::is_same_v<etl::remove_cvref_t<T>, etl::message_packet<TMessageTypes...>>;
+
     template <typename T>
     static constexpr bool IsInMessageList = etl::is_one_of_v<etl::remove_cvref_t<T>, TMessageTypes...>;
 
@@ -97,7 +100,7 @@ namespace etl
     /// or concrete message that's in TMessageTypes.
     //********************************************
 #include "private/diagnostic_uninitialized_push.h"
-    template <typename T, typename = typename etl::enable_if<IsIMessage<T> || IsInMessageList<T>, int>::type>
+    template <typename T, typename = typename etl::enable_if<!IsMessagePacket<T>, int>::type>
     explicit message_packet(T&& msg)
       : valid(true)
     {

From 59178e495ae620c7c7f4119a0ab36db26588ee6b Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 9 Mar 2024 10:03:26 +0000
Subject: [PATCH 075/131] Added etl::type_tag<T>

---
 include/etl/utility.h | 50 ++++++++++++++++++++++++++++++++
 test/test_utility.cpp | 67 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 117 insertions(+)

diff --git a/include/etl/utility.h b/include/etl/utility.h
index 52cf0d37..5146eb3e 100644
--- a/include/etl/utility.h
+++ b/include/etl/utility.h
@@ -672,6 +672,56 @@ namespace etl
     }
   };
 #endif
+
+  //*****************************************************************************
+  /// A tag that can be used as a concrete object to identify a type.
+  //*****************************************************************************
+  template <typename T>
+  struct type_tag
+  {
+    typedef T type;
+    typedef typename etl::remove_cvref<T>::type underlying_type;
+  };
+
+  //***********************************
+  /// Equality operator for type_tag
+  //***********************************
+  template <typename T1, typename T2>
+  ETL_CONSTEXPR bool operator ==(etl::type_tag<T1>, etl::type_tag<T2>)
+  {
+    return etl::is_same<etl::type_tag<T1>, etl::type_tag<T2> >::value;
+  }
+
+  //***********************************
+  /// Inequality operator for type_tag
+  //***********************************
+  template <typename T1, typename T2>
+  ETL_CONSTEXPR bool operator !=(etl::type_tag<T1>, etl::type_tag<T2>)
+  {
+    return !etl::is_same<etl::type_tag<T1>, etl::type_tag<T2> >::value;
+  }
+
+#if ETL_USING_CPP11
+  //***********************************
+  /// type_tag type
+  //***********************************
+  template <typename T>
+  using type_tag_t = typename etl::type_tag<T>::type;
+
+  //***********************************
+  /// type_tag underlying type
+  //***********************************
+  template <typename T>
+  using type_tag_underlying_t = typename etl::type_tag<T>::underlying_type;
+#endif
+
+#if ETL_USING_CPP17
+  //***********************************
+  /// constexpr type_tag value
+  //***********************************
+  template <typename T>
+  inline constexpr etl::type_tag<T> type_tag_v = etl::type_tag<T>{};
+#endif
 }
 
 #endif
diff --git a/test/test_utility.cpp b/test/test_utility.cpp
index cb386b2f..f193f58f 100644
--- a/test/test_utility.cpp
+++ b/test/test_utility.cpp
@@ -33,6 +33,7 @@ SOFTWARE.
 #include <map>
 #include <vector>
 #include <algorithm>
+#include <type_traits>
 
 #include "data.h"
 
@@ -665,5 +666,71 @@ namespace
       CHECK_EQUAL(forward_like_call_type::ConstRValue, template_function_fl<TFL&&>(etl::move(u4)));
       CHECK_EQUAL(forward_like_call_type::ConstRValue, template_function_fl<const TFL&&>(etl::move(u4)));
     }
+
+    //*********************************
+    TEST(test_type_tag)
+    {
+      using TypeTag1 = etl::type_tag<int>;
+      using TypeTag2 = etl::type_tag<const int>;
+      using TypeTag3 = etl::type_tag<double>;
+
+      TypeTag1 typeTag1;
+      TypeTag2 typeTag2;
+      TypeTag3 typeTag3;
+
+      CHECK_TRUE(typeTag1 == typeTag1);
+      CHECK_TRUE(typeTag2 == typeTag2);
+      CHECK_TRUE(typeTag3 == typeTag3);
+
+      CHECK_FALSE(typeTag1 == typeTag2);
+      CHECK_FALSE(typeTag2 == typeTag3);
+      CHECK_FALSE(typeTag3 == typeTag1);
+      
+      CHECK_FALSE(typeTag1 != typeTag1);
+      CHECK_FALSE(typeTag2 != typeTag2);
+      CHECK_FALSE(typeTag3 != typeTag3);
+      
+      CHECK_TRUE(typeTag1 != typeTag2);
+      CHECK_TRUE(typeTag2 != typeTag3);
+      CHECK_TRUE(typeTag3 != typeTag1);
+    }
+
+    //*********************************
+    TEST(test_type_tag_t)
+    {
+      using TypeTagType1 = etl::type_tag_t<int>;
+      using TypeTagType2 = etl::type_tag_t<const int>;
+      using TypeTagType3 = etl::type_tag_t<volatile int>;
+
+      CHECK_FALSE((std::is_same<TypeTagType1, TypeTagType2>::value));
+      CHECK_FALSE((std::is_same<TypeTagType2, TypeTagType3>::value));
+      CHECK_FALSE((std::is_same<TypeTagType3, TypeTagType1>::value));
+    }
+
+    //*********************************
+    TEST(test_type_tag_underlying_t)
+    {
+      using TypeTagType1 = etl::type_tag_underlying_t<int>;
+      using TypeTagType2 = etl::type_tag_underlying_t<const int>;
+      using TypeTagType3 = etl::type_tag_underlying_t<volatile int>;
+
+      CHECK_TRUE((std::is_same<TypeTagType1, TypeTagType2>::value));
+      CHECK_TRUE((std::is_same<TypeTagType2, TypeTagType3>::value));
+      CHECK_TRUE((std::is_same<TypeTagType3, TypeTagType1>::value));
+    }
+
+    //*********************************
+#if ETL_USING_CPP17
+    TEST(test_type_tag_v)
+    {
+      constexpr auto typeTag1 = etl::type_tag_v<int>;
+      constexpr auto typeTag2 = etl::type_tag_v<const int>;
+      constexpr auto typeTag3 = etl::type_tag_v<volatile int>;
+
+      CHECK_TRUE(typeTag1 == typeTag1);
+      CHECK_TRUE(typeTag2 == typeTag2);
+      CHECK_TRUE(typeTag3 == typeTag3);
+    }
+#endif
   };
 }

From 71644ef90c500ff97fd8009a01ef4c1f47c88128 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 9 Mar 2024 10:04:07 +0000
Subject: [PATCH 076/131] Restored files in CMakeLists.txt

---
 test/CMakeLists.txt | 276 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 276 insertions(+)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b2dc7815..eaf80ec1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -12,7 +12,283 @@ project(etl_unit_tests LANGUAGES CXX)
 
 add_executable(etl_tests
 	main.cpp
+	murmurhash3.cpp
+	test_algorithm.cpp
+	test_alignment.cpp
+	test_array.cpp
+	test_array_view.cpp
+	test_array_wrapper.cpp
+	test_atomic.cpp
+	test_base64.cpp
+    test_binary.cpp
+	test_bip_buffer_spsc_atomic.cpp
+	test_bit.cpp
+	test_bitset_legacy.cpp
+	test_bitset_new_default_element_type.cpp
+	test_bitset_new_explicit_single_element_type.cpp
+	test_bitset_new_ext_default_element_type.cpp
+	test_bitset_new_ext_explicit_single_element_type.cpp
+	test_bit_stream.cpp
+	test_bit_stream_reader_big_endian.cpp
+	test_bit_stream_reader_little_endian.cpp
+	test_bit_stream_writer_big_endian.cpp
+	test_bit_stream_writer_little_endian.cpp
+	test_byte.cpp
+	test_byte_stream.cpp
+	test_bloom_filter.cpp
+	test_bresenham_line.cpp
+	test_bsd_checksum.cpp
+	test_buffer_descriptors.cpp
+	test_callback_service.cpp
+	test_callback_timer.cpp
+	test_callback_timer_atomic.cpp
+	test_callback_timer_interrupt.cpp
+	test_callback_timer_locked.cpp
+	test_char_traits.cpp
+	test_checksum.cpp
+	test_circular_buffer.cpp
+	test_circular_buffer_external_buffer.cpp
+	test_circular_iterator.cpp
+	test_compare.cpp
+	test_constant.cpp
+	test_container.cpp
+	test_correlation.cpp
+	test_covariance.cpp
+	test_crc.cpp
+	test_crc16.cpp
+	test_crc16_a.cpp
+	test_crc16_arc.cpp
+	test_crc16_aug_ccitt.cpp
+	test_crc16_buypass.cpp
+	test_crc16_ccitt.cpp
+	test_crc16_cdma2000.cpp
+	test_crc16_dds110.cpp
+	test_crc16_dectr.cpp
+	test_crc16_dectx.cpp
+	test_crc16_dnp.cpp
+	test_crc16_en13757.cpp
+	test_crc16_genibus.cpp
+	test_crc16_kermit.cpp
+	test_crc16_m17.cpp
+	test_crc16_maxim.cpp
+	test_crc16_mcrf4xx.cpp
+	test_crc16_modbus.cpp
+	test_crc16_profibus.cpp
+	test_crc16_riello.cpp
+	test_crc16_t10dif.cpp
+	test_crc16_teledisk.cpp
+	test_crc16_tms37157.cpp
+	test_crc16_usb.cpp
+	test_crc16_x25.cpp
+	test_crc16_xmodem.cpp
+	test_crc32.cpp
+	test_crc32_bzip2.cpp
+	test_crc32_c.cpp
+	test_crc32_d.cpp
+	test_crc32_jamcrc.cpp
+	test_crc32_mpeg2.cpp
+	test_crc32_posix.cpp
+	test_crc32_q.cpp
+	test_crc32_xfer.cpp
+	test_crc64_ecma.cpp
+	test_crc8_ccitt.cpp
+	test_crc8_cdma2000.cpp
+	test_crc8_darc.cpp
+	test_crc8_dvbs2.cpp
+	test_crc8_ebu.cpp
+	test_crc8_icode.cpp
+	test_crc8_itu.cpp
+	test_crc8_j1850_zero.cpp
+	test_crc8_j1850.cpp
+	test_crc8_maxim.cpp
+	test_crc8_rohc.cpp
+	test_crc8_wcdma.cpp
+	test_cyclic_value.cpp
+	test_debounce.cpp
+	test_delegate.cpp
+	test_delegate_cpp03.cpp
+	test_delegate_service.cpp
+	test_delegate_service_compile_time.cpp
+	test_deque.cpp
+	test_endian.cpp
+	test_enum_type.cpp
+	test_error_handler.cpp
+	test_etl_traits.cpp
+	test_exception.cpp
+	test_expected.cpp
+	test_fixed_iterator.cpp
+	test_fixed_sized_memory_block_allocator.cpp
+	test_flags.cpp
+	test_flat_map.cpp
+	test_flat_multimap.cpp
+	test_flat_multiset.cpp
+	test_flat_set.cpp
+	test_fnv_1.cpp
+	test_format_spec.cpp
+	test_forward_list.cpp
+	test_forward_list_shared_pool.cpp
+	test_fsm.cpp
+	test_function.cpp
+	test_functional.cpp
+	test_gamma.cpp
+	test_hash.cpp
+	test_hfsm.cpp
+	test_histogram.cpp
+	test_indirect_vector.cpp
+	test_indirect_vector_external_buffer.cpp
+	test_instance_count.cpp
+	test_integral_limits.cpp
+	test_intrusive_forward_list.cpp
+	test_intrusive_links.cpp
+	test_intrusive_list.cpp
+	test_intrusive_queue.cpp
+	test_intrusive_stack.cpp
+	test_invert.cpp
+	test_io_port.cpp
+	test_iterator.cpp
+	test_jenkins.cpp
+	test_largest.cpp
+	test_limiter.cpp
+	test_limits.cpp
+	test_list.cpp
+	test_list_shared_pool.cpp
+	test_make_string.cpp
+	test_map.cpp
+	test_math.cpp
+	test_math_functions.cpp
+	test_mean.cpp
+	test_mem_cast.cpp
+	test_mem_cast_ptr.cpp
+	test_memory.cpp
+	test_message_broker.cpp
+	test_message_bus.cpp
 	test_message_packet.cpp
+	test_message_router.cpp
+	test_message_router_registry.cpp
+	test_message_timer.cpp
+	test_message_timer_atomic.cpp
+	test_message_timer_interrupt.cpp
+	test_message_timer_locked.cpp
+	test_multimap.cpp
+	test_multiset.cpp
+	test_multi_array.cpp
+	test_multi_range.cpp
+	test_multi_vector.cpp
+	test_murmur3.cpp
+	test_nth_type.cpp
+	test_numeric.cpp
+	test_observer.cpp
+	test_optional.cpp
+	test_packet.cpp
+	test_parameter_pack.cpp
+	test_parameter_type.cpp
+	test_parity_checksum.cpp
+	test_pearson.cpp
+	test_poly_span_dynamic_extent.cpp
+	test_poly_span_fixed_extent.cpp
+	test_pool.cpp
+	test_pool_external_buffer.cpp
+	test_priority_queue.cpp
+	test_pseudo_moving_average.cpp
+	test_quantize.cpp
+	test_queue.cpp
+	test_queue_lockable.cpp
+	test_queue_lockable_small.cpp
+	test_queue_memory_model_small.cpp
+	test_queue_mpmc_mutex.cpp
+	test_queue_mpmc_mutex_small.cpp
+	test_queue_spsc_atomic.cpp
+	test_queue_spsc_atomic_small.cpp
+	test_queue_spsc_isr.cpp
+	test_queue_spsc_isr_small.cpp
+	test_queue_spsc_locked.cpp
+	test_queue_spsc_locked_small.cpp
+	test_random.cpp
+	test_reference_flat_map.cpp
+	test_reference_flat_multimap.cpp
+	test_reference_flat_multiset.cpp
+	test_reference_flat_set.cpp
+	test_rescale.cpp
+	test_result.cpp
+	test_rms.cpp
+	test_scaled_rounding.cpp
+	test_set.cpp
+	test_shared_message.cpp
+	test_singleton.cpp
+	test_smallest.cpp
+	test_span_dynamic_extent.cpp
+	test_span_fixed_extent.cpp
+	test_stack.cpp
+	test_standard_deviation.cpp
+	test_state_chart.cpp
+	test_state_chart_with_data_parameter.cpp
+	test_state_chart_with_rvalue_data_parameter.cpp
+	test_state_chart_compile_time.cpp
+	test_state_chart_compile_time_with_data_parameter.cpp
+	test_string_char.cpp
+	test_string_char_external_buffer.cpp
+	test_string_stream.cpp
+	test_string_stream_u8.cpp
+	test_string_stream_u16.cpp
+	test_string_stream_u32.cpp
+	test_string_stream_wchar_t.cpp
+	test_string_u8.cpp
+	test_string_u8_external_buffer.cpp
+	test_string_u16.cpp
+	test_string_u16_external_buffer.cpp
+	test_string_u32.cpp
+	test_string_u32_external_buffer.cpp
+	test_string_utilities.cpp
+	test_string_utilities_std.cpp
+	test_string_utilities_std_u8.cpp
+	test_string_utilities_std_u16.cpp
+	test_string_utilities_std_u32.cpp
+	test_string_utilities_std_wchar_t.cpp
+	test_string_utilities_u8.cpp
+	test_string_utilities_u16.cpp
+	test_string_utilities_u32.cpp
+	test_string_utilities_wchar_t.cpp
+	test_string_view.cpp
+	test_string_wchar_t.cpp
+	test_string_wchar_t_external_buffer.cpp
+	test_successor.cpp
+	test_task_scheduler.cpp
+	test_threshold.cpp
+	test_to_arithmetic.cpp
+	test_to_arithmetic_u8.cpp
+	test_to_arithmetic_u16.cpp
+	test_to_arithmetic_u32.cpp
+	test_to_arithmetic_wchar_t.cpp
+	test_to_string.cpp
+	test_to_u8string.cpp
+	test_to_u16string.cpp
+	test_to_u32string.cpp
+	test_to_wstring.cpp
+	test_type_def.cpp
+	test_type_lookup.cpp
+	test_type_select.cpp
+	test_type_traits.cpp
+	test_unaligned_type.cpp
+	test_unaligned_type_constexpr.cpp
+	test_unordered_map.cpp
+	test_unordered_multimap.cpp
+	test_unordered_multiset.cpp
+	test_unordered_set.cpp
+	test_user_type.cpp
+	test_utility.cpp
+	test_variance.cpp
+	test_variant_legacy.cpp
+	test_variant_variadic.cpp
+	test_variant_pool.cpp
+	test_variant_pool_external_buffer.cpp
+	test_vector.cpp
+	test_vector_external_buffer.cpp
+	test_vector_non_trivial.cpp
+	test_vector_pointer.cpp
+	test_vector_pointer_external_buffer.cpp
+	test_visitor.cpp
+	test_xor_checksum.cpp
+	test_xor_rotate_checksum.cpp 
   )
 
 target_compile_definitions(etl_tests PRIVATE -DETL_DEBUG)

From 0cf4396fcb1166b1f68e9566e3b53e85c4b0f0a8 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 9 Mar 2024 10:11:00 +0000
Subject: [PATCH 077/131] #854 in-place construction of shared message

---
 include/etl/reference_counted_message.h      |  8 ++--
 include/etl/reference_counted_message_pool.h | 44 ++++++++++----------
 include/etl/reference_counted_object.h       |  8 ++--
 include/etl/shared_message.h                 | 16 ++++---
 test/test_shared_message.cpp                 | 24 ++++++-----
 5 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/include/etl/reference_counted_message.h b/include/etl/reference_counted_message.h
index 76c1a102..e667e3c9 100644
--- a/include/etl/reference_counted_message.h
+++ b/include/etl/reference_counted_message.h
@@ -74,9 +74,9 @@ namespace etl
     /// \param owner The message owner.
     /// \param args  The constructor arguments.
     //***************************************************************************
-    template <typename... Args>
-    reference_counted_message(etl::ireference_counted_message_pool& owner_, Args&&... args)
-      : rc_object(etl::forward<Args>(args)...)
+    template <typename... TArgs>
+    reference_counted_message(etl::ireference_counted_message_pool& owner_, TArgs&&... args)
+      : rc_object(etl::forward<TArgs>(args)...)
       , owner(owner_)
     {
     }
@@ -225,4 +225,4 @@ namespace etl
 #endif
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/include/etl/reference_counted_message_pool.h b/include/etl/reference_counted_message_pool.h
index a0c8779a..72adfffd 100644
--- a/include/etl/reference_counted_message_pool.h
+++ b/include/etl/reference_counted_message_pool.h
@@ -103,8 +103,8 @@ namespace etl
     //*************************************************************************
     /// Allocate a reference counted message from the pool.
     //*************************************************************************
-    template <typename TMessage, typename... Args>
-    etl::reference_counted_message<TMessage, TCounter>* allocate(const TMessage*, Args&&... args)
+    template <typename TMessage, typename... TArgs>
+    etl::reference_counted_message<TMessage, TCounter>* allocate(TArgs&&... args)
     {
       ETL_STATIC_ASSERT((etl::is_base_of<etl::imessage, TMessage>::value), "Not a message type");
 
@@ -119,7 +119,7 @@ namespace etl
 
       if (p != ETL_NULLPTR)
       {
-        ::new(p) rcm_t(*this, etl::forward<Args>(args)...);
+        ::new(p) rcm_t(*this, etl::forward<TArgs>(args)...);
       }
 
       ETL_ASSERT((p != ETL_NULLPTR), ETL_ERROR(etl::reference_counted_message_pool_allocation_failure));
@@ -209,13 +209,13 @@ namespace etl
       // Size of the first pool message type.
       static constexpr size_t size1 = sizeof(etl::reference_counted_message<TMessage1, TCounter>);
 
-      // Maximum size of the the rest of the pool message types.
+      // Maximum size of the rest of the pool message types.
       static constexpr size_t size2 = pool_message_parameters<TMessages...>::max_size;
 
       // Size of the first pool message type.
       static constexpr size_t alignment1 = etl::alignment_of<etl::reference_counted_message<TMessage1, TCounter>>::value;
 
-      // Maximum size of the the rest of the pool message types.
+      // Maximum size of the rest of the pool message types.
       static constexpr size_t alignment2 = pool_message_parameters<TMessages...>::max_alignment;
 
     public:
@@ -243,8 +243,8 @@ namespace etl
     };
 
 #else
-    template <typename TMessage1,              typename TMessage2  = TMessage1, typename TMessage3  = TMessage1, typename TMessage4  = TMessage1,
-              typename TMessage5  = TMessage1, typename TMessage6  = TMessage1, typename TMessage7  = TMessage1, typename TMessage8  = TMessage1>
+    template <typename TMessage1,             typename TMessage2 = TMessage1, typename TMessage3 = TMessage1, typename TMessage4 = TMessage1,
+              typename TMessage5 = TMessage1, typename TMessage6 = TMessage1, typename TMessage7 = TMessage1, typename TMessage8 = TMessage1>
     struct pool_message_parameters
     {
       ETL_STATIC_ASSERT((etl::is_base_of<etl::imessage, TMessage1>::value), "TMessage1 not derived from etl::imessage");
@@ -257,23 +257,23 @@ namespace etl
       ETL_STATIC_ASSERT((etl::is_base_of<etl::imessage, TMessage1>::value), "TMessage8 not derived from etl::imessage");
 
       static ETL_CONSTANT size_t max_size = etl::largest<etl::reference_counted_message<TMessage1, TCounter>,
-                                                  etl::reference_counted_message<TMessage2, TCounter>,
-                                                  etl::reference_counted_message<TMessage3, TCounter>,
-                                                  etl::reference_counted_message<TMessage4, TCounter>,
-                                                  etl::reference_counted_message<TMessage5, TCounter>,
-                                                  etl::reference_counted_message<TMessage6, TCounter>,
-                                                  etl::reference_counted_message<TMessage7, TCounter>,
-                                                  etl::reference_counted_message<TMessage8, TCounter> >::size;
+                                                         etl::reference_counted_message<TMessage2, TCounter>,
+                                                         etl::reference_counted_message<TMessage3, TCounter>,
+                                                         etl::reference_counted_message<TMessage4, TCounter>,
+                                                         etl::reference_counted_message<TMessage5, TCounter>,
+                                                         etl::reference_counted_message<TMessage6, TCounter>,
+                                                         etl::reference_counted_message<TMessage7, TCounter>,
+                                                         etl::reference_counted_message<TMessage8, TCounter> >::size;
 
 
       static ETL_CONSTANT size_t max_alignment = etl::largest<etl::reference_counted_message<TMessage1, TCounter>,
-                                                       etl::reference_counted_message<TMessage2, TCounter>,
-                                                       etl::reference_counted_message<TMessage3, TCounter>,
-                                                       etl::reference_counted_message<TMessage4, TCounter>,
-                                                       etl::reference_counted_message<TMessage5, TCounter>,
-                                                       etl::reference_counted_message<TMessage6, TCounter>,
-                                                       etl::reference_counted_message<TMessage7, TCounter>,
-                                                       etl::reference_counted_message<TMessage8, TCounter> >::alignment;
+                                                              etl::reference_counted_message<TMessage2, TCounter>,
+                                                              etl::reference_counted_message<TMessage3, TCounter>,
+                                                              etl::reference_counted_message<TMessage4, TCounter>,
+                                                              etl::reference_counted_message<TMessage5, TCounter>,
+                                                              etl::reference_counted_message<TMessage6, TCounter>,
+                                                              etl::reference_counted_message<TMessage7, TCounter>,
+                                                              etl::reference_counted_message<TMessage8, TCounter> >::alignment;
     };
 
 #endif
@@ -317,4 +317,4 @@ namespace etl
 #endif
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/include/etl/reference_counted_object.h b/include/etl/reference_counted_object.h
index 82f0af56..3f81c4a8 100644
--- a/include/etl/reference_counted_object.h
+++ b/include/etl/reference_counted_object.h
@@ -226,9 +226,9 @@ namespace etl
     //***************************************************************************
     /// Constructor.
     //***************************************************************************
-    template <typename... Args>
-    reference_counted_object(Args&&... args)
-      : object(etl::forward<Args>(args)...)
+    template <typename... TArgs>
+    reference_counted_object(TArgs&&... args)
+      : object(etl::forward<TArgs>(args)...)
     {
     }
 
@@ -285,4 +285,4 @@ namespace etl
 #endif
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/include/etl/shared_message.h b/include/etl/shared_message.h
index dbfce236..36771ac7 100644
--- a/include/etl/shared_message.h
+++ b/include/etl/shared_message.h
@@ -52,11 +52,10 @@ namespace etl
     //*************************************************************************
     /// Creator for in-place instantiation
     //*************************************************************************
-    template <typename TMessage, typename TPool, typename... Args>
-    static shared_message create(TPool& owner, Args&&... args)
+    template <typename TMessage, typename TPool, typename... TArgs>
+    static shared_message create(TPool& owner, TArgs&&... args)
     {
-      const TMessage* msg = nullptr;
-      return shared_message(owner, msg, etl::forward<Args>(args)...);
+      return shared_message(owner, etl::type_tag<TMessage>(), etl::forward<TArgs>(args)...);
     }
 
     //*************************************************************************
@@ -79,13 +78,13 @@ namespace etl
     //*************************************************************************
     /// Constructor
     //*************************************************************************
-    template <typename TPool, typename TMessage, typename... Args>
-    shared_message(TPool& owner, const TMessage* message, Args&&... args)
+    template <typename TPool, typename TMessage, typename... TArgs>
+    shared_message(TPool& owner, etl::type_tag<TMessage>, TArgs&&... args)
     {
       ETL_STATIC_ASSERT((etl::is_base_of<etl::ireference_counted_message_pool, TPool>::value), "TPool not derived from etl::ireference_counted_message_pool");
       ETL_STATIC_ASSERT((etl::is_base_of<etl::imessage, TMessage>::value), "TMessage not derived from etl::imessage");
 
-      p_rcmessage = owner.allocate(message, etl::forward<Args>(args)...);
+      p_rcmessage = owner.template allocate<TMessage>(etl::forward<TArgs>(args)...);
 
       if (p_rcmessage != ETL_NULLPTR)
       {
@@ -220,5 +219,4 @@ namespace etl
   };
 }
 
-#endif
-
+#endif
\ No newline at end of file
diff --git a/test/test_shared_message.cpp b/test/test_shared_message.cpp
index da4e4db7..0ac310e0 100644
--- a/test/test_shared_message.cpp
+++ b/test/test_shared_message.cpp
@@ -50,25 +50,29 @@ namespace
   struct Message1 : public etl::message<MessageId1>
   {
     Message1()
-      : i(0)
+      : message()
+      , i(0)
     {
       ++message_1_instantiations;
     }
 
     Message1(int i_)
-      : i(i_)
+      : message()
+      , i(i_)
     {
       ++message_1_instantiations;
     }
 
     Message1(const Message1& msg)
-    : i(msg.i)
+      : message()
+      , i(msg.i)
     {
       ++message_1_instantiations;
     }
 
     Message1(Message1&& msg)
-    : i(msg.i)
+      : message()
+      , i(msg.i)
     {
       ++message_1_instantiations;
     }
@@ -176,7 +180,7 @@ namespace
 
     etl::fixed_sized_memory_block_allocator<pool_message_parameters::max_size,
                                             pool_message_parameters::max_alignment,
-                                            4U> memory_allocator;
+                                            4U> common_memory_allocator;
 
     class atomic_counted_message_factory : public etl::atomic_counted_message_pool
     {
@@ -193,7 +197,7 @@ namespace
         }
     };
 
-    atomic_counted_message_factory message_pool(memory_allocator);
+    atomic_counted_message_factory common_message_pool(common_memory_allocator);
 
     //*************************************************************************
     class Message2Allocator : public etl::ireference_counted_message_pool
@@ -236,7 +240,7 @@ namespace
       message_1_instantiations = 0;
 
 #include "etl/private/diagnostic_pessimizing_move_push.h"
-      etl::shared_message sm (std::move(message_pool.create_message<Message1>()));
+      etl::shared_message sm (std::move(common_message_pool.create_message<Message1>()));
 #include "etl/private/diagnostic_pop.h"
 
       CHECK_EQUAL(1, sm.get_reference_count());
@@ -247,7 +251,7 @@ namespace
     TEST(test_move_constructor_with_parametrized_constructed_message)
     {
 #include "etl/private/diagnostic_pessimizing_move_push.h"
-      etl::shared_message sm(std::move(etl::shared_message(message_pool, Message1(1))));
+      etl::shared_message sm(std::move(etl::shared_message(common_message_pool, Message1(1))));
 #include "etl/private/diagnostic_pop.h"
 
       CHECK_EQUAL(1, sm.get_reference_count());
@@ -259,7 +263,7 @@ namespace
       message_1_instantiations = 0;
 
 #include "etl/private/diagnostic_pessimizing_move_push.h"
-      etl::shared_message sm (std::move(message_pool.create_message<Message1>(1)));
+      etl::shared_message sm (std::move(common_message_pool.create_message<Message1>(1)));
 #include "etl/private/diagnostic_pop.h"
 
       CHECK_EQUAL(1, sm.get_reference_count());
@@ -380,4 +384,4 @@ namespace
       CHECK_THROW(message_pool.release(temp), etl::reference_counted_message_pool_release_failure);
     }
   }
-}
+}
\ No newline at end of file

From 40326db14c6059c6e90c24cbaaf47426c82ea85e Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 9 Mar 2024 10:31:20 +0000
Subject: [PATCH 078/131] Added etl::is_default_constructible_v

---
 include/etl/type_traits.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/etl/type_traits.h b/include/etl/type_traits.h
index f64a5b4d..84c6b279 100644
--- a/include/etl/type_traits.h
+++ b/include/etl/type_traits.h
@@ -2094,6 +2094,9 @@ typedef integral_constant<bool, true>  true_type;
   template<typename T, typename... TArgs>
   inline constexpr bool is_constructible_v = etl::is_constructible<T, TArgs...>::value;
 
+  template<typename T, typename... TArgs>
+  inline constexpr bool is_default_constructible_v = etl::is_default_constructible<T, TArgs...>::value;
+
   template<typename T>
   inline constexpr bool is_copy_constructible_v = etl::is_copy_constructible<T>::value;
 

From b6db4195a31bfaa06d5f0084f915151fa4f4946b Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 9 Mar 2024 12:03:52 +0000
Subject: [PATCH 079/131] Refactored etl::is_default_constructible definition

---
 include/etl/type_traits.h | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/include/etl/type_traits.h b/include/etl/type_traits.h
index 84c6b279..7e9ac31f 100644
--- a/include/etl/type_traits.h
+++ b/include/etl/type_traits.h
@@ -1635,11 +1635,6 @@ typedef integral_constant<bool, true>  true_type;
   template<typename T, typename... TArgs>
   using is_constructible = std::is_constructible<T, TArgs...>;
 
-  //*********************************************
-  // is_default_constructible
-  template<typename T, typename... TArgs>
-  using is_default_constructible = std::is_default_constructible<T>;
-
   //*********************************************
   // is_copy_constructible
   template <typename T>
@@ -1877,14 +1872,6 @@ typedef integral_constant<bool, true>  true_type;
   };
 #endif
 
-  //*********************************************
-  // is_default_constructible
-  template<typename T, typename = void>
-  struct is_default_constructible : etl::false_type { };
-
-  template<typename T>
-  struct is_default_constructible<T, etl::void_t<decltype(T())>> : etl::true_type { };
-
   //*********************************************
   // is_copy_constructible
   template <typename T, bool B = etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
@@ -2083,6 +2070,24 @@ typedef integral_constant<bool, true>  true_type;
   {
   };
 
+#if ETL_USING_CPP11
+  //*********************************************
+  // is_default_constructible
+  template<typename T, typename = void>
+  struct is_default_constructible 
+    : etl::false_type { };
+
+  template<typename T>
+  struct is_default_constructible<T, etl::void_t<decltype(T())>> 
+    : etl::true_type { };
+#else
+  template <typename T>
+  struct is_default_constructible 
+    : public etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
+  {
+  };
+#endif
+
 #if ETL_USING_CPP17
 
   template <typename T1, typename T2>

From 7c24f66ecc1015cc737fdab8d0dc92b0fa9b89ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Kn=C3=B6rle?=
 <133668094+KnoerleMaTLS@users.noreply.github.com>
Date: Sat, 9 Mar 2024 15:56:06 +0100
Subject: [PATCH 080/131] fix(string_stream): add missing initializations of
 const format specifiers (#849)

The const variables "left" and "right" are const default initialized.
The C++ standard states the following:
"A class type T is const-default-constructible if default-initialization
of T would invoke a user-provided constructor of T."
Since the "left_soec" and "right_spec" structs are PODs they are not
initialized per default. Due to the "constness" the variable can not be
modified later one, therefore the POD is in a state in which it is not
useful at all.
Since the mentioned structs are empty there would be no problem
in this case. This is an issue in the C++ standard (CWG Issue 253).
Some compilers already handle this issue with their own solution
despite the fact, that the standard did not provide a solution yet.
For some exotic compilers  (e.g. Tasking for TriCore) the include of
the "string_stream" header caused compilation errors:
"const variable "etl::left" requires an initializer -- class "etl::private_basic_format_spec::left_spec" has no user-provided default constructor"

References:
https://en.cppreference.com/w/cpp/language/default_initialization
https://cplusplus.github.io/CWG/issues/253.html
https://stackoverflow.com/questions/7411515/why-does-c-require-a-user-provided-default-constructor-to-default-construct-a
https://stackoverflow.com/questions/24943665/why-is-a-constructor-necessary-in-a-const-member-struct
---
 include/etl/basic_format_spec.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/etl/basic_format_spec.h b/include/etl/basic_format_spec.h
index 90a48c1a..36c2d74c 100644
--- a/include/etl/basic_format_spec.h
+++ b/include/etl/basic_format_spec.h
@@ -172,10 +172,10 @@ namespace etl
   static ETL_CONSTANT private_basic_format_spec::base_spec hex(16U);
 
   //*********************************
-  static ETL_CONSTANT private_basic_format_spec::left_spec left;
+  static ETL_CONSTANT private_basic_format_spec::left_spec left = private_basic_format_spec::left_spec();
 
   //*********************************
-  static ETL_CONSTANT private_basic_format_spec::right_spec right;
+  static ETL_CONSTANT private_basic_format_spec::right_spec right = private_basic_format_spec::right_spec();
 
   //*********************************
   static ETL_CONSTANT private_basic_format_spec::boolalpha_spec boolalpha(true);

From abb0494e710c3f0cd7430812546de81aa4e9e226 Mon Sep 17 00:00:00 2001
From: Derek Ludwig <derek.s.ludwig@gmail.com>
Date: Sat, 9 Mar 2024 06:57:15 -0800
Subject: [PATCH 081/131] fix(unique_ptr): assigning nullptr to a null
 unique_ptr causes an assert (#858)

---
 include/etl/memory.h | 10 ++++++++--
 test/test_memory.cpp | 11 +++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/include/etl/memory.h b/include/etl/memory.h
index c4eb8fa9..1abcf638 100644
--- a/include/etl/memory.h
+++ b/include/etl/memory.h
@@ -1424,7 +1424,10 @@ namespace etl
     //*********************************
     unique_ptr&	operator =(std::nullptr_t) ETL_NOEXCEPT
     {
-      reset(nullptr);
+      if (p)
+      {
+        reset(nullptr);
+      }
 
       return *this;
     }
@@ -1432,7 +1435,10 @@ namespace etl
     //*********************************
     unique_ptr&	operator =(void*) ETL_NOEXCEPT
     {
-      reset(NULL);
+      if (p)
+      {
+        reset(NULL);
+      }
 
       return *this;
     }
diff --git a/test/test_memory.cpp b/test/test_memory.cpp
index 69beb317..0e93e8c3 100644
--- a/test/test_memory.cpp
+++ b/test/test_memory.cpp
@@ -924,6 +924,17 @@ namespace
       CHECK(!bool(up));
     }
 
+    //*************************************************************************
+    TEST(test_unique_ptr_nullptr_from_nullptr_assignment)
+    {
+      etl::unique_ptr<int> up;
+
+      up = nullptr;
+
+      CHECK(up.get() == nullptr);
+      CHECK(!bool(up));
+    }
+
     //*************************************************************************
     TEST(test_unique_ptr_move_assignment)
     {

From a77e435924df517bdaf7194df957acffe11c4cba Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sun, 10 Mar 2024 09:33:05 +0000
Subject: [PATCH 082/131] Fixed unsynched generators

---
 .../etl/generators/message_packet_generator.h |  30 ++++-
 .../etl/generators/type_traits_generator.h    |  31 +++--
 include/etl/message_packet.h                  |  11 +-
 include/etl/type_traits.h                     |   9 +-
 test/vs2022/etl.vcxproj                       | 126 ++++++++++++++++++
 test/vs2022/etl.vcxproj.filters               |  33 +++++
 6 files changed, 210 insertions(+), 30 deletions(-)

diff --git a/include/etl/generators/message_packet_generator.h b/include/etl/generators/message_packet_generator.h
index cc3cfab3..595fa12f 100644
--- a/include/etl/generators/message_packet_generator.h
+++ b/include/etl/generators/message_packet_generator.h
@@ -111,7 +111,7 @@ namespace etl
     ///
     //********************************************
 #include "private/diagnostic_uninitialized_push.h"
-    template <typename T>
+    template <typename T, typename = typename etl::enable_if<IsIMessage<T> || IsInMessageList<T>, int>::type>
     explicit message_packet(T&& msg)
       : valid(true)
     {
@@ -133,10 +133,6 @@ namespace etl
       {
         add_new_message_type<T>(etl::forward<T>(msg));
       }
-      else if constexpr (IsMessagePacket<T>)
-      {
-        copy(etl::forward<T>(msg));
-      }
       else
       {
         ETL_STATIC_ASSERT(IsInMessageList<T>, "Message not in packet type list");
@@ -144,6 +140,30 @@ namespace etl
     }
 #include "private/diagnostic_pop.h"
 
+    //**********************************************
+    message_packet(const message_packet& other)
+    {
+      valid = other.is_valid();
+
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+
+#if ETL_USING_CPP11
+    //**********************************************
+    message_packet(message_packet&& other)
+    {
+      valid = other.is_valid();
+
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+#endif
+
     //**********************************************
     void copy(const message_packet& other)
     {
diff --git a/include/etl/generators/type_traits_generator.h b/include/etl/generators/type_traits_generator.h
index f7c5580a..d8c1ee60 100644
--- a/include/etl/generators/type_traits_generator.h
+++ b/include/etl/generators/type_traits_generator.h
@@ -1642,11 +1642,6 @@ typedef integral_constant<bool, true>  true_type;
   template<typename T, typename... TArgs>
   using is_constructible = std::is_constructible<T, TArgs...>;
 
-  //*********************************************
-  // is_default_constructible
-  template<typename T, typename... TArgs>
-  using is_default_constructible = std::is_default_constructible<T>;
-
   //*********************************************
   // is_copy_constructible
   template <typename T>
@@ -1884,14 +1879,6 @@ typedef integral_constant<bool, true>  true_type;
   };
 #endif
 
-  //*********************************************
-  // is_default_constructible
-  template<typename T, typename = void>
-  struct is_default_constructible : etl::false_type { };
-
-  template<typename T>
-  struct is_default_constructible<T, etl::void_t<decltype(T())>> : etl::true_type { };
-
   //*********************************************
   // is_copy_constructible
   template <typename T, bool B = etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
@@ -2090,6 +2077,21 @@ typedef integral_constant<bool, true>  true_type;
   {
   };
 
+#if ETL_USING_CPP11
+  //*********************************************
+  // is_default_constructible
+  template<typename T, typename = void>
+  struct is_default_constructible : etl::false_type { };
+
+  template<typename T>
+  struct is_default_constructible<T, etl::void_t<decltype(T())>> : etl::true_type { };
+#else
+  template <typename T>
+  struct is_default_constructible : public etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
+  {
+  };
+#endif
+
 #if ETL_USING_CPP17
 
   template <typename T1, typename T2>
@@ -2101,6 +2103,9 @@ typedef integral_constant<bool, true>  true_type;
   template<typename T, typename... TArgs>
   inline constexpr bool is_constructible_v = etl::is_constructible<T, TArgs...>::value;
 
+  template<typename T, typename... TArgs>
+  inline constexpr bool is_default_constructible_v = etl::is_default_constructible<T, TArgs...>::value;
+
   template<typename T>
   inline constexpr bool is_copy_constructible_v = etl::is_copy_constructible<T>::value;
 
diff --git a/include/etl/message_packet.h b/include/etl/message_packet.h
index 5c315d89..35650a6b 100644
--- a/include/etl/message_packet.h
+++ b/include/etl/message_packet.h
@@ -77,13 +77,13 @@ namespace etl
   private:
 
     template <typename T>
-    static constexpr bool IsMessagePacket = etl::is_same_v<etl::remove_cvref_t<T>, etl::message_packet<TMessageTypes...>>;
+    static constexpr bool IsMessagePacket = etl::is_same_v< etl::remove_const_t<etl::remove_reference_t<T>>, etl::message_packet<TMessageTypes...>>;
 
     template <typename T>
-    static constexpr bool IsInMessageList = etl::is_one_of_v<etl::remove_cvref_t<T>, TMessageTypes...>;
+    static constexpr bool IsInMessageList = etl::is_one_of_v<etl::remove_const_t<etl::remove_reference_t<T>>, TMessageTypes...>;
 
     template <typename T>
-    static constexpr bool IsIMessage = etl::is_same_v<etl::remove_cvref_t<T>, etl::imessage>;
+    static constexpr bool IsIMessage = etl::is_same_v<remove_const_t<etl::remove_reference_t<T>>, etl::imessage>;
 
   public:
 
@@ -96,11 +96,10 @@ namespace etl
 #include "private/diagnostic_pop.h"
 
     //********************************************
-    /// Explicit construction from imessage 
-    /// or concrete message that's in TMessageTypes.
+    ///
     //********************************************
 #include "private/diagnostic_uninitialized_push.h"
-    template <typename T, typename = typename etl::enable_if<!IsMessagePacket<T>, int>::type>
+    template <typename T, typename = typename etl::enable_if<IsIMessage<T> || IsInMessageList<T>, int>::type>
     explicit message_packet(T&& msg)
       : valid(true)
     {
diff --git a/include/etl/type_traits.h b/include/etl/type_traits.h
index 7e9ac31f..43f01de3 100644
--- a/include/etl/type_traits.h
+++ b/include/etl/type_traits.h
@@ -2074,16 +2074,13 @@ typedef integral_constant<bool, true>  true_type;
   //*********************************************
   // is_default_constructible
   template<typename T, typename = void>
-  struct is_default_constructible 
-    : etl::false_type { };
+  struct is_default_constructible : etl::false_type { };
 
   template<typename T>
-  struct is_default_constructible<T, etl::void_t<decltype(T())>> 
-    : etl::true_type { };
+  struct is_default_constructible<T, etl::void_t<decltype(T())>> : etl::true_type { };
 #else
   template <typename T>
-  struct is_default_constructible 
-    : public etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
+  struct is_default_constructible : public etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
   {
   };
 #endif
diff --git a/test/vs2022/etl.vcxproj b/test/vs2022/etl.vcxproj
index 0450a78f..362451c7 100644
--- a/test/vs2022/etl.vcxproj
+++ b/test/vs2022/etl.vcxproj
@@ -2921,6 +2921,132 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\arduino\Embedded_Template_Library.h" />
+    <ClInclude Include="..\..\build\generator_tmp\fsm.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\largest.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\message_packet.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\message_router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\smallest.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\type_lookup.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\type_select.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\type_traits.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\variant_pool.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="..\..\include\etl\array_view.h" />
     <ClInclude Include="..\..\include\etl\array_wrapper.h" />
     <ClInclude Include="..\..\include\etl\atomic.h" />
diff --git a/test/vs2022/etl.vcxproj.filters b/test/vs2022/etl.vcxproj.filters
index 6aa44b4e..6d2a4440 100644
--- a/test/vs2022/etl.vcxproj.filters
+++ b/test/vs2022/etl.vcxproj.filters
@@ -226,6 +226,9 @@
     <Filter Include="Tests\Codecs">
       <UniqueIdentifier>{9713a35d-8f0e-4722-9b15-a5c477c9ecdb}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Tests\Scripts\Generator test output">
+      <UniqueIdentifier>{6850e52c-a546-4219-a1bc-b3d1360f6ed7}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\etl\enum_type.h">
@@ -1395,6 +1398,33 @@
     <ClInclude Include="..\..\include\etl\crc8_j1850_zero.h">
       <Filter>ETL\Maths\CRC</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\fsm.h">
+      <Filter>Tests\Scripts\Generator test output</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\largest.h">
+      <Filter>Tests\Scripts\Generator test output</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\message_packet.h">
+      <Filter>Tests\Scripts\Generator test output</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\message_router.h">
+      <Filter>Tests\Scripts\Generator test output</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\smallest.h">
+      <Filter>Tests\Scripts\Generator test output</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\type_lookup.h">
+      <Filter>Tests\Scripts\Generator test output</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\type_select.h">
+      <Filter>Tests\Scripts\Generator test output</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\type_traits.h">
+      <Filter>Tests\Scripts\Generator test output</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\build\generator_tmp\variant_pool.h">
+      <Filter>Tests\Scripts\Generator test output</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\test_string_char.cpp">
@@ -3305,6 +3335,9 @@
     <ClCompile Include="..\test_crc8_j1850_zero.cpp">
       <Filter>Tests\CRC</Filter>
     </ClCompile>
+    <ClCompile Include="..\test_message.cpp">
+      <Filter>Tests</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\library.properties">

From 46b636694dd025d270630388d53d3e07781b3b27 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sun, 10 Mar 2024 20:21:30 +0000
Subject: [PATCH 083/131] Fixed existing initializer_list member functions

Added additional initializer_list member functions
---
 include/etl/private/variant_variadic.h | 46 ++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/include/etl/private/variant_variadic.h b/include/etl/private/variant_variadic.h
index c4d5cfe9..5fb7d1ac 100644
--- a/include/etl/private/variant_variadic.h
+++ b/include/etl/private/variant_variadic.h
@@ -701,6 +701,29 @@ namespace etl
       return *static_cast<T*>(data);
     }
 
+#if ETL_HAS_INITIALIZER_LIST
+    //***************************************************************************
+    /// Emplace by type with variadic constructor parameters.
+    //***************************************************************************
+    template <typename T, typename U, typename... TArgs>
+    T& emplace(std::initializer_list<U> il, TArgs&&... args)
+    {
+      static_assert(etl::is_one_of<T, TTypes...>::value, "Unsupported type");
+
+      using type = etl::remove_cvref_t<T>;
+
+      operation(private_variant::Destroy, data, nullptr);
+
+      construct_in_place_args<type>(data, il, etl::forward<TArgs>(args)...);
+
+      operation = operation_type<type, etl::is_copy_constructible<type>::value, etl::is_move_constructible<type>::value>::do_operation;
+
+      type_id = etl::private_variant::parameter_pack<TTypes...>::template index_of_type<T>::value;
+
+      return *static_cast<T*>(data);
+    }
+#endif
+
     //***************************************************************************
     /// Emplace by index with variadic constructor parameters.
     //***************************************************************************
@@ -722,6 +745,29 @@ namespace etl
       return *static_cast<type*>(data);
     }
 
+#if ETL_HAS_INITIALIZER_LIST
+    //***************************************************************************
+    /// Emplace by index with variadic constructor parameters.
+    //***************************************************************************
+    template <size_t Index, typename U, typename... TArgs>
+    typename etl::variant_alternative<Index, variant<TArgs...>>::type& emplace(std::initializer_list<U> il, TArgs&&... args)
+    {
+      static_assert(Index < etl::private_variant::parameter_pack<TTypes...>::size, "Index out of range");
+
+      using type = typename etl::private_variant::parameter_pack<TTypes...>::template type_from_index<Index>::type;
+
+      operation(private_variant::Destroy, data, nullptr);
+
+      construct_in_place_args<type>(data, il, etl::forward<TArgs>(args)...);
+
+      operation = operation_type<type, etl::is_copy_constructible<type>::value, etl::is_move_constructible<type>::value>::do_operation;
+
+      type_id = Index;
+
+      return *static_cast<type*>(data);
+    }
+#endif
+
     //***************************************************************************
     /// Move assignment operator for type.
     ///\param value The value to assign.

From 8826b56493f5618c49b32baac227c92e1c13972d Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sun, 10 Mar 2024 20:22:08 +0000
Subject: [PATCH 084/131] Fixed existing initializer_list member functions

Added additional initializer_list member functions
---
 include/etl/expected.h | 15 ++++++++--
 test/test_expected.cpp | 65 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/include/etl/expected.h b/include/etl/expected.h
index f7a123f4..0c3dd983 100644
--- a/include/etl/expected.h
+++ b/include/etl/expected.h
@@ -38,6 +38,7 @@ SOFTWARE.
 #include "error_handler.h"
 #include "utility.h"
 #include "variant.h"
+#include "initializer_list.h"
 
 namespace etl
 {
@@ -353,6 +354,7 @@ namespace etl
     {
     }
 
+#if ETL_HAS_INITIALIZER_LIST
     //*******************************************
     /// Construct value type from initializser_list and arguments.
     //*******************************************
@@ -361,6 +363,7 @@ namespace etl
       : storage(il, etl::forward<Args>(args)...)
     {
     }
+#endif
 
     //*******************************************
     /// Construct error type from arguments.
@@ -608,17 +611,23 @@ namespace etl
     template <typename... Args>
     ETL_CONSTEXPR14 value_type& emplace(Args&&... args) ETL_NOEXCEPT
     {
-      storage.emplace(etl::forward<Args>(args)...);
+      storage.template emplace<value_type>(etl::forward<Args>(args)...);
+
+      return value();
     }
 
     //*******************************************
     ///
     //*******************************************
+#if ETL_HAS_INITIALIZER_LIST
     template <typename U, typename... Args>
-    ETL_CONSTEXPR14 value_type& emplace(std::initializer_list<U>& il, Args&&... args) ETL_NOEXCEPT
+    ETL_CONSTEXPR14 value_type& emplace(std::initializer_list<U> il, Args&&... args) ETL_NOEXCEPT
     {
-      storage.emplace(il, etl::forward<Args>(args)...);
+      storage.template emplace<value_type>(il, etl::forward<Args>(args)...);
+
+      return value();
     }
+#endif
 #else
     //*******************************************
     ///
diff --git a/test/test_expected.cpp b/test/test_expected.cpp
index 941be390..a199707a 100644
--- a/test/test_expected.cpp
+++ b/test/test_expected.cpp
@@ -32,6 +32,7 @@ SOFTWARE.
 #include "etl/type_traits.h"
 
 #include <string>
+#include <vector>
 
 namespace
 {
@@ -441,6 +442,70 @@ namespace
       CHECK_EQUAL(input1.e, output2.e);
     }
 
+    //*************************************************************************
+    TEST(test_emplace_from_initializer_list)
+    {
+      struct S
+      {
+        S()
+          : vi()
+          , a(0)
+          , b(0)
+        {
+        }
+
+        S(std::initializer_list<int> il, int a_, int b_)
+          : vi(il)
+          , a(a_)
+          , b(b_)
+        {
+        }
+
+        std::vector<int> vi;
+        int a;
+        int b;
+      };
+
+      etl::expected<S, Error> exp;
+
+      S s1({ 10, 11, 12 }, 1, 2);
+      S s2 = exp.emplace({ 10, 11, 12 }, 1, 2);
+      
+      CHECK(s1.vi == s2.vi);
+      CHECK_EQUAL(s1.a, s2.a);
+      CHECK_EQUAL(s1.b, s2.b);
+    }
+
+    //*************************************************************************
+    TEST(test_emplace_from_vargs)
+    {
+      struct S
+      {
+        S()
+          : a(0)
+          , b(0)
+        {
+        }
+
+        S(int a_, int b_)
+          : a(a_)
+          , b(b_)
+        {
+        }
+
+        int a;
+        int b;
+      };
+
+      etl::expected<S, Error> exp;
+
+      S s1(1, 2);
+      S s2 = exp.emplace(1, 2);
+
+      CHECK_EQUAL(s1.a, s2.a);
+      CHECK_EQUAL(s1.b, s2.b);
+    }
+
     //*************************************************************************
     TEST(test_move_construct_void_value)
     {

From 4737fd0f0366d1997a760e9c02ec2ecc6b987936 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sun, 10 Mar 2024 20:23:30 +0000
Subject: [PATCH 085/131] Removed etl::type_tag and replaced its use with
 etl::in_place_type_t

---
 include/etl/shared_message.h |  4 +--
 include/etl/utility.h        | 50 ---------------------------
 test/test_utility.cpp        | 66 ------------------------------------
 3 files changed, 2 insertions(+), 118 deletions(-)

diff --git a/include/etl/shared_message.h b/include/etl/shared_message.h
index 36771ac7..f733ebb9 100644
--- a/include/etl/shared_message.h
+++ b/include/etl/shared_message.h
@@ -55,7 +55,7 @@ namespace etl
     template <typename TMessage, typename TPool, typename... TArgs>
     static shared_message create(TPool& owner, TArgs&&... args)
     {
-      return shared_message(owner, etl::type_tag<TMessage>(), etl::forward<TArgs>(args)...);
+      return shared_message(owner, etl::in_place_type_t<TMessage>(), etl::forward<TArgs>(args)...);
     }
 
     //*************************************************************************
@@ -79,7 +79,7 @@ namespace etl
     /// Constructor
     //*************************************************************************
     template <typename TPool, typename TMessage, typename... TArgs>
-    shared_message(TPool& owner, etl::type_tag<TMessage>, TArgs&&... args)
+    shared_message(TPool& owner, etl::in_place_type_t<TMessage>, TArgs&&... args)
     {
       ETL_STATIC_ASSERT((etl::is_base_of<etl::ireference_counted_message_pool, TPool>::value), "TPool not derived from etl::ireference_counted_message_pool");
       ETL_STATIC_ASSERT((etl::is_base_of<etl::imessage, TMessage>::value), "TMessage not derived from etl::imessage");
diff --git a/include/etl/utility.h b/include/etl/utility.h
index 5146eb3e..52cf0d37 100644
--- a/include/etl/utility.h
+++ b/include/etl/utility.h
@@ -672,56 +672,6 @@ namespace etl
     }
   };
 #endif
-
-  //*****************************************************************************
-  /// A tag that can be used as a concrete object to identify a type.
-  //*****************************************************************************
-  template <typename T>
-  struct type_tag
-  {
-    typedef T type;
-    typedef typename etl::remove_cvref<T>::type underlying_type;
-  };
-
-  //***********************************
-  /// Equality operator for type_tag
-  //***********************************
-  template <typename T1, typename T2>
-  ETL_CONSTEXPR bool operator ==(etl::type_tag<T1>, etl::type_tag<T2>)
-  {
-    return etl::is_same<etl::type_tag<T1>, etl::type_tag<T2> >::value;
-  }
-
-  //***********************************
-  /// Inequality operator for type_tag
-  //***********************************
-  template <typename T1, typename T2>
-  ETL_CONSTEXPR bool operator !=(etl::type_tag<T1>, etl::type_tag<T2>)
-  {
-    return !etl::is_same<etl::type_tag<T1>, etl::type_tag<T2> >::value;
-  }
-
-#if ETL_USING_CPP11
-  //***********************************
-  /// type_tag type
-  //***********************************
-  template <typename T>
-  using type_tag_t = typename etl::type_tag<T>::type;
-
-  //***********************************
-  /// type_tag underlying type
-  //***********************************
-  template <typename T>
-  using type_tag_underlying_t = typename etl::type_tag<T>::underlying_type;
-#endif
-
-#if ETL_USING_CPP17
-  //***********************************
-  /// constexpr type_tag value
-  //***********************************
-  template <typename T>
-  inline constexpr etl::type_tag<T> type_tag_v = etl::type_tag<T>{};
-#endif
 }
 
 #endif
diff --git a/test/test_utility.cpp b/test/test_utility.cpp
index f193f58f..a1f28e95 100644
--- a/test/test_utility.cpp
+++ b/test/test_utility.cpp
@@ -666,71 +666,5 @@ namespace
       CHECK_EQUAL(forward_like_call_type::ConstRValue, template_function_fl<TFL&&>(etl::move(u4)));
       CHECK_EQUAL(forward_like_call_type::ConstRValue, template_function_fl<const TFL&&>(etl::move(u4)));
     }
-
-    //*********************************
-    TEST(test_type_tag)
-    {
-      using TypeTag1 = etl::type_tag<int>;
-      using TypeTag2 = etl::type_tag<const int>;
-      using TypeTag3 = etl::type_tag<double>;
-
-      TypeTag1 typeTag1;
-      TypeTag2 typeTag2;
-      TypeTag3 typeTag3;
-
-      CHECK_TRUE(typeTag1 == typeTag1);
-      CHECK_TRUE(typeTag2 == typeTag2);
-      CHECK_TRUE(typeTag3 == typeTag3);
-
-      CHECK_FALSE(typeTag1 == typeTag2);
-      CHECK_FALSE(typeTag2 == typeTag3);
-      CHECK_FALSE(typeTag3 == typeTag1);
-      
-      CHECK_FALSE(typeTag1 != typeTag1);
-      CHECK_FALSE(typeTag2 != typeTag2);
-      CHECK_FALSE(typeTag3 != typeTag3);
-      
-      CHECK_TRUE(typeTag1 != typeTag2);
-      CHECK_TRUE(typeTag2 != typeTag3);
-      CHECK_TRUE(typeTag3 != typeTag1);
-    }
-
-    //*********************************
-    TEST(test_type_tag_t)
-    {
-      using TypeTagType1 = etl::type_tag_t<int>;
-      using TypeTagType2 = etl::type_tag_t<const int>;
-      using TypeTagType3 = etl::type_tag_t<volatile int>;
-
-      CHECK_FALSE((std::is_same<TypeTagType1, TypeTagType2>::value));
-      CHECK_FALSE((std::is_same<TypeTagType2, TypeTagType3>::value));
-      CHECK_FALSE((std::is_same<TypeTagType3, TypeTagType1>::value));
-    }
-
-    //*********************************
-    TEST(test_type_tag_underlying_t)
-    {
-      using TypeTagType1 = etl::type_tag_underlying_t<int>;
-      using TypeTagType2 = etl::type_tag_underlying_t<const int>;
-      using TypeTagType3 = etl::type_tag_underlying_t<volatile int>;
-
-      CHECK_TRUE((std::is_same<TypeTagType1, TypeTagType2>::value));
-      CHECK_TRUE((std::is_same<TypeTagType2, TypeTagType3>::value));
-      CHECK_TRUE((std::is_same<TypeTagType3, TypeTagType1>::value));
-    }
-
-    //*********************************
-#if ETL_USING_CPP17
-    TEST(test_type_tag_v)
-    {
-      constexpr auto typeTag1 = etl::type_tag_v<int>;
-      constexpr auto typeTag2 = etl::type_tag_v<const int>;
-      constexpr auto typeTag3 = etl::type_tag_v<volatile int>;
-
-      CHECK_TRUE(typeTag1 == typeTag1);
-      CHECK_TRUE(typeTag2 == typeTag2);
-      CHECK_TRUE(typeTag3 == typeTag3);
-    }
-#endif
   };
 }

From 199bb131df125a508042545a8e141a0b03674815 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 11 Mar 2024 08:37:13 +0000
Subject: [PATCH 086/131] Minor fixes

---
 include/etl/message.h | 4 ++--
 test/test_message.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/etl/message.h b/include/etl/message.h
index 6d3bb4c4..9c664abc 100644
--- a/include/etl/message.h
+++ b/include/etl/message.h
@@ -220,7 +220,7 @@ namespace etl
   /// Is T a base of etl::message<T>
   //***************************************************************************
   template <typename T>
-  struct is_message_base : public etl::bool_constant<etl::is_message<T>::value && !is_message_type<T>::value>
+  struct is_message_base : public etl::bool_constant<etl::is_message<T>::value && !etl::is_message_type<T>::value>
   {
   };
 
@@ -228,7 +228,7 @@ namespace etl
   /// Is T a user defined base of etl::message<T> and not an etl::imessage
   //***************************************************************************
   template <typename T>
-  struct is_user_message_base : public etl::bool_constant<etl::is_message_base<T>::value && !is_imessage<T>::value>
+  struct is_user_message_base : public etl::bool_constant<etl::is_message_base<T>::value && !etl::is_imessage<T>::value>
   {
   };
 
diff --git a/test/test_message.cpp b/test/test_message.cpp
index 14d40418..6a41f8fd 100644
--- a/test/test_message.cpp
+++ b/test/test_message.cpp
@@ -108,7 +108,7 @@ SUITE(test_message)
     CHECK_FALSE(etl::is_message_base<int>::value);
 
     // Is a user message base?
-    CHECK_TRUE(etl::is_user_message_base<etl::imessage>::value);
+    CHECK_FALSE(etl::is_user_message_base<etl::imessage>::value);
     CHECK_TRUE(etl::is_user_message_base<MessageBase>::value);
     CHECK_FALSE(etl::is_user_message_base<Message>::value);
     CHECK_FALSE(etl::is_user_message_base<int>::value);

From 8750e1ce73645057d7926b163d56e95f9dbce91e Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 11 Mar 2024 08:37:41 +0000
Subject: [PATCH 087/131] Renamed 'test' to 'object'

---
 test/test_delegate_service_cpp03.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/test_delegate_service_cpp03.cpp b/test/test_delegate_service_cpp03.cpp
index aa1b0de5..cd2caae8 100644
--- a/test/test_delegate_service_cpp03.cpp
+++ b/test/test_delegate_service_cpp03.cpp
@@ -138,7 +138,7 @@ namespace
       Service service;
 
       service.register_delegate<Global>(global_callback);
-      service.register_delegate<Member1>(test.callback);
+      service.register_delegate<Member1>(object.callback);
       service.register_delegate<Member2>(member_callback);
 
       service.call<Global>();
@@ -156,7 +156,7 @@ namespace
       Service service;
 
       service.register_delegate(Global,  global_callback);
-      service.register_delegate(Member1, test.callback);
+      service.register_delegate(Member1, object.callback);
       service.register_delegate(Member2, member_callback);
 
       service.call(Global);
@@ -174,7 +174,7 @@ namespace
       Service service;
 
       service.register_delegate<Global>(global_callback);
-      service.register_delegate<Member1>(test.callback);
+      service.register_delegate<Member1>(object.callback);
       service.register_delegate<Member2>(member_callback);
 
       service.call<Member1>();
@@ -192,7 +192,7 @@ namespace
       Service service;
 
       service.register_delegate(Global,  global_callback);
-      service.register_delegate(Member1, test.callback);
+      service.register_delegate(Member1, object.callback);
       service.register_delegate(Member2, member_callback);
 
       service.call(Member1);
@@ -210,7 +210,7 @@ namespace
       Service service;
 
       service.register_delegate<Global>(global_callback);
-      service.register_delegate<Member1>(test.callback);
+      service.register_delegate<Member1>(object.callback);
       service.register_delegate<Member2>(member_callback);
 
       service.call<Member2>();
@@ -228,7 +228,7 @@ namespace
       Service service;
 
       service.register_delegate<Global>(global_callback);
-      service.register_delegate<Member1>(test.callback);
+      service.register_delegate<Member1>(object.callback);
       service.register_delegate<Member2>(member_callback);
 
       service.call(Out_Of_Range);
@@ -246,7 +246,7 @@ namespace
       Service service;
 
       service.register_delegate<Global>(global_callback);
-      service.register_delegate<Member1>(test.callback);
+      service.register_delegate<Member1>(object.callback);
       service.register_delegate<Member2>(member_callback);
 
       service.register_unhandled_delegate(unhandled_callback);

From ce79721a4d9b9ad0c428eb7664ba7c8c44a41bab Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 11 Mar 2024 18:09:19 +0000
Subject: [PATCH 088/131] #855 Strange expression in volatile atomic operator--

---
 include/etl/atomic/atomic_gcc_sync.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/etl/atomic/atomic_gcc_sync.h b/include/etl/atomic/atomic_gcc_sync.h
index 152279dd..9e7399aa 100644
--- a/include/etl/atomic/atomic_gcc_sync.h
+++ b/include/etl/atomic/atomic_gcc_sync.h
@@ -167,7 +167,7 @@ namespace etl
 
     T operator --(int) volatile
     {
-      return __atomic_fetch_sub(&value, 1), etl::memory_order_seq_cst;
+      return __atomic_fetch_sub(&value, 1, etl::memory_order_seq_cst);
     }
 
     // Add

From 1cc94b6418d5521c68d2de59023505d3bb22e771 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 11 Mar 2024 18:09:50 +0000
Subject: [PATCH 089/131] #827 Declaration order for
 etl::first_set_bit_position in binary.h

---
 include/etl/binary.h | 78 ++++++++++++++++++++++----------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/include/etl/binary.h b/include/etl/binary.h
index 903d2bca..4ddf6273 100644
--- a/include/etl/binary.h
+++ b/include/etl/binary.h
@@ -343,45 +343,6 @@ namespace etl
     return TReturn((value ^ mask) - mask);
   }
 
-  //***************************************************************************
-  /// Find the position of the first set bit.
-  /// Starts from LSB.
-  ///\ingroup binary
-  //***************************************************************************
-  template <typename T>
-  ETL_CONSTEXPR14 uint_least8_t first_set_bit_position(T value)
-  {
-    return count_trailing_zeros(value);
-  }
-
-  //***************************************************************************
-  /// Find the position of the first clear bit.
-  /// Starts from LSB.
-  ///\ingroup binary
-  //***************************************************************************
-  template <typename T>
-  ETL_CONSTEXPR14 uint_least8_t first_clear_bit_position(T value)
-  {
-    value = ~value;
-    return count_trailing_zeros(value);
-  }
-
-  //***************************************************************************
-  /// Find the position of the first bit that is clear or set.
-  /// Starts from LSB.
-  ///\ingroup binary
-  //***************************************************************************
-  template <typename T>
-  ETL_CONSTEXPR14 uint_least8_t first_bit_position(bool state, T value)
-  {
-    if (!state)
-    {
-      value = ~value;
-    }
-
-    return count_trailing_zeros(value);
-  }
-
   //***************************************************************************
   /// Gets the value of the bit at POSITION
   /// Starts from LSB.
@@ -2097,6 +2058,45 @@ namespace etl
     return static_cast<T>(count_leading_ones(static_cast<unsigned_t>(value)));
   }
 
+  //***************************************************************************
+  /// Find the position of the first set bit.
+  /// Starts from LSB.
+  ///\ingroup binary
+  //***************************************************************************
+  template <typename T>
+  ETL_CONSTEXPR14 uint_least8_t first_set_bit_position(T value)
+  {
+    return count_trailing_zeros(value);
+  }
+
+  //***************************************************************************
+  /// Find the position of the first clear bit.
+  /// Starts from LSB.
+  ///\ingroup binary
+  //***************************************************************************
+  template <typename T>
+  ETL_CONSTEXPR14 uint_least8_t first_clear_bit_position(T value)
+  {
+    value = ~value;
+    return count_trailing_zeros(value);
+  }
+
+  //***************************************************************************
+  /// Find the position of the first bit that is clear or set.
+  /// Starts from LSB.
+  ///\ingroup binary
+  //***************************************************************************
+  template <typename T>
+  ETL_CONSTEXPR14 uint_least8_t first_bit_position(bool state, T value)
+  {
+    if (!state)
+    {
+      value = ~value;
+    }
+
+    return count_trailing_zeros(value);
+  }
+
 #if ETL_USING_8BIT_TYPES
   //*****************************************************************************
   /// Binary interleave

From 881f3d8e62555b9419e10ccc10a80f494f306235 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 11 Mar 2024 18:10:46 +0000
Subject: [PATCH 090/131] #841 Change push to push_back on containers, so they
 can be used with std::back_inserter

---
 include/etl/iterator.h | 155 ++++++++++++++++++++++++-----------------
 test/test_iterator.cpp |  19 +++++
 2 files changed, 112 insertions(+), 62 deletions(-)

diff --git a/include/etl/iterator.h b/include/etl/iterator.h
index ab19db39..80535132 100644
--- a/include/etl/iterator.h
+++ b/include/etl/iterator.h
@@ -583,36 +583,25 @@ namespace etl
   //***************************************************************************
 
   //***************************************************************************
-  ///\brief  Turns assignment into insertion.
-  ///
-  /// These are output iterators, constructed from a container-of-T.
-  /// Assigning a T to the iterator appends it to the container using push_back.
-  ///
-  /// @tparam TContainer
+  /// Turns assignment into push_back
   //***************************************************************************
   template <typename TContainer>
   class back_insert_iterator : public etl::iterator<ETL_OR_STD::output_iterator_tag, void, void, void, void>
   {
   public:
 
-    /// A nested typedef for the type of whatever container you used.
     typedef TContainer container_type;
 
-    /// The only way to create this %iterator is with a container.
+    //***************************************************************************
+    /// Constructor
+    //***************************************************************************
     explicit ETL_CONSTEXPR14 back_insert_iterator(TContainer& c)
       : container(etl::addressof(c))
     {
     }
 
     //***************************************************************************
-    /// This kind of %iterator doesn't really have a @a position in the
-    /// container (you can think of the position as being permanently at
-    /// the end, if you like).  Assigning a value to the %iterator will
-    /// always append the value to the end of the container.
-    ///
-    /// @param value An instance of whatever type container_type::const_reference is;
-    ///              presumably a reference-to-const T for container<T>.
-    /// @return This %iterator, for chained operations.
+    /// Assignment operator
     //***************************************************************************
     ETL_CONSTEXPR14 back_insert_iterator& operator =(const typename TContainer::value_type& value)
     {
@@ -635,7 +624,6 @@ namespace etl
 
     //***************************************************************************
     /// Dereference operator.
-    /// Simply returns *this.
     //***************************************************************************
     ETL_NODISCARD ETL_CONSTEXPR14 back_insert_iterator& operator *()
     {
@@ -644,7 +632,6 @@ namespace etl
 
     //***************************************************************************
     /// Pre-increment operator.
-    /// Simply returns *this.  (This %iterator does not @a move.)
     //***************************************************************************
     ETL_CONSTEXPR14 back_insert_iterator& operator ++()
     {
@@ -653,7 +640,6 @@ namespace etl
 
     //***************************************************************************
     /// Post-increment operator.
-    /// Simply returns *this.  (This %iterator does not @a move.)
     //***************************************************************************
     ETL_CONSTEXPR14 back_insert_iterator operator ++(int)
     {
@@ -666,15 +652,7 @@ namespace etl
   };
 
   //***************************************************************************
-  /// This wrapper function helps in creating back_insert_iterator instances.
-  /// Typing the name of the %iterator requires knowing the precise full
-  /// type of the container, which can be tedious and impedes generic
-  /// programming.  Using this function lets you take advantage of automatic
-  /// template parameter deduction, making the compiler match the correct types for you.
-  ///
-  /// @tparam TContainer The container type.
-  /// @param container A container of arbitrary type.
-  /// @return An instance of back_insert_iterator working on @p container.
+  /// Creates a back_insert_iterator from a container.
   //***************************************************************************
   template <typename TContainer>
   ETL_NODISCARD 
@@ -689,28 +667,17 @@ namespace etl
   //***************************************************************************
 
   //***************************************************************************
-  ///\brief Turns assignment into insertion.
-  ///
-  /// These are output iterators, constructed from a container-of-T.
-  /// Assigning a T to the iterator prepends it to the container using
-  /// push_front.
-  ///
-  /// Tip:  Using the front_inserter function to create these iterators can
-  /// save typing.
-  ///
-  ///\tparam TContainer The container type.
+  /// Turns assignment into a push_front.
   //***************************************************************************
   template <typename TContainer>
   class front_insert_iterator : public etl::iterator<ETL_OR_STD::output_iterator_tag, void, void, void, void>
   {
   public:
 
-    /// A nested typedef for the type of whatever container you used.
     typedef TContainer container_type;
 
     //***************************************************************************
     /// Constructor
-    /// The only way to create this %iterator is with a container.
     //***************************************************************************
     explicit ETL_CONSTEXPR14 front_insert_iterator(TContainer& c)
       : container(etl::addressof(c))
@@ -718,15 +685,7 @@ namespace etl
     }
 
     //***************************************************************************
-    /// This kind of %iterator doesn't really have a @a position in the
-    /// container (you can think of the position as being permanently at
-    /// the front, if you like).  Assigning a value to the %iterator will
-    /// always prepend the value to the front of the container.
-    ///
-    /// @param  value  An instance of whatever type
-    ///                container_type::const_reference is; presumably a
-    ///                reference-to-const T for container<T>.
-    /// @return  This %iterator, for chained operations.
+    /// Assignment operator
     //***************************************************************************
     ETL_CONSTEXPR14 front_insert_iterator& operator =(const typename TContainer::value_type& value)
     {
@@ -747,7 +706,6 @@ namespace etl
 
     //***************************************************************************
     /// Dereference operator.
-    /// Simply returns *this.
     //***************************************************************************
     ETL_NODISCARD ETL_CONSTEXPR14 front_insert_iterator& operator *()
     {
@@ -756,7 +714,6 @@ namespace etl
 
     //***************************************************************************
     /// Pre-increment operator.
-    /// Simply returns *this.  (This %iterator does not @a move.)
     //***************************************************************************
     ETL_CONSTEXPR14 front_insert_iterator& operator ++()
     {
@@ -765,7 +722,6 @@ namespace etl
 
     //***************************************************************************
     /// Post-increment operator.
-    /// Simply returns *this.  (This %iterator does not @a move.)
     //***************************************************************************
     ETL_CONSTEXPR14 front_insert_iterator operator ++(int)
     {
@@ -778,16 +734,7 @@ namespace etl
   };
 
   //***************************************************************************
-  /// This wrapper function helps in creating front_insert_iterator instances.
-  /// Typing the name of the %iterator requires knowing the precise full
-  /// type of the container, which can be tedious and impedes generic
-  /// programming.  Using this function lets you take advantage of automatic
-  /// template parameter deduction, making the compiler match the correct
-  /// types for you.
-  ///
-  ///\tparam TContainer The container type.
-  ///\param container A container of arbitrary type.
-  ///\return An instance of front_insert_iterator working on @p x.
+  /// Creates a front_insert_iterator from a container.
   //***************************************************************************
   template <typename TContainer>
   ETL_NODISCARD
@@ -797,6 +744,90 @@ namespace etl
     return etl::front_insert_iterator<TContainer>(container);
   }
 
+  //***************************************************************************
+  // push_insert_iterator
+  //***************************************************************************
+
+  //***************************************************************************
+  /// Turns assignment into a push.
+  //***************************************************************************
+  template <typename TContainer>
+  class push_insert_iterator : public etl::iterator<ETL_OR_STD::output_iterator_tag, void, void, void, void>
+  {
+  public:
+
+    typedef TContainer container_type;
+
+    //***************************************************************************
+    /// Constructor
+    //***************************************************************************
+    explicit ETL_CONSTEXPR14 push_insert_iterator(TContainer& c)
+      : container(etl::addressof(c))
+    {
+    }
+
+    //***************************************************************************
+    /// Assignment operator
+    //***************************************************************************
+    ETL_CONSTEXPR14 push_insert_iterator& operator =(const typename TContainer::value_type& value)
+    {
+      container->push(value);
+
+      return (*this);
+    }
+
+#if ETL_USING_CPP11
+    //***************************************************************************
+    /// Move assignment operator.
+    //***************************************************************************
+    ETL_CONSTEXPR14 push_insert_iterator& operator =(typename TContainer::value_type&& value)
+    {
+      container->push(etl::move(value));
+
+      return (*this);
+    }
+#endif  // ETL_USING_CPP11
+
+    //***************************************************************************
+    /// Dereference operator.
+    //***************************************************************************
+    ETL_NODISCARD ETL_CONSTEXPR14 push_insert_iterator& operator *()
+    {
+      return (*this);
+    }
+
+    //***************************************************************************
+    /// Pre-increment operator.
+    //***************************************************************************
+    ETL_CONSTEXPR14 push_insert_iterator& operator ++()
+    {
+      return (*this);
+    }
+
+    //***************************************************************************
+    /// Post-increment operator.
+    //***************************************************************************
+    ETL_CONSTEXPR14 push_insert_iterator operator ++(int)
+    {
+      return (*this);
+    }
+
+  protected:
+
+    TContainer* container;
+  };
+
+  //***************************************************************************
+  /// Creates a push_insert_iterator from a container.
+  //***************************************************************************
+  template <typename TContainer>
+  ETL_NODISCARD
+    ETL_CONSTEXPR14
+    etl::push_insert_iterator<TContainer> push_inserter(TContainer& container)
+  {
+    return etl::push_insert_iterator<TContainer>(container);
+  }
+
   //***************************************************************************
   // Helper templates.
   //***************************************************************************
diff --git a/test/test_iterator.cpp b/test/test_iterator.cpp
index fbbb0f4a..c777574d 100644
--- a/test/test_iterator.cpp
+++ b/test/test_iterator.cpp
@@ -30,6 +30,7 @@ SOFTWARE.
 
 #include <string>
 #include <list>
+#include <queue>
 #include <algorithm>
 
 #include "etl/iterator.h"
@@ -561,5 +562,23 @@ namespace
       CHECK_EQUAL(expected.size(), output.size());
       CHECK(std::equal(output.begin(), output.end(), expected.begin()));
     }
+
+    //*************************************************************************
+    //TEST(test_push_insert_iterator)
+    //{
+    //  std::list<int> input = { 0, 1, 2, 3,  4,  5,  6,  7,  8,  9 };
+    //  std::list<int> expected = { 0, 1, 4, 9, 16, 25, 36, 49, 64, 81 };
+    //  std::queue<int> output;
+
+    //  auto squared = [](int value)
+    //  {
+    //    return value * value;
+    //  };
+
+    //  std::transform(input.begin(), input.cend(), etl::push_inserter(output), squared);
+
+    //  CHECK_EQUAL(expected.size(), output.size());
+    //  CHECK(std::equal(output.begin(), output.end(), expected.begin()));
+    //}
   };
 }

From e5523d2d0ba3231786f9c533157d7a02d2fc6ed0 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 11 Mar 2024 18:11:44 +0000
Subject: [PATCH 091/131] Added C++11 conditional compilation around rvalue
 reference functions

---
 include/etl/reference_counted_message.h      | 2 ++
 include/etl/reference_counted_message_pool.h | 2 ++
 include/etl/reference_counted_object.h       | 3 +++
 include/etl/shared_message.h                 | 4 ++++
 include/etl/unordered_multiset.h             | 4 ++--
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/include/etl/reference_counted_message.h b/include/etl/reference_counted_message.h
index e667e3c9..fd615df1 100644
--- a/include/etl/reference_counted_message.h
+++ b/include/etl/reference_counted_message.h
@@ -69,6 +69,7 @@ namespace etl
     typedef TMessage message_type;
     typedef TCounter counter_type;
 
+#if ETL_USING_CPP11
     //***************************************************************************
     /// Constructor
     /// \param owner The message owner.
@@ -80,6 +81,7 @@ namespace etl
       , owner(owner_)
     {
     }
+#endif
 
     //***************************************************************************
     /// Constructor
diff --git a/include/etl/reference_counted_message_pool.h b/include/etl/reference_counted_message_pool.h
index 72adfffd..fe18a1ee 100644
--- a/include/etl/reference_counted_message_pool.h
+++ b/include/etl/reference_counted_message_pool.h
@@ -100,6 +100,7 @@ namespace etl
     {
     }
 
+#if ETL_USING_CPP11
     //*************************************************************************
     /// Allocate a reference counted message from the pool.
     //*************************************************************************
@@ -126,6 +127,7 @@ namespace etl
 
       return p;
     }
+#endif
 
     //*************************************************************************
     /// Allocate a reference counted message from the pool.
diff --git a/include/etl/reference_counted_object.h b/include/etl/reference_counted_object.h
index 3f81c4a8..198da27a 100644
--- a/include/etl/reference_counted_object.h
+++ b/include/etl/reference_counted_object.h
@@ -33,6 +33,7 @@
 #include "atomic.h"
 #include "exception.h"
 #include "error_handler.h"
+#include "utility.h"
 
 #include <stdint.h>
 
@@ -223,6 +224,7 @@ namespace etl
     {
     }
 
+#if ETL_USING_CPP11
     //***************************************************************************
     /// Constructor.
     //***************************************************************************
@@ -231,6 +233,7 @@ namespace etl
       : object(etl::forward<TArgs>(args)...)
     {
     }
+#endif
 
     //***************************************************************************
     /// Get a reference to the counted object.
diff --git a/include/etl/shared_message.h b/include/etl/shared_message.h
index f733ebb9..43d8f783 100644
--- a/include/etl/shared_message.h
+++ b/include/etl/shared_message.h
@@ -49,6 +49,7 @@ namespace etl
   {
   public:
 
+#if ETL_USING_CPP11
     //*************************************************************************
     /// Creator for in-place instantiation
     //*************************************************************************
@@ -57,6 +58,7 @@ namespace etl
     {
       return shared_message(owner, etl::in_place_type_t<TMessage>(), etl::forward<TArgs>(args)...);
     }
+#endif
 
     //*************************************************************************
     /// Constructor
@@ -75,6 +77,7 @@ namespace etl
       }
     }
 
+#if ETL_USING_CPP11
     //*************************************************************************
     /// Constructor
     //*************************************************************************
@@ -91,6 +94,7 @@ namespace etl
         p_rcmessage->get_reference_counter().set_reference_count(1U);
       }
     }
+#endif
 
     //*************************************************************************
     /// Constructor
diff --git a/include/etl/unordered_multiset.h b/include/etl/unordered_multiset.h
index 5e1496b1..66b67a54 100644
--- a/include/etl/unordered_multiset.h
+++ b/include/etl/unordered_multiset.h
@@ -1401,7 +1401,7 @@ namespace etl
   ///\return <b>true</b> if the arrays are equal, otherwise <b>false</b>
   ///\ingroup unordered_multiset
   //***************************************************************************
-  template <typename TKey, typename THash = etl::hash<TKey>, typename TKeyEqual>
+  template <typename TKey, typename THash, typename TKeyEqual>
   bool operator ==(const etl::iunordered_multiset<TKey, THash, TKeyEqual>& lhs, 
                    const etl::iunordered_multiset<TKey, THash, TKeyEqual>& rhs)
   {
@@ -1455,7 +1455,7 @@ namespace etl
   ///\return <b>true</b> if the arrays are not equal, otherwise <b>false</b>
   ///\ingroup unordered_multiset
   //***************************************************************************
-  template <typename TKey, typename THash = etl::hash<TKey>, typename TKeyEqual>
+  template <typename TKey, typename THash, typename TKeyEqual>
   bool operator !=(const etl::iunordered_multiset<TKey, THash, TKeyEqual>& lhs, 
                    const etl::iunordered_multiset<TKey, THash, TKeyEqual>& rhs)
   {

From 833afdbd209066639936d6a8153156327499b9fa Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 11 Mar 2024 18:13:06 +0000
Subject: [PATCH 092/131] Added optimised and sanitiser build option to Visual
 Studio project

---
 .gitignore              |   1 +
 test/vs2022/etl.sln     |   6 +
 test/vs2022/etl.vcxproj | 389 +++++++++++++++++++++++++++++++++++++++-
 3 files changed, 395 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1561cf00..2bdcfb1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -386,3 +386,4 @@ test/vs2022/Debug MSVC C++20 - No virtual messages
 examples/MutexMessageRouter/.vs
 support/time remaining test.xlsx
 test/vs2022/Debug MSVC C++20 - Force C++03
+test/vs2022/Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser
diff --git a/test/vs2022/etl.sln b/test/vs2022/etl.sln
index 48c644d9..3b5f836e 100644
--- a/test/vs2022/etl.sln
+++ b/test/vs2022/etl.sln
@@ -25,6 +25,8 @@ Global
 		Debug MSVC C++20 - No virtual messages|x64 = Debug MSVC C++20 - No virtual messages|x64
 		Debug MSVC C++20|Win32 = Debug MSVC C++20|Win32
 		Debug MSVC C++20|x64 = Debug MSVC C++20|x64
+		Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32 = Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32
+		Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64 = Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64
 		Release MSVC C++20 - No STL - Optimised -O2|Win32 = Release MSVC C++20 - No STL - Optimised -O2|Win32
 		Release MSVC C++20 - No STL - Optimised -O2|x64 = Release MSVC C++20 - No STL - Optimised -O2|x64
 		Release MSVC C++20 - Optimised O2|Win32 = Release MSVC C++20 - Optimised O2|Win32
@@ -67,6 +69,10 @@ Global
 		{C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC C++20|Win32.Build.0 = Debug MSVC C++20|Win32
 		{C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC C++20|x64.ActiveCfg = Debug MSVC C++20|x64
 		{C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Debug MSVC C++20|x64.Build.0 = Debug MSVC C++20|x64
+		{C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32.ActiveCfg = Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32
+		{C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32.Build.0 = Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32
+		{C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64.ActiveCfg = Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64
+		{C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64.Build.0 = Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64
 		{C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Release MSVC C++20 - No STL - Optimised -O2|Win32.ActiveCfg = Release MSVC C++20 - No STL - Optimised -O2|Win32
 		{C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Release MSVC C++20 - No STL - Optimised -O2|Win32.Build.0 = Release MSVC C++20 - No STL - Optimised -O2|Win32
 		{C21DF78C-D8E0-46AB-9D6F-D38A3C1CB0FB}.Release MSVC C++20 - No STL - Optimised -O2|x64.ActiveCfg = Release MSVC C++20 - No STL - Optimised -O2|x64
diff --git a/test/vs2022/etl.vcxproj b/test/vs2022/etl.vcxproj
index 362451c7..b702cf36 100644
--- a/test/vs2022/etl.vcxproj
+++ b/test/vs2022/etl.vcxproj
@@ -81,6 +81,14 @@
       <Configuration>Debug MSVC C++20</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32">
+      <Configuration>Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64">
+      <Configuration>Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release MSVC C++20 - No STL - Optimised -O2|Win32">
       <Configuration>Release MSVC C++20 - No STL - Optimised -O2</Configuration>
       <Platform>Win32</Platform>
@@ -160,7 +168,7 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <EnableASAN>false</EnableASAN>
+    <EnableASAN>true</EnableASAN>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -197,6 +205,13 @@
     <CharacterSet>Unicode</CharacterSet>
     <EnableASAN>false</EnableASAN>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <EnableASAN>false</EnableASAN>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -420,6 +435,12 @@
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -638,6 +659,9 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -743,6 +767,9 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -893,6 +920,11 @@
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
@@ -1061,6 +1093,10 @@
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|x64'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
@@ -1502,6 +1538,31 @@
       <Command>"$(OutDir)\etl.exe"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;ETL_NO_STL;ETL_FORCE_STD_INITIALIZER_LIST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../../../unittest-cpp/;../../include;../../test</AdditionalIncludeDirectories>
+      <UndefinePreprocessorDefinitions>
+      </UndefinePreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <PostBuildEvent>
+      <Command>"$(OutDir)\etl.exe"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|Win32'">
     <ClCompile>
       <PrecompiledHeader>
@@ -2324,6 +2385,27 @@
       <Command>$(OutDir)\etl.exe</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../../unittest-cpp/UnitTest++/;../../include/etl;../../test</AdditionalIncludeDirectories>
+      <UndefinePreprocessorDefinitions>
+      </UndefinePreprocessorDefinitions>
+      <MultiProcessorCompilation>false</MultiProcessorCompilation>
+      <LanguageStandard>stdcpp14</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <PostBuildEvent>
+      <Command>$(OutDir)\etl.exe</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|x64'">
     <ClCompile>
       <PrecompiledHeader>
@@ -2928,6 +3010,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -2942,6 +3025,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -2956,6 +3040,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -2970,6 +3055,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -2984,6 +3070,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -2998,6 +3085,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3012,6 +3100,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3026,6 +3115,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3040,6 +3130,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3405,6 +3496,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC - No STL -O2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - No STL - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - No STL - Force Constexpr Algorithms|Win32'">true</ExcludedFromBuild>
@@ -3442,6 +3534,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC - No STL -O2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - No STL - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - No STL - Force Constexpr Algorithms|Win32'">true</ExcludedFromBuild>
@@ -3479,6 +3572,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - No STL - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - No STL - Force Constexpr Algorithms|Win32'">true</ExcludedFromBuild>
@@ -3516,6 +3610,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC - No STL -O2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - No STL - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - No STL - Force Constexpr Algorithms|Win32'">true</ExcludedFromBuild>
@@ -3597,6 +3692,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC - No STL -O2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - No STL - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - No STL - Force Constexpr Algorithms|Win32'">true</ExcludedFromBuild>
@@ -3634,6 +3730,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC - No STL -O2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - No STL - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - No STL - Force Constexpr Algorithms|Win32'">true</ExcludedFromBuild>
@@ -3671,6 +3768,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - No STL - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - No STL - Force Constexpr Algorithms|Win32'">true</ExcludedFromBuild>
@@ -3708,6 +3806,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC - No STL -O2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - No STL - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - No STL - Force Constexpr Algorithms|Win32'">true</ExcludedFromBuild>
@@ -3736,6 +3835,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3750,6 +3850,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3764,6 +3865,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3778,6 +3880,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3792,6 +3895,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3806,6 +3910,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3820,6 +3925,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3834,6 +3940,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3848,6 +3955,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3862,6 +3970,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3876,6 +3985,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3890,6 +4000,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3904,6 +4015,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3918,6 +4030,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3932,6 +4045,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3946,6 +4060,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3960,6 +4075,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3974,6 +4090,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -3988,6 +4105,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4002,6 +4120,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4016,6 +4135,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4030,6 +4150,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4044,6 +4165,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4058,6 +4180,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4072,6 +4195,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4086,6 +4210,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4100,6 +4225,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4114,6 +4240,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4128,6 +4255,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4142,6 +4270,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4156,6 +4285,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4170,6 +4300,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4184,6 +4315,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4198,6 +4330,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4212,6 +4345,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4226,6 +4360,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4240,6 +4375,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4254,6 +4390,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4268,6 +4405,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4282,6 +4420,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4296,6 +4435,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4310,6 +4450,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4324,6 +4465,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4338,6 +4480,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4352,6 +4495,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4366,6 +4510,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4380,6 +4525,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4394,6 +4540,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4408,6 +4555,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4422,6 +4570,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4436,6 +4585,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4450,6 +4600,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4464,6 +4615,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4478,6 +4630,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4492,6 +4645,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4506,6 +4660,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4520,6 +4675,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4534,6 +4690,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4548,6 +4705,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4562,6 +4720,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4576,6 +4735,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4590,6 +4750,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4604,6 +4765,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4618,6 +4780,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4632,6 +4795,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4646,6 +4810,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4660,6 +4825,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4674,6 +4840,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4688,6 +4855,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4702,6 +4870,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4716,6 +4885,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4730,6 +4900,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4744,6 +4915,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4758,6 +4930,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4772,6 +4945,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4786,6 +4960,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4800,6 +4975,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4814,6 +4990,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4828,6 +5005,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4842,6 +5020,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4856,6 +5035,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4870,6 +5050,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4884,6 +5065,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4898,6 +5080,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4912,6 +5095,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4926,6 +5110,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4940,6 +5125,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4954,6 +5140,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4968,6 +5155,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4982,6 +5170,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -4996,6 +5185,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5010,6 +5200,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5024,6 +5215,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5038,6 +5230,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5052,6 +5245,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5066,6 +5260,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5080,6 +5275,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5094,6 +5290,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5108,6 +5305,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5122,6 +5320,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5136,6 +5335,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5150,6 +5350,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5164,6 +5365,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5178,6 +5380,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5192,6 +5395,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5206,6 +5410,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5220,6 +5425,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5234,6 +5440,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5248,6 +5455,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5262,6 +5470,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5276,6 +5485,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5290,6 +5500,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5304,6 +5515,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5318,6 +5530,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5332,6 +5545,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5346,6 +5560,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5360,6 +5575,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5374,6 +5590,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5388,6 +5605,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5402,6 +5620,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5416,6 +5635,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5430,6 +5650,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5444,6 +5665,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5458,6 +5680,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5472,6 +5695,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5486,6 +5710,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5500,6 +5725,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5514,6 +5740,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5528,6 +5755,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5542,6 +5770,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5556,6 +5785,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5570,6 +5800,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5584,6 +5815,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5598,6 +5830,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5612,6 +5845,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5626,6 +5860,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5640,6 +5875,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5654,6 +5890,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5668,6 +5905,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5682,6 +5920,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5696,6 +5935,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5710,6 +5950,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5724,6 +5965,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5738,6 +5980,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5752,6 +5995,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5766,6 +6010,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5780,6 +6025,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5794,6 +6040,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5808,6 +6055,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5822,6 +6070,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5836,6 +6085,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5850,6 +6100,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5864,6 +6115,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5878,6 +6130,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5892,6 +6145,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5906,6 +6160,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5920,6 +6175,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5934,6 +6190,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5948,6 +6205,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5962,6 +6220,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5976,6 +6235,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -5990,6 +6250,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6004,6 +6265,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6018,6 +6280,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6032,6 +6295,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6046,6 +6310,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6060,6 +6325,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6074,6 +6340,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6088,6 +6355,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6102,6 +6370,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6116,6 +6385,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6130,6 +6400,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6144,6 +6415,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6158,6 +6430,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6172,6 +6445,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6186,6 +6460,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6200,6 +6475,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6214,6 +6490,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6228,6 +6505,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6242,6 +6520,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6256,6 +6535,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6270,6 +6550,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6284,6 +6565,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6298,6 +6580,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6312,6 +6595,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6326,6 +6610,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6340,6 +6625,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6354,6 +6640,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6368,6 +6655,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6382,6 +6670,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6396,6 +6685,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6410,6 +6700,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6424,6 +6715,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6438,6 +6730,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6452,6 +6745,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6466,6 +6760,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6480,6 +6775,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6494,6 +6790,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6508,6 +6805,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6522,6 +6820,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6536,6 +6835,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6550,6 +6850,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6564,6 +6865,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6578,6 +6880,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6592,6 +6895,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6606,6 +6910,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6620,6 +6925,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6634,6 +6940,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6648,6 +6955,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6662,6 +6970,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6676,6 +6985,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6690,6 +7000,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6704,6 +7015,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6718,6 +7030,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6732,6 +7045,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6746,6 +7060,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6760,6 +7075,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6774,6 +7090,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6788,6 +7105,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6802,6 +7120,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6816,6 +7135,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6830,6 +7150,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6844,6 +7165,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6858,6 +7180,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6872,6 +7195,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6886,6 +7210,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6900,6 +7225,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6914,6 +7240,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6928,6 +7255,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6942,6 +7270,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6956,6 +7285,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6970,6 +7300,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6984,6 +7315,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -6998,6 +7330,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7012,6 +7345,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7026,6 +7360,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7040,6 +7375,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7054,6 +7390,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7068,6 +7405,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7082,6 +7420,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7096,6 +7435,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7110,6 +7450,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7124,6 +7465,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7138,6 +7480,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7152,6 +7495,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7166,6 +7510,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7180,6 +7525,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7194,6 +7540,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7208,6 +7555,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7222,6 +7570,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7236,6 +7585,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7250,6 +7600,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7264,6 +7615,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7278,6 +7630,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7292,6 +7645,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7306,6 +7660,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7320,6 +7675,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7334,6 +7690,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7348,6 +7705,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7362,6 +7720,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7376,6 +7735,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7390,6 +7750,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7404,6 +7765,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7418,6 +7780,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7432,6 +7795,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
@@ -7596,6 +7960,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|Win32'">false</ExcludedFromBuild>
@@ -7635,6 +8000,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|x64'">false</ExcludedFromBuild>
@@ -7693,6 +8059,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|Win32'">false</ExcludedFromBuild>
@@ -7732,6 +8099,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|x64'">false</ExcludedFromBuild>
@@ -7785,6 +8153,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|Win32'">false</ExcludedFromBuild>
@@ -7824,6 +8193,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|x64'">false</ExcludedFromBuild>
@@ -7867,6 +8237,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|Win32'">false</ExcludedFromBuild>
@@ -7906,6 +8277,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|x64'">false</ExcludedFromBuild>
@@ -7949,6 +8321,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|Win32'">false</ExcludedFromBuild>
@@ -7988,6 +8361,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|x64'">false</ExcludedFromBuild>
@@ -8031,6 +8405,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|Win32'">false</ExcludedFromBuild>
@@ -8070,6 +8445,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|x64'">false</ExcludedFromBuild>
@@ -8118,6 +8494,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|Win32'">false</ExcludedFromBuild>
@@ -8157,6 +8534,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|x64'">false</ExcludedFromBuild>
@@ -8204,6 +8582,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|Win32'">false</ExcludedFromBuild>
@@ -8243,6 +8622,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|x64'">false</ExcludedFromBuild>
@@ -8298,6 +8678,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|Win32'">false</ExcludedFromBuild>
@@ -8337,6 +8718,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force cpp03|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Small Strings|x64'">false</ExcludedFromBuild>
@@ -8579,6 +8961,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC - No STL -O2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - No STL - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - No STL - Force Constexpr Algorithms|Win32'">true</ExcludedFromBuild>
@@ -8616,6 +8999,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC - No STL -O2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - No STL - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - No STL - Force Constexpr Algorithms|Win32'">true</ExcludedFromBuild>
@@ -8653,6 +9037,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - No STL - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - No STL - Force Constexpr Algorithms|Win32'">true</ExcludedFromBuild>
@@ -8690,6 +9075,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC - No STL -O2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='MSVC Debug - No STL - Appveyor|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - No STL - Force Constexpr Algorithms|Win32'">true</ExcludedFromBuild>
@@ -8721,6 +9107,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>

From 2a5565791ce4a61268d2d438339210b8d8eb92dc Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 11 Mar 2024 18:34:51 +0000
Subject: [PATCH 093/131] Deleted etl::span fixed extent default constructor

---
 include/etl/span.h              |  8 ------
 test/test_span_fixed_extent.cpp | 43 +++------------------------------
 2 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/include/etl/span.h b/include/etl/span.h
index f3647c7c..f1077ea7 100644
--- a/include/etl/span.h
+++ b/include/etl/span.h
@@ -79,14 +79,6 @@ namespace etl
 
     static ETL_CONSTANT size_t extent = Extent;
 
-    //*************************************************************************
-    /// Default constructor.
-    //*************************************************************************
-    ETL_CONSTEXPR span() ETL_NOEXCEPT
-      : pbegin(ETL_NULLPTR)
-    {
-    }
-
     //*************************************************************************
     /// Construct from iterators + size
     //*************************************************************************
diff --git a/test/test_span_fixed_extent.cpp b/test/test_span_fixed_extent.cpp
index 001086bb..b59237c1 100644
--- a/test/test_span_fixed_extent.cpp
+++ b/test/test_span_fixed_extent.cpp
@@ -76,16 +76,6 @@ namespace
     const int ccdata[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
     const int* pccdata = ccdata;
 
-    //*************************************************************************
-    TEST(test_default_constructor)
-    {
-      View view;
-
-      CHECK_EQUAL(10U, view.size());
-      CHECK_EQUAL(10U, view.max_size());
-      CHECK(!view.empty());
-    }
-
 #if ETL_USING_CPP20
     //*************************************************************************
     TEST(test_construct_from_std_span)
@@ -272,9 +262,7 @@ namespace
     //*************************************************************************
     TEST(test_implicit_constructor_c_array_2)
     {
-      CView view;
-
-      view = ccdata;
+      CView view(ccdata);
 
       CHECK_EQUAL(SIZE, view.size());
       CHECK_EQUAL(SIZE, view.max_size());
@@ -362,12 +350,11 @@ namespace
     TEST(test_assign_from_span)
     {
       View view1(etldata);
-      View view2;
+      View view2 = view1;
 
       CView cview1(etldata);
-      CView cview2;
+      CView cview2 = view2;
 
-      view2 = view1;
       cview2 = cview1;
 
       CHECK_EQUAL(view1.size(), view2.size());
@@ -1027,22 +1014,16 @@ namespace
       View view2{ data1 };
       View view3{ data2 };
       View view4{ data3 };
-      View view6;
-      View view7;
       SView view8{ data4 };
 
       CHECK_TRUE(etl::equal(view1, view2));
       CHECK_TRUE(etl::equal(view1, view3));
       CHECK_FALSE(etl::equal(view1, view4));
-      CHECK_TRUE(etl::equal(view6, view6));
-      CHECK_TRUE(etl::equal(view6, view7));
       CHECK_FALSE(etl::equal(view1, view8));
 
       CHECK_TRUE(view1 == view2);
       CHECK_FALSE(view1 == view3);
       CHECK_FALSE(view1 == view4);
-      CHECK_TRUE(view6 == view6);
-      CHECK_TRUE(view6 == view7);
       CHECK_FALSE(view1 == view8);
     }
 
@@ -1057,20 +1038,14 @@ namespace
       CView view2{ data1 };
       CView view3{ data2 };
       CView view4{ data3 };
-      View view6;
-      CView view7;
 
       CHECK_TRUE(etl::equal(view1, view2));
       CHECK_TRUE(etl::equal(view1, view3));
       CHECK_FALSE(etl::equal(view1, view4));
-      CHECK_TRUE(etl::equal(view6, view6));
-      CHECK_TRUE(etl::equal(view6, view7));
 
       CHECK_TRUE(view1 == view2);
       CHECK_FALSE(view1 == view3);
       CHECK_FALSE(view1 == view4);
-      CHECK_TRUE(view6 == view6);
-      CHECK_TRUE(view6 == view7);
     }
 
     //*************************************************************************
@@ -1084,20 +1059,14 @@ namespace
       View view2{ data1 };
       View view3{ data2 };
       View view4{ data3 };
-      View view6;
-      View view7;
 
       CHECK_TRUE(etl::equal(view1, view2));
       CHECK_TRUE(etl::equal(view1, view3));
       CHECK_FALSE(etl::equal(view1, view4));
-      CHECK_TRUE(etl::equal(view6, view6));
-      CHECK_TRUE(etl::equal(view6, view7));
 
       CHECK_FALSE(view1 != view2);
       CHECK_TRUE(view1 != view3);
       CHECK_TRUE(view1 != view4);
-      CHECK_FALSE(view6 != view6);
-      CHECK_FALSE(view6 != view7);
     }
 
     //*************************************************************************
@@ -1111,20 +1080,14 @@ namespace
       CView view2{ data1 };
       CView view3{ data2 };
       CView view4{ data3 };
-      View view6;
-      View view7;
 
       CHECK_TRUE(etl::equal(view1, view2));
       CHECK_TRUE(etl::equal(view1, view3));
       CHECK_FALSE(etl::equal(view1, view4));
-      CHECK_TRUE(etl::equal(view6, view6));
-      CHECK_TRUE(etl::equal(view6, view7));
 
       CHECK_FALSE(view1 != view2);
       CHECK_TRUE(view1 != view3);
       CHECK_TRUE(view1 != view4);
-      CHECK_FALSE(view6 != view6);
-      CHECK_FALSE(view6 != view7);
     }
 
     //*************************************************************************

From b807bad3e3eaee3c756521acba10fed4084f6b72 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Wed, 13 Mar 2024 09:54:29 +0000
Subject: [PATCH 094/131] #847-Add-has_active_timer-to-callback_timer

---
 include/etl/callback_timer.h           | 16 ++++++++++-
 include/etl/callback_timer_atomic.h    | 20 ++++++++++++-
 include/etl/callback_timer_interrupt.h | 22 +++++++++++++--
 include/etl/callback_timer_locked.h    | 20 ++++++++++++-
 include/etl/message_timer.h            | 20 ++++++++++++-
 include/etl/message_timer_atomic.h     | 20 ++++++++++++-
 include/etl/message_timer_interrupt.h  | 22 +++++++++++++--
 include/etl/message_timer_locked.h     | 22 +++++++++++++--
 include/etl/timer.h                    | 11 ++++++++
 test/test_callback_timer.cpp           | 34 +++++++++++++++++++++-
 test/test_callback_timer_atomic.cpp    | 32 +++++++++++++++++++++
 test/test_callback_timer_interrupt.cpp | 32 +++++++++++++++++++++
 test/test_callback_timer_locked.cpp    | 37 ++++++++++++++++++++++++
 test/test_message_timer.cpp            | 34 ++++++++++++++++++++++
 test/test_message_timer_atomic.cpp     | 34 ++++++++++++++++++++++
 test/test_message_timer_interrupt.cpp  | 34 ++++++++++++++++++++++
 test/test_message_timer_locked.cpp     | 39 ++++++++++++++++++++++++++
 17 files changed, 435 insertions(+), 14 deletions(-)

diff --git a/include/etl/callback_timer.h b/include/etl/callback_timer.h
index e4b5596d..9c833dbb 100644
--- a/include/etl/callback_timer.h
+++ b/include/etl/callback_timer.h
@@ -708,12 +708,26 @@ namespace etl
       return false;
     }
 
+    //*******************************************
+    /// Check if there is an active timer.
+    //*******************************************
+    bool has_active_timer() const
+    {
+      return !active_list.empty();
+    }
+
     //*******************************************
     /// Get the time to the next timer event.
+    /// Returns etl::timer::interval::No_Active_Interval if there is no active timer.
     //*******************************************
     uint32_t time_to_next() const
     {
-      uint32_t delta = active_list.front().delta;
+      uint32_t delta = static_cast<uint32_t>(etl::timer::interval::No_Active_Interval);
+
+      if (has_active_timer())
+      {
+        delta = active_list.front().delta;
+      }
 
       return delta;
     }
diff --git a/include/etl/callback_timer_atomic.h b/include/etl/callback_timer_atomic.h
index 0d12fc29..2a886de2 100644
--- a/include/etl/callback_timer_atomic.h
+++ b/include/etl/callback_timer_atomic.h
@@ -297,13 +297,31 @@ namespace etl
       return false;
     }
 
+    //*******************************************
+    /// Check if there is an active timer.
+    //*******************************************
+    bool has_active_timer() const
+    {
+      ++process_semaphore;
+      bool result = !active_list.empty();
+      --process_semaphore;
+
+      return result;
+    }
+
     //*******************************************
     /// Get the time to the next timer event.
+    /// Returns etl::timer::interval::No_Active_Interval if there is no active timer.
     //*******************************************
     uint32_t time_to_next() const
     {
+      uint32_t delta = static_cast<uint32_t>(etl::timer::interval::No_Active_Interval);
+
       ++process_semaphore;
-      uint32_t delta = active_list.front().delta;
+      if (!active_list.empty())
+      {
+        delta = active_list.front().delta;
+      }
       --process_semaphore;
 
       return delta;
diff --git a/include/etl/callback_timer_interrupt.h b/include/etl/callback_timer_interrupt.h
index bc3fda5d..831565aa 100644
--- a/include/etl/callback_timer_interrupt.h
+++ b/include/etl/callback_timer_interrupt.h
@@ -301,14 +301,30 @@ namespace etl
     }
 
     //*******************************************
-    /// Get the time to the next timer event.
+    /// Check if there is an active timer.
     //*******************************************
-    uint32_t time_to_next() const
+    bool has_active_timer() const
     {
       TInterruptGuard guard;
       (void)guard; // Silence 'unused variable warnings.
+      return !active_list.empty();
+    }
 
-      uint32_t delta = active_list.front().delta;
+    //*******************************************
+    /// Get the time to the next timer event.
+    /// Returns etl::timer::interval::No_Active_Interval if there is no active timer.
+    //*******************************************
+    uint32_t time_to_next() const
+    {
+      uint32_t delta = static_cast<uint32_t>(etl::timer::interval::No_Active_Interval);
+
+      TInterruptGuard guard;
+      (void)guard; // Silence 'unused variable warnings.
+
+      if (!active_list.empty())
+      {
+        delta = active_list.front().delta;
+      }
 
       return delta;
     }
diff --git a/include/etl/callback_timer_locked.h b/include/etl/callback_timer_locked.h
index bfd6952c..c7480ba8 100644
--- a/include/etl/callback_timer_locked.h
+++ b/include/etl/callback_timer_locked.h
@@ -309,13 +309,31 @@ namespace etl
       unlock   = unlock_;
     }
 
+    //*******************************************
+    /// Check if there is an active timer.
+    //*******************************************
+    bool has_active_timer() const
+    {
+      lock();
+      bool result = !active_list.empty();
+      unlock();
+
+      return result;
+    }
+
     //*******************************************
     /// Get the time to the next timer event.
+    /// Returns etl::timer::interval::No_Active_Interval if there is no active timer.
     //*******************************************
     uint32_t time_to_next() const
     {
+      uint32_t delta = static_cast<uint32_t>(etl::timer::interval::No_Active_Interval);
+
       lock();
-      uint32_t delta = active_list.front().delta;
+      if (!active_list.empty())
+      {
+        delta = active_list.front().delta;
+      }
       unlock();
 
       return delta;
diff --git a/include/etl/message_timer.h b/include/etl/message_timer.h
index 075b03ad..f272877b 100644
--- a/include/etl/message_timer.h
+++ b/include/etl/message_timer.h
@@ -589,13 +589,31 @@ namespace etl
       return false;
     }
 
+    //*******************************************
+    /// Check if there is an active timer.
+    //*******************************************
+    bool has_active_timer() const
+    {
+      ETL_DISABLE_TIMER_UPDATES;
+      bool result = !active_list.empty();
+      ETL_ENABLE_TIMER_UPDATES;
+
+      return result;
+    }
+
     //*******************************************
     /// Get the time to the next timer event.
+    /// Returns etl::timer::interval::No_Active_Interval if there is no active timer.
     //*******************************************
     uint32_t time_to_next() const
     {
+      uint32_t delta = static_cast<uint32_t>(etl::timer::interval::No_Active_Interval);
+
       ETL_DISABLE_TIMER_UPDATES;
-      uint32_t delta = active_list.front().delta;
+      if (!active_list.empty())
+      {        
+        delta = active_list.front().delta;
+      }
       ETL_ENABLE_TIMER_UPDATES;
 
       return delta;
diff --git a/include/etl/message_timer_atomic.h b/include/etl/message_timer_atomic.h
index 97fb3183..2710ea29 100644
--- a/include/etl/message_timer_atomic.h
+++ b/include/etl/message_timer_atomic.h
@@ -302,13 +302,31 @@ namespace etl
       return false;
     }
 
+    //*******************************************
+    /// Check if there is an active timer.
+    //*******************************************
+    bool has_active_timer() const
+    {
+      ++process_semaphore;
+      bool result = !active_list.empty();
+      --process_semaphore;
+
+      return result;
+    }
+
     //*******************************************
     /// Get the time to the next timer event.
+    /// Returns etl::timer::interval::No_Active_Interval if there is no active timer.
     //*******************************************
     uint32_t time_to_next() const
     {
+      uint32_t delta = static_cast<uint32_t>(etl::timer::interval::No_Active_Interval);
+
       ++process_semaphore;
-      uint32_t delta = active_list.front().delta;
+      if (!active_list.empty())
+      {
+        delta = active_list.front().delta;
+      }
       --process_semaphore;
 
       return delta;
diff --git a/include/etl/message_timer_interrupt.h b/include/etl/message_timer_interrupt.h
index c906d8ef..6f26789a 100644
--- a/include/etl/message_timer_interrupt.h
+++ b/include/etl/message_timer_interrupt.h
@@ -312,14 +312,30 @@ namespace etl
     }
 
     //*******************************************
-    /// Get the time to the next timer event.
+    /// Check if there is an active timer.
     //*******************************************
-    uint32_t time_to_next() const
+    bool has_active_timer() const
     {
       TInterruptGuard guard;
       (void)guard; // Silence 'unused variable warnings.
+      return !active_list.empty();
+    }
 
-      uint32_t delta = active_list.front().delta;
+    //*******************************************
+    /// Get the time to the next timer event.
+    /// Returns etl::timer::interval::No_Active_Interval if there is no active timer.
+    //*******************************************
+    uint32_t time_to_next() const
+    {
+      uint32_t delta = static_cast<uint32_t>(etl::timer::interval::No_Active_Interval);
+
+      TInterruptGuard guard;
+      (void)guard; // Silence 'unused variable warnings.
+
+      if (!active_list.empty())
+      {
+        delta = active_list.front().delta;
+      }
 
       return delta;
     }
diff --git a/include/etl/message_timer_locked.h b/include/etl/message_timer_locked.h
index cd44702e..5639dc2f 100644
--- a/include/etl/message_timer_locked.h
+++ b/include/etl/message_timer_locked.h
@@ -318,14 +318,32 @@ namespace etl
       unlock   = unlock_;
     }
 
+    //*******************************************
+    /// Check if there is an active timer.
+    //*******************************************
+    bool has_active_timer() const
+    {
+      lock();
+      bool result = !active_list.empty();
+      unlock();
+
+      return result;
+    }
+
     //*******************************************
     /// Get the time to the next timer event.
+    /// Returns etl::timer::interval::No_Active_Interval if there is no active timer.
     //*******************************************
     uint32_t time_to_next() const
     {
-      lock();
+      uint32_t delta = static_cast<uint32_t>(etl::timer::interval::No_Active_Interval);
 
-      uint32_t delta = active_list.front().delta;
+      lock();
+      if (!active_list.empty())
+      {
+        delta = active_list.front().delta;
+      }
+      unlock();
 
       return delta;
     }
diff --git a/include/etl/timer.h b/include/etl/timer.h
index 856413b0..ed96cdec 100644
--- a/include/etl/timer.h
+++ b/include/etl/timer.h
@@ -104,6 +104,17 @@ namespace etl
         Inactive = 0xFFFFFFFFUL
       };
     };
+
+    // Timer time interval.
+    struct interval
+    {
+      enum
+      {
+        No_Active_Interval = 0xFFFFFFFFUL
+      };
+
+      typedef uint32_t type;
+    };
   };
 }
 
diff --git a/test/test_callback_timer.cpp b/test/test_callback_timer.cpp
index a807a754..cdb6bb99 100644
--- a/test/test_callback_timer.cpp
+++ b/test/test_callback_timer.cpp
@@ -647,7 +647,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(message_timer_time_to_next)
+    TEST(message_timer_time_to_next_repeating)
     {
       etl::callback_timer<3> timer_controller;
 
@@ -694,6 +694,38 @@ namespace
       CHECK_EQUAL(4, timer_controller.time_to_next());
     }
 
+    //*************************************************************************
+    TEST(message_timer_time_to_next_with_has_active_timer)
+    {
+      etl::callback_timer<3> timer_controller;
+
+      etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id3 = timer_controller.register_timer(free_callback2, 11, etl::timer::mode::Single_Shot);
+
+      timer_controller.start(id1);
+      timer_controller.start(id3);
+      timer_controller.start(id2);
+
+      timer_controller.enable(true);
+
+      timer_controller.tick(11);
+      CHECK_EQUAL(12, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(23);
+      CHECK_EQUAL(3, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(2);
+      CHECK_EQUAL(1, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(1);
+      CHECK_EQUAL(static_cast<etl::timer::interval::type>(etl::timer::interval::No_Active_Interval), timer_controller.time_to_next());
+      CHECK_FALSE(timer_controller.has_active_timer());
+    }
+
     //*************************************************************************
     class test_object
     {
diff --git a/test/test_callback_timer_atomic.cpp b/test/test_callback_timer_atomic.cpp
index 442e2be9..73047903 100644
--- a/test/test_callback_timer_atomic.cpp
+++ b/test/test_callback_timer_atomic.cpp
@@ -701,6 +701,38 @@ namespace
       CHECK_EQUAL(4, timer_controller.time_to_next());
     }
 
+    //*************************************************************************
+    TEST(message_timer_time_to_next_with_has_active_timer)
+    {
+      etl::callback_timer_atomic<3, std::atomic_uint32_t> timer_controller;
+
+      etl::timer::id::type id1 = timer_controller.register_timer(member_callback1, 37, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback1, 23, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Single_Shot);
+
+      timer_controller.start(id1);
+      timer_controller.start(id3);
+      timer_controller.start(id2);
+
+      timer_controller.enable(true);
+
+      timer_controller.tick(11);
+      CHECK_EQUAL(12, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(23);
+      CHECK_EQUAL(3, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(2);
+      CHECK_EQUAL(1, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(1);
+      CHECK_EQUAL(static_cast<etl::timer::interval::type>(etl::timer::interval::No_Active_Interval), timer_controller.time_to_next());
+      CHECK_FALSE(timer_controller.has_active_timer());
+    }
+
     //*************************************************************************
     class test_object
     {
diff --git a/test/test_callback_timer_interrupt.cpp b/test/test_callback_timer_interrupt.cpp
index 752aa560..b0fdba64 100644
--- a/test/test_callback_timer_interrupt.cpp
+++ b/test/test_callback_timer_interrupt.cpp
@@ -740,6 +740,38 @@ namespace
       CHECK_EQUAL(4, timer_controller.time_to_next());
     }
 
+    //*************************************************************************
+    TEST(message_timer_time_to_next_with_has_active_timer)
+    {
+      etl::callback_timer_interrupt<3, ScopedGuard> timer_controller;
+
+      etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Single_Shot);
+
+      timer_controller.start(id1);
+      timer_controller.start(id3);
+      timer_controller.start(id2);
+
+      timer_controller.enable(true);
+
+      timer_controller.tick(11);
+      CHECK_EQUAL(12, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(23);
+      CHECK_EQUAL(3, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(2);
+      CHECK_EQUAL(1, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(1);
+      CHECK_EQUAL(static_cast<etl::timer::interval::type>(etl::timer::interval::No_Active_Interval), timer_controller.time_to_next());
+      CHECK_FALSE(timer_controller.has_active_timer());
+    }
+
     //*************************************************************************
     class test_object
     {
diff --git a/test/test_callback_timer_locked.cpp b/test/test_callback_timer_locked.cpp
index 6ef92aca..c9f07cd4 100644
--- a/test/test_callback_timer_locked.cpp
+++ b/test/test_callback_timer_locked.cpp
@@ -871,6 +871,43 @@ namespace
       CHECK_EQUAL(4, timer_controller.time_to_next());
     }
 
+    //*************************************************************************
+    TEST(message_timer_time_to_next_with_has_active_timer)
+    {
+      locks.clear();
+      try_lock_type try_lock = try_lock_type::create<Locks, locks, &Locks::try_lock>();
+      lock_type     lock     = lock_type::create<Locks, locks, &Locks::lock>();
+      unlock_type   unlock   = unlock_type::create<Locks, locks, &Locks::unlock>();
+
+      etl::callback_timer_locked<3> timer_controller(try_lock, lock, unlock);
+
+      etl::timer::id::type id1 = timer_controller.register_timer(member_callback, 37, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id2 = timer_controller.register_timer(free_function_callback, 23, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id3 = timer_controller.register_timer(free_function_callback2, 11, etl::timer::mode::Single_Shot);
+
+      timer_controller.start(id1);
+      timer_controller.start(id3);
+      timer_controller.start(id2);
+
+      timer_controller.enable(true);
+
+      timer_controller.tick(11);
+      CHECK_EQUAL(12, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(23);
+      CHECK_EQUAL(3, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(2);
+      CHECK_EQUAL(1, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(1);
+      CHECK_EQUAL(static_cast<etl::timer::interval::type>(etl::timer::interval::No_Active_Interval), timer_controller.time_to_next());
+      CHECK_FALSE(timer_controller.has_active_timer());
+    }
+
     //*************************************************************************
 #if REALTIME_TEST
 
diff --git a/test/test_message_timer.cpp b/test/test_message_timer.cpp
index 3f27e81e..0d5231f6 100644
--- a/test/test_message_timer.cpp
+++ b/test/test_message_timer.cpp
@@ -643,6 +643,40 @@ namespace
       CHECK_EQUAL(4, timer_controller.time_to_next());
     }
 
+    //*************************************************************************
+    TEST(message_timer_time_to_next_with_has_active_timer)
+    {
+      etl::message_timer<3> timer_controller;
+
+      etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot);
+
+      router1.clear();
+
+      timer_controller.start(id1);
+      timer_controller.start(id3);
+      timer_controller.start(id2);
+
+      timer_controller.enable(true);
+
+      timer_controller.tick(11);
+      CHECK_EQUAL(12, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(23);
+      CHECK_EQUAL(3, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(2);
+      CHECK_EQUAL(1, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(1);
+      CHECK_EQUAL(static_cast<etl::timer::interval::type>(etl::timer::interval::No_Active_Interval), timer_controller.time_to_next());
+      CHECK_FALSE(timer_controller.has_active_timer());
+    }
+
     //*************************************************************************
 #if REALTIME_TEST
 
diff --git a/test/test_message_timer_atomic.cpp b/test/test_message_timer_atomic.cpp
index f8683f50..98a899ee 100644
--- a/test/test_message_timer_atomic.cpp
+++ b/test/test_message_timer_atomic.cpp
@@ -643,6 +643,40 @@ namespace
       CHECK_EQUAL(4, timer_controller.time_to_next());
     }
 
+    //*************************************************************************
+    TEST(message_timer_time_to_next_with_has_active_timer)
+    {
+      etl::message_timer_atomic<3, std::atomic_uint32_t> timer_controller;
+
+      etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot);
+
+      router1.clear();
+
+      timer_controller.start(id1);
+      timer_controller.start(id3);
+      timer_controller.start(id2);
+
+      timer_controller.enable(true);
+
+      timer_controller.tick(11);
+      CHECK_EQUAL(12, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(23);
+      CHECK_EQUAL(3, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(2);
+      CHECK_EQUAL(1, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(1);
+      CHECK_EQUAL(static_cast<etl::timer::interval::type>(etl::timer::interval::No_Active_Interval), timer_controller.time_to_next());
+      CHECK_FALSE(timer_controller.has_active_timer());
+    }
+
     //*************************************************************************
 #if REALTIME_TEST
 
diff --git a/test/test_message_timer_interrupt.cpp b/test/test_message_timer_interrupt.cpp
index d1601bdb..e746644b 100644
--- a/test/test_message_timer_interrupt.cpp
+++ b/test/test_message_timer_interrupt.cpp
@@ -690,6 +690,40 @@ namespace
       CHECK_EQUAL(4, timer_controller.time_to_next());
     }
 
+    //*************************************************************************
+    TEST(message_timer_time_to_next_with_has_active_timer)
+    {
+      etl::message_timer_interrupt<3, ScopedGuard> timer_controller;
+
+      etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot);
+
+      router1.clear();
+
+      timer_controller.start(id1);
+      timer_controller.start(id3);
+      timer_controller.start(id2);
+
+      timer_controller.enable(true);
+
+      timer_controller.tick(11);
+      CHECK_EQUAL(12, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(23);
+      CHECK_EQUAL(3, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(2);
+      CHECK_EQUAL(1, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(1);
+      CHECK_EQUAL(static_cast<etl::timer::interval::type>(etl::timer::interval::No_Active_Interval), timer_controller.time_to_next());
+      CHECK_FALSE(timer_controller.has_active_timer());
+    }
+
     //************************************************************************* 
     class RouterLog : public etl::message_router<RouterLog, Message1, Message2, Message3, Message4>
     {
diff --git a/test/test_message_timer_locked.cpp b/test/test_message_timer_locked.cpp
index 0e866be6..c3078c2d 100644
--- a/test/test_message_timer_locked.cpp
+++ b/test/test_message_timer_locked.cpp
@@ -770,6 +770,45 @@ namespace
       CHECK_EQUAL(4, timer_controller.time_to_next());
     }
 
+    //*************************************************************************
+    TEST(message_timer_time_to_next_with_has_active_timer)
+    {
+      locks.clear();
+      try_lock_type try_lock = try_lock_type::create<Locks, locks, &Locks::try_lock>();
+      lock_type     lock     = lock_type::create<Locks, locks, &Locks::lock>();
+      unlock_type   unlock   = unlock_type::create<Locks, locks, &Locks::unlock>();
+
+      etl::message_timer_locked<3> timer_controller(try_lock, lock, unlock);
+
+      etl::timer::id::type id1 = timer_controller.register_timer(message1, router1, 37, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id2 = timer_controller.register_timer(message2, router1, 23, etl::timer::mode::Single_Shot);
+      etl::timer::id::type id3 = timer_controller.register_timer(message3, router1, 11, etl::timer::mode::Single_Shot);
+
+      router1.clear();
+
+      timer_controller.start(id1);
+      timer_controller.start(id3);
+      timer_controller.start(id2);
+
+      timer_controller.enable(true);
+
+      timer_controller.tick(11);
+      CHECK_EQUAL(12, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(23);
+      CHECK_EQUAL(3, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(2);
+      CHECK_EQUAL(1, timer_controller.time_to_next());
+      CHECK_TRUE(timer_controller.has_active_timer());
+
+      timer_controller.tick(1);
+      CHECK_EQUAL(static_cast<etl::timer::interval::type>(etl::timer::interval::No_Active_Interval), timer_controller.time_to_next());
+      CHECK_FALSE(timer_controller.has_active_timer());
+    }
+
     //*************************************************************************
 #if REALTIME_TEST
 

From 48c496cd44c6ed2ef590450f61c7a5e184abd190 Mon Sep 17 00:00:00 2001
From: Drew Rife <drew.rife95@gmail.com>
Date: Wed, 13 Mar 2024 05:56:47 -0400
Subject: [PATCH 095/131] Implement Constexpr Strong Typedef (#861)

* feat: make type_def constexpr

* test: macro constexpr

* test: implicit constexpr

* test: get constexpr

* refactor: remove constexpr from assignment

* test: comparisons constexpr

* fix: cpp11 support for constexpr get method
---
 include/etl/type_def.h | 34 ++++++++++++--------
 test/test_type_def.cpp | 71 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 13 deletions(-)

diff --git a/include/etl/type_def.h b/include/etl/type_def.h
index d16e4cd9..9b003313 100644
--- a/include/etl/type_def.h
+++ b/include/etl/type_def.h
@@ -58,25 +58,25 @@ namespace etl
         typedef TIdType id_type;
 
         //*********************************************************************
-        type_def()
+        ETL_CONSTEXPR type_def()
             : value(TValue())
         {
         }
 
         //*********************************************************************
-        type_def(TValue value_)
+        ETL_CONSTEXPR type_def(TValue value_)
             : value(value_)
         {
         }
 
         //*********************************************************************
-        type_def(const type_def& other)
+        ETL_CONSTEXPR type_def(const type_def& other)
             : value(other.value)
         {
         }
 
         //*********************************************************************
-        operator TValue() const
+        ETL_CONSTEXPR operator TValue() const
         {
             return value;
         }
@@ -238,63 +238,71 @@ namespace etl
         }
 
         //*********************************************************************
-        type_def& operator =(TValue rhs)
+        ETL_CONSTEXPR type_def& operator =(TValue rhs)
         {
             value = rhs;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator =(const type_def& rhs)
+        ETL_CONSTEXPR type_def& operator =(const type_def& rhs)
         {
           value = rhs.value;
           return *this;
         }
 
         //*********************************************************************
-        TValue& get()
+        ETL_CONSTEXPR TValue& get()
         {
             return value;
         }
 
+#if ETL_USING_CPP14
+        //*********************************************************************
+        ETL_CONSTEXPR const TValue& get() const
+        {
+            return value;
+        }
+#else 
         //*********************************************************************
         const TValue& get() const
         {
             return value;
         }
+#endif // ETL_USING_CPP14
 
         //*********************************************************************
-        friend bool operator <(const type_def& lhs, const type_def& rhs)
+        friend ETL_CONSTEXPR bool operator <(const type_def& lhs, const type_def& rhs)
         {
             return lhs.value < rhs.value;
         }
 
         //*********************************************************************
-        friend bool operator <=(const type_def& lhs, const type_def& rhs)
+        friend ETL_CONSTEXPR bool operator <=(const type_def& lhs, const type_def& rhs)
         {
             return lhs.value <= rhs.value;
         }
 
         //*********************************************************************
-        friend bool operator >(const type_def& lhs, const type_def& rhs)
+        friend ETL_CONSTEXPR bool operator >(const type_def& lhs, const type_def& rhs)
         {
             return lhs.value > rhs.value;
         }
 
         //*********************************************************************
-        friend bool operator >=(const type_def& lhs, const type_def& rhs)
+        friend ETL_CONSTEXPR bool operator >=(const type_def& lhs, const type_def& rhs)
         {
             return lhs.value >= rhs.value;
         }
 
         //*********************************************************************
-        friend bool operator ==(const type_def& lhs, const type_def& rhs)
+        friend ETL_CONSTEXPR bool operator ==(const type_def& lhs, const type_def& rhs)
         {
             return lhs.value == rhs.value;
         }
 
         //*********************************************************************
-        friend bool operator !=(const type_def& lhs, const type_def& rhs)
+        friend ETL_CONSTEXPR bool operator !=(const type_def& lhs, const type_def& rhs)
         {
             return lhs.value != rhs.value;
         }
diff --git a/test/test_type_def.cpp b/test/test_type_def.cpp
index 5cf9203b..b2f27172 100644
--- a/test/test_type_def.cpp
+++ b/test/test_type_def.cpp
@@ -51,6 +51,21 @@ namespace
       CHECK_EQUAL(i1, i2);
     }
 
+    //*************************************************************************
+    TEST(test_macro_constexpr)
+    {
+      ETL_TYPEDEF(uint32_t, type1_t);
+      ETL_TYPEDEF(uint32_t, type2_t);
+
+      constexpr type1_t t1 = type1_t(1);
+      constexpr type2_t t2 = type2_t(1);
+
+      uint32_t i1 = t1.get();
+      uint32_t i2 = t2.get();
+
+      CHECK_EQUAL(i1, i2);
+    }
+
     //*************************************************************************
     TEST(test_implicit)
     {
@@ -69,6 +84,24 @@ namespace
       CHECK_EQUAL(i1, i2);
     }
 
+    //*************************************************************************
+    TEST(test_implicit_constexpr)
+    {
+      class type1_t_tag;
+      typedef etl::type_def<type1_t_tag, uint32_t> type1_t;
+
+      class type2_t_tag;
+      typedef etl::type_def<type2_t_tag, uint32_t> type2_t;
+
+      constexpr type1_t t1 = type1_t(1);
+      constexpr type2_t t2 = type2_t(1);
+
+      uint32_t i1 = t1.get();
+      uint32_t i2 = t2.get();
+
+      CHECK_EQUAL(i1, i2);
+    }
+
     //*************************************************************************
     TEST(test_get)
     {
@@ -84,6 +117,21 @@ namespace
       CHECK_EQUAL(t1.get(), t2.get());
     }
 
+    //*************************************************************************
+    TEST(test_get_constexpr)
+    {
+      class type1_t_tag;
+      typedef etl::type_def<type1_t_tag, uint32_t> type1_t;
+
+      class type2_t_tag;
+      typedef etl::type_def<type2_t_tag, uint32_t> type2_t;
+
+      constexpr type1_t t1(1);
+      constexpr type2_t t2(1);
+
+      CHECK_EQUAL(t1.get(), t2.get());
+    }
+
     //*************************************************************************
     TEST(test_operators)
     {
@@ -141,5 +189,28 @@ namespace
       CHECK(!(t1 >= t2));
       CHECK(t2 >= t4);
     }
+
+    //*************************************************************************
+    TEST(test_comparisons_constexpr)
+    {
+      class __type_t__;
+      typedef etl::type_def<__type_t__, uint32_t> type_t;
+
+      constexpr type_t t1(1);
+      constexpr type_t t2(2);
+      constexpr type_t t3(t1);
+      constexpr type_t t4(t2);
+
+      CHECK(t1 <  t2);
+      CHECK(!(t2 <  t1));
+      CHECK(t1 <= t2);
+      CHECK(!(t2 <= t1));
+      CHECK(t1 <= t3);
+      CHECK(t2 >  t1);
+      CHECK(!(t1 >  t2));
+      CHECK(t2 >= t1);
+      CHECK(!(t1 >= t2));
+      CHECK(t2 >= t4);
+    }
   };
 }

From 80613827c980eb8ab5b0f285b2611fb36d1ce6af Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Fri, 15 Mar 2024 10:58:11 +0000
Subject: [PATCH 096/131] Turned etl::send_message into templates so that
 direct calls to concrete routers are possible

---
 include/etl/message_router.h | 40 +++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/include/etl/message_router.h b/include/etl/message_router.h
index c2712b16..63c726b2 100644
--- a/include/etl/message_router.h
+++ b/include/etl/message_router.h
@@ -342,11 +342,22 @@ namespace etl
     }
   };
 
+  //***************************************************************************
+  /// Is T ultimately derived from etl::imessage_router?
+  //***************************************************************************
+  template <typename T>
+  struct is_message_router : public etl::bool_constant<etl::is_base_of<etl::imessage_router, typename etl::remove_cvref<T>::type>::value>
+  {
+  };
+
   //***************************************************************************
   /// Send a message to a router.
   //***************************************************************************
-  static inline void send_message(etl::imessage_router& destination,
-                                  const etl::imessage&  message)
+  template <typename TRouter, typename TMessage>
+  static 
+  typename etl::enable_if<etl::is_message_router<TRouter>::value && etl::is_message<TMessage>::value, void>::type
+    send_message(TRouter&        destination,
+                 const TMessage& message)
   {
     destination.receive(message);
   }
@@ -354,8 +365,11 @@ namespace etl
   //***************************************************************************
   /// Send a shared message to a router.
   //***************************************************************************
-  static inline void send_message(etl::imessage_router& destination,
-                                  etl::shared_message message)
+  template <typename TRouter>
+  static 
+  typename etl::enable_if<etl::is_message_router<TRouter>::value, void>::type
+    send_message(TRouter&            destination,
+                 etl::shared_message message)
   {
     destination.receive(message);
   }
@@ -363,9 +377,12 @@ namespace etl
   //***************************************************************************
   /// Send a message to a router with a particular id.
   //***************************************************************************
-  static inline void send_message(etl::imessage_router& destination,
-                                  etl::message_router_id_t id,
-                                  const etl::imessage& message)
+  template <typename TRouter, typename TMessage>
+  static 
+  typename etl::enable_if<etl::is_message_router<TRouter>::value && etl::is_message<TMessage>::value, void>::type
+    send_message(TRouter&                 destination,
+                 etl::message_router_id_t id,
+                 const TMessage&          message)
   {
     destination.receive(id, message);
   }
@@ -373,9 +390,12 @@ namespace etl
   //***************************************************************************
   /// Send a shared message to a router with a particular id.
   //***************************************************************************
-  static inline void send_message(etl::imessage_router& destination,
-                                  etl::message_router_id_t id,
-                                  etl::shared_message message)
+  template <typename TRouter>
+  static
+  typename etl::enable_if<etl::is_message_router<TRouter>::value, void>::type
+    send_message(TRouter&                 destination,
+                 etl::message_router_id_t id,
+                 etl::shared_message      message)
   {
     destination.receive(id, message);
   }

From cb2700e75d1456562d88c3ce9f754e4376019132 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Fri, 15 Mar 2024 13:01:59 +0000
Subject: [PATCH 097/131] Modified accepts() message router functions to
 interrogate subscribed and successor routers to achieve consistency.

---
 include/etl/message_broker.h | 43 +++++++++++++++++--
 include/etl/message_bus.h    | 30 +++++++++++--
 test/test_message_broker.cpp | 82 +++++++++++++++++++++++++++---------
 test/test_message_bus.cpp    | 60 +++++++++++++++++++++++++-
 4 files changed, 187 insertions(+), 28 deletions(-)

diff --git a/include/etl/message_broker.h b/include/etl/message_broker.h
index 7d000c2c..a8ce0ab5 100644
--- a/include/etl/message_broker.h
+++ b/include/etl/message_broker.h
@@ -274,11 +274,48 @@ namespace etl
     using imessage_router::accepts;
 
     //*******************************************
-    /// Message brokers accept all messages.
+    /// Message brokers accept messages determined
+    /// by the subscribed routers.
     //*******************************************
-    virtual bool accepts(etl::message_id_t) const ETL_OVERRIDE
+    virtual bool accepts(etl::message_id_t id) const ETL_OVERRIDE
     {
-      return true;
+      if (!empty())
+      {
+        // Scan the subscription lists.
+        subscription* sub = static_cast<subscription*>(head.get_next());
+
+        while (sub != ETL_NULLPTR)
+        {
+          message_id_span_t message_ids = sub->message_id_list();
+
+          message_id_span_t::iterator itr = etl::find(message_ids.begin(), message_ids.end(), id);
+
+          if (itr != message_ids.end())
+          {
+            etl::imessage_router* router = sub->get_router();
+
+            if (router->accepts(id))
+            {
+              return true;
+            }
+          }
+
+          sub = sub->next_subscription();
+        }
+      }
+
+      // Check any successor.
+      if (has_successor())
+      {
+        if (get_successor().accepts(id))
+        {
+          return true;
+        }
+      }
+
+      return false;
+
+      //return true;
     }
 
     //*******************************************
diff --git a/include/etl/message_bus.h b/include/etl/message_bus.h
index 8ed0737e..1d698e78 100644
--- a/include/etl/message_bus.h
+++ b/include/etl/message_bus.h
@@ -315,11 +315,35 @@ namespace etl
 
     //*******************************************
     /// Does this message bus accept the message id?
-    /// Yes!, it accepts everything!
+    /// Returns <b>true</b> on the first router that does.
     //*******************************************
-    bool accepts(etl::message_id_t) const ETL_OVERRIDE
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
     {
-      return true;
+      // Check the list of subscribed routers.
+      router_list_t::iterator irouter = router_list.begin();
+
+      while (irouter != router_list.end())
+      {
+        etl::imessage_router& router = **irouter;
+
+        if (router.accepts(id))
+        {
+          return true;
+        }
+
+        ++irouter;
+      }
+
+      // Check any successor.
+      if (has_successor())
+      {
+        if (get_successor().accepts(id))
+        {
+          return true;
+        }
+      }
+
+      return false;
     }
 
     //*******************************************
diff --git a/test/test_message_broker.cpp b/test/test_message_broker.cpp
index 3a414d8e..fda9ae16 100644
--- a/test/test_message_broker.cpp
+++ b/test/test_message_broker.cpp
@@ -232,7 +232,7 @@ namespace
   SUITE(test_message_broker)
   {
     //*************************************************************************
-    TEST(message_check_broker_id)
+    TEST(test_message_check_broker_id)
     {
       Broker broker1;
       Broker broker2(2);
@@ -245,7 +245,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(message_broker_subscribe_then_unsubscribe)
+    TEST(test_message_broker_subscribe_then_unsubscribe)
     {
       Router router1(1);
       Router router2(2);
@@ -255,33 +255,27 @@ namespace
       Subscription subscription3{ router2, { Message1::ID, Message3::ID } };
 
       Broker broker; 
-      CHECK(broker.empty());
-      CHECK(broker.accepts(MESSAGE1));
-      CHECK(broker.accepts(MESSAGE2));
-      CHECK(broker.accepts(MESSAGE3));
-      CHECK(broker.accepts(MESSAGE4));
-      CHECK(broker.accepts(MESSAGE5));
-      CHECK(broker.accepts(MESSAGE6));
-
+      CHECK_TRUE(broker.empty());
+      
       broker.subscribe(subscription1);
-      CHECK(!broker.empty());
+      CHECK_FALSE(broker.empty());
 
       broker.subscribe(subscription3);
-      CHECK(!broker.empty());
+      CHECK_FALSE(broker.empty());
 
       broker.unsubscribe(router1);
-      CHECK(!broker.empty());
+      CHECK_FALSE(broker.empty());
 
       broker.unsubscribe(router2);
-      CHECK(broker.empty());
+      CHECK_TRUE(broker.empty());
 
       // There is no router3 subscription in 'broker'.
       broker.unsubscribe(router3);
-      CHECK(broker.empty());
+      CHECK_TRUE(broker.empty());
     }
 
     //*************************************************************************
-    TEST(message_broker_subscribe_then_clear)
+    TEST(test_message_broker_subscribe_then_clear)
     {
       Router router1(1);
       Router router2(2);
@@ -337,7 +331,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(message_broker_send_messages_to_broker_with_no_subscribers)
+    TEST(test_message_broker_send_messages_to_broker_with_no_subscribers)
     {
       Broker broker;
       Router router1(1);
@@ -382,7 +376,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(message_broker_send_messages_to_subscribers)
+    TEST(test_message_broker_send_messages_to_subscribers)
     {
       Broker broker;
       Router router1(1);
@@ -439,7 +433,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(message_broker_send_messages_to_specific_subscribers)
+    TEST(test_message_broker_send_messages_to_specific_subscribers)
     {
       Broker broker;
       Router router1(1);
@@ -460,7 +454,7 @@ namespace
     }
 
     //*************************************************************************
-    TEST(message_broker_send_messages_to_subscribers_after_unsubscribe)
+    TEST(test_message_broker_send_messages_to_subscribers_after_unsubscribe)
     {
       Broker broker;
       Router router1(1);
@@ -516,5 +510,53 @@ namespace
       CHECK_EQUAL(0, router2.message_unknown_count);
       CHECK_EQUAL(1, router3.message_unknown_count);
     }
+
+    //*************************************************************************
+    TEST(test_message_broker_accepts)
+    {
+      Router router1(1);
+      Router router2(2);
+      Router router3(3);
+
+      Subscription subscription1{ router1, { Message1::ID, Message3::ID } };
+      Subscription subscription2{ router2, { Message1::ID, Message2::ID, Message3::ID, Message4::ID } };
+
+      // Default constructed broker.
+      Broker broker;
+
+      CHECK_FALSE(broker.accepts(MESSAGE1));
+      CHECK_FALSE(broker.accepts(MESSAGE2));
+      CHECK_FALSE(broker.accepts(MESSAGE3));
+      CHECK_FALSE(broker.accepts(MESSAGE4));
+      CHECK_FALSE(broker.accepts(MESSAGE5));
+      CHECK_FALSE(broker.accepts(MESSAGE6));
+
+      // Subscribe router1.
+      broker.subscribe(subscription1);
+      CHECK_TRUE(broker.accepts(MESSAGE1));
+      CHECK_FALSE(broker.accepts(MESSAGE2));
+      CHECK_TRUE(broker.accepts(MESSAGE3));
+      CHECK_FALSE(broker.accepts(MESSAGE4));
+      CHECK_FALSE(broker.accepts(MESSAGE5));
+      CHECK_FALSE(broker.accepts(MESSAGE6));
+
+      // Subscribe router2.
+      broker.subscribe(subscription2);
+      CHECK_TRUE(broker.accepts(MESSAGE1));
+      CHECK_TRUE(broker.accepts(MESSAGE2));
+      CHECK_TRUE(broker.accepts(MESSAGE3));
+      CHECK_TRUE(broker.accepts(MESSAGE4));
+      CHECK_FALSE(broker.accepts(MESSAGE5));
+      CHECK_FALSE(broker.accepts(MESSAGE6));
+
+      // Set router3 as a successor.
+      broker.set_successor(router3);
+      CHECK_TRUE(broker.accepts(MESSAGE1));
+      CHECK_TRUE(broker.accepts(MESSAGE2));
+      CHECK_TRUE(broker.accepts(MESSAGE3));
+      CHECK_TRUE(broker.accepts(MESSAGE4));
+      CHECK_TRUE(broker.accepts(MESSAGE5));
+      CHECK_TRUE(broker.accepts(MESSAGE6));
+    }
   };
 }
diff --git a/test/test_message_bus.cpp b/test/test_message_bus.cpp
index 9407ee36..e7fde856 100644
--- a/test/test_message_bus.cpp
+++ b/test/test_message_bus.cpp
@@ -45,7 +45,9 @@ namespace
     MESSAGE2,
     MESSAGE3,
     MESSAGE4,
-    MESSAGE5
+    MESSAGE5,
+    MESSAGE6,
+    MESSAGE7
   };
 
   enum
@@ -105,6 +107,14 @@ namespace
 
   Response response;
 
+  struct Message6 : public etl::message<MESSAGE6>
+  {
+  };
+
+  struct Message7 : public etl::message<MESSAGE7>
+  {
+  };
+
   int call_order;
 
   //***************************************************************************
@@ -224,6 +234,27 @@ namespace
     int message_unknown_count;
   };
 
+  //***************************************************************************
+  // Router that handles message 6 and returns nothing.
+  //***************************************************************************
+  class RouterC : public etl::message_router<RouterC, Message6>
+  {
+  public:
+
+    RouterC(etl::message_router_id_t id)
+      : message_router(id)
+    {
+    }
+
+    void on_receive(const Message6&)
+    {
+    }
+
+    void on_receive_unknown(const etl::imessage&)
+    {
+    }
+  };
+
   //***************************************************************************
   template <size_t Size>
   class MessageBus : public etl::message_bus<Size>
@@ -237,7 +268,7 @@ namespace
 
     using etl::message_bus<Size>::receive;
 
-    // Hook 'receive' to count the incomimg messages.
+    // Hook 'receive' to count the incoming messages.
     void receive(etl::message_router_id_t id, const etl::imessage& msg)
     {
       ++message_count;
@@ -951,5 +982,30 @@ namespace
 
       CHECK_EQUAL(1, bus.message_count);
     }
+
+    //*************************************************************************
+    TEST(message_bus_accepts)
+    {
+      MessageBus<2> bus1;
+      MessageBus<2> bus2;
+
+      RouterA router1(ROUTER1);
+      RouterB router2(ROUTER2);
+      RouterC router3(ROUTER3);
+
+      bus1.subscribe(router1);
+      bus1.subscribe(router2);
+      bus1.set_successor(bus2);
+
+      bus2.subscribe(router3);
+
+      CHECK_TRUE(bus1.accepts(MESSAGE1));
+      CHECK_TRUE(bus1.accepts(MESSAGE2));
+      CHECK_TRUE(bus1.accepts(MESSAGE3));
+      CHECK_TRUE(bus1.accepts(MESSAGE4));
+      CHECK_TRUE(bus1.accepts(MESSAGE5));
+      CHECK_TRUE(bus1.accepts(MESSAGE6));
+      CHECK_FALSE(bus1.accepts(MESSAGE7));
+    }
   };
 }

From 80af5a4891710b4c76e48dd95c776dac93bdb042 Mon Sep 17 00:00:00 2001
From: Benzinnos <grigorevalexeyit@gmail.com>
Date: Fri, 15 Mar 2024 21:15:07 +0300
Subject: [PATCH 098/131] Add eq and ne operators for compare utility. (#863)

* Add eq and ne operators

* Add three-way comparison to compare utils.

* Three-way comparison test now using own test data.

* Rename test struct for three-way comparison test.

---------

Co-authored-by: grigorev <grigorev@protei.ru>
---
 include/etl/compare.h | 34 +++++++++++++++++++++++++++++++-
 test/test_compare.cpp | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/include/etl/compare.h b/include/etl/compare.h
index 479758d9..5a28c83d 100644
--- a/include/etl/compare.h
+++ b/include/etl/compare.h
@@ -44,7 +44,7 @@ SOFTWARE.
 namespace etl
 {
   //***************************************************************************
-  /// Defines <=, >, >= in terms of <
+  /// Defines <=, >, >=, ==, !=, <=> in terms of <
   /// Default
   //***************************************************************************
   template <typename T, typename TLess = etl::less<T> >
@@ -54,6 +54,13 @@ namespace etl
     typedef typename etl::parameter_type<T>::type second_argument_type;
     typedef bool result_type;
 
+    enum cmp_result
+    {
+      LESS = -1,
+      EQUAL = 0,
+      GREATER = 1
+    };
+
     static result_type lt(first_argument_type lhs, second_argument_type rhs)
     {
       return TLess()(lhs, rhs);
@@ -73,6 +80,31 @@ namespace etl
     {
       return !lt(lhs, rhs);
     }
+
+    static result_type eq(first_argument_type lhs, second_argument_type rhs)
+    {
+      return gte(lhs, rhs) && lte(lhs, rhs);
+    }
+
+    static result_type ne(first_argument_type lhs, second_argument_type rhs)
+    {
+      return !eq(lhs, rhs);
+    }
+
+    static cmp_result cmp(first_argument_type lhs, second_argument_type rhs)
+    {
+      if (lt(lhs, rhs))
+      {
+        return LESS;
+      }
+
+      if (gt(lhs, rhs))
+      {
+        return GREATER;
+      }
+
+      return EQUAL;
+    }
   };
 }
 
diff --git a/test/test_compare.cpp b/test/test_compare.cpp
index 527c8542..5e666f57 100644
--- a/test/test_compare.cpp
+++ b/test/test_compare.cpp
@@ -70,6 +70,18 @@ namespace
     return (lhs.a + lhs.b) >= (rhs.a + rhs.b);
   }
 
+  //***********************************
+  bool operator ==(const Object& lhs, const Object& rhs)
+  {
+    return (lhs.a + lhs.b) == (rhs.a + rhs.b);
+  }
+
+  //***********************************
+  bool operator !=(const Object& lhs, const Object& rhs)
+  {
+    return (lhs.a + lhs.b) != (rhs.a + rhs.b);
+  }
+
   //***********************************
   struct LessTest
   {
@@ -126,5 +138,38 @@ namespace
       CHECK_EQUAL(tb >= ta, (CompareTest::gte(tb, ta)));
       CHECK_EQUAL(ta >= ta, (CompareTest::gte(ta, ta)));
     }
+
+    //*************************************************************************
+    TEST(test_eq)
+    {
+      CHECK_EQUAL(a == b,   (CompareInt::eq(a, b)));
+      CHECK_EQUAL(b == a,   (CompareInt::eq(b, a)));
+      CHECK_EQUAL(a == a,   (CompareInt::eq(a, a)));
+      CHECK_EQUAL(ta == tb, (CompareTest::eq(ta, tb)));
+      CHECK_EQUAL(tb == ta, (CompareTest::eq(tb, ta)));
+      CHECK_EQUAL(ta == ta, (CompareTest::eq(ta, ta)));
+    }
+
+    //*************************************************************************
+    TEST(test_ne)
+    {
+      CHECK_EQUAL(a != b,   (CompareInt::ne(a, b)));
+      CHECK_EQUAL(b != a,   (CompareInt::ne(b, a)));
+      CHECK_EQUAL(a != a,   (CompareInt::ne(a, a)));
+      CHECK_EQUAL(ta != tb, (CompareTest::ne(ta, tb)));
+      CHECK_EQUAL(tb != ta, (CompareTest::ne(tb, ta)));
+      CHECK_EQUAL(ta != ta, (CompareTest::ne(ta, ta)));
+    }
+
+    //*************************************************************************
+    TEST(test_cmp)
+    {
+      CHECK_EQUAL(CompareInt::LESS,     (CompareInt::cmp(2, 4)));
+      CHECK_EQUAL(CompareInt::GREATER,  (CompareInt::cmp(4, 2)));
+      CHECK_EQUAL(CompareInt::EQUAL,    (CompareInt::cmp(0, 0)));
+      CHECK_EQUAL(CompareTest::LESS,    (CompareTest::cmp(Object(0, 1), Object(2, 4))));
+      CHECK_EQUAL(CompareTest::GREATER, (CompareTest::cmp(Object(2, 4), Object(0, 1))));
+      CHECK_EQUAL(CompareTest::EQUAL,   (CompareTest::cmp(Object(2, 4), Object(2, 4))));
+    }
   };
 }

From 7b358dd35a665317c1acd7462470e37525c3a81a Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 16 Mar 2024 11:26:15 +0000
Subject: [PATCH 099/131] Added constexpr to compare functions

---
 include/etl/compare.h | 53 ++++++++++++---------------
 test/test_compare.cpp | 84 ++++++++++++++++++++++++++-----------------
 2 files changed, 75 insertions(+), 62 deletions(-)

diff --git a/include/etl/compare.h b/include/etl/compare.h
index 5a28c83d..1c3fa3c3 100644
--- a/include/etl/compare.h
+++ b/include/etl/compare.h
@@ -40,70 +40,63 @@ SOFTWARE.
 /// Comparisons only using less than operator
 ///\ingroup utilities
 //*****************************************************************************
-
 namespace etl
 {
-  //***************************************************************************
-  /// Defines <=, >, >=, ==, !=, <=> in terms of <
-  /// Default
-  //***************************************************************************
-  template <typename T, typename TLess = etl::less<T> >
-  struct compare
+  struct compare_types
   {
-    typedef typename etl::parameter_type<T>::type first_argument_type;
-    typedef typename etl::parameter_type<T>::type second_argument_type;
     typedef bool result_type;
 
     enum cmp_result
     {
-      LESS = -1,
-      EQUAL = 0,
-      GREATER = 1
+      Less    = 0,
+      Equal   = 1,
+      Greater = 2
     };
+  };
 
-    static result_type lt(first_argument_type lhs, second_argument_type rhs)
+  //***************************************************************************
+  /// Defines <=, >, >=, ==, !=, <=> in terms of <
+  /// Default implementation of TLess is etl::less
+  //***************************************************************************
+  template <typename T, typename TLess = etl::less<T> >
+  struct compare : public compare_types
+  {
+    typedef typename etl::parameter_type<T>::type first_argument_type;
+    typedef typename etl::parameter_type<T>::type second_argument_type;
+
+    static ETL_CONSTEXPR result_type lt(first_argument_type lhs, second_argument_type rhs)
     {
       return TLess()(lhs, rhs);
     }
 
-    static result_type gt(first_argument_type lhs, second_argument_type rhs)
+    static ETL_CONSTEXPR result_type gt(first_argument_type lhs, second_argument_type rhs)
     {
       return TLess()(rhs, lhs);
     }
 
-    static result_type lte(first_argument_type lhs, second_argument_type rhs)
+    static ETL_CONSTEXPR result_type lte(first_argument_type lhs, second_argument_type rhs)
     {
       return !gt(lhs, rhs);
     }
 
-    static result_type gte(first_argument_type lhs, second_argument_type rhs)
+    static ETL_CONSTEXPR result_type gte(first_argument_type lhs, second_argument_type rhs)
     {
       return !lt(lhs, rhs);
     }
 
-    static result_type eq(first_argument_type lhs, second_argument_type rhs)
+    static ETL_CONSTEXPR result_type eq(first_argument_type lhs, second_argument_type rhs)
     {
       return gte(lhs, rhs) && lte(lhs, rhs);
     }
 
-    static result_type ne(first_argument_type lhs, second_argument_type rhs)
+    static ETL_CONSTEXPR result_type ne(first_argument_type lhs, second_argument_type rhs)
     {
       return !eq(lhs, rhs);
     }
 
-    static cmp_result cmp(first_argument_type lhs, second_argument_type rhs)
+    static ETL_CONSTEXPR cmp_result cmp(first_argument_type lhs, second_argument_type rhs)
     {
-      if (lt(lhs, rhs))
-      {
-        return LESS;
-      }
-
-      if (gt(lhs, rhs))
-      {
-        return GREATER;
-      }
-
-      return EQUAL;
+      return lt(lhs, rhs) ? Less : gt(lhs, rhs) ? Greater : Equal;
     }
   };
 }
diff --git a/test/test_compare.cpp b/test/test_compare.cpp
index 5e666f57..f0de4b26 100644
--- a/test/test_compare.cpp
+++ b/test/test_compare.cpp
@@ -47,37 +47,37 @@ namespace
   Object tb = { 2, 3 };
 
   //***********************************
-  bool operator <(const Object& lhs, const Object& rhs)
+  bool constexpr operator <(const Object& lhs, const Object& rhs)
   {
     return (lhs.a + lhs.b) < (rhs.a + rhs.b);
   }
 
   //***********************************
-  bool operator >(const Object& lhs, const Object& rhs)
+  bool constexpr operator >(const Object& lhs, const Object& rhs)
   {
     return (lhs.a + lhs.b) > (rhs.a + rhs.b);
   }
 
   //***********************************
-  bool operator <=(const Object& lhs, const Object& rhs)
+  bool constexpr operator <=(const Object& lhs, const Object& rhs)
   {
     return (lhs.a + lhs.b) <= (rhs.a + rhs.b);
   }
 
   //***********************************
-  bool operator >=(const Object& lhs, const Object& rhs)
+  bool constexpr operator >=(const Object& lhs, const Object& rhs)
   {
     return (lhs.a + lhs.b) >= (rhs.a + rhs.b);
   }
 
   //***********************************
-  bool operator ==(const Object& lhs, const Object& rhs)
+  bool constexpr operator ==(const Object& lhs, const Object& rhs)
   {
     return (lhs.a + lhs.b) == (rhs.a + rhs.b);
   }
 
   //***********************************
-  bool operator !=(const Object& lhs, const Object& rhs)
+  bool constexpr operator !=(const Object& lhs, const Object& rhs)
   {
     return (lhs.a + lhs.b) != (rhs.a + rhs.b);
   }
@@ -85,7 +85,7 @@ namespace
   //***********************************
   struct LessTest
   {
-    bool operator()(const Object& lhs, const Object& rhs) const
+    bool constexpr operator()(const Object& lhs, const Object& rhs) const
     {
       return (lhs.a + lhs.b) < (rhs.a + rhs.b);
     }
@@ -97,10 +97,10 @@ namespace
   {
     //*************************************************************************
     TEST(test_lt)
-    { 
-      CHECK_EQUAL(a < b,   (CompareInt::lt(a, b)));
-      CHECK_EQUAL(b < a,   (CompareInt::lt(b, a)));
-      CHECK_EQUAL(a < a,   (CompareInt::lt(a, a)));
+    {
+      CHECK_EQUAL(a < b, (CompareInt::lt(a, b)));
+      CHECK_EQUAL(b < a, (CompareInt::lt(b, a)));
+      CHECK_EQUAL(a < a, (CompareInt::lt(a, a)));
       CHECK_EQUAL(ta < tb, (CompareTest::lt(ta, tb)));
       CHECK_EQUAL(tb < ta, (CompareTest::lt(tb, ta)));
       CHECK_EQUAL(ta < ta, (CompareTest::lt(ta, ta)));
@@ -109,9 +109,9 @@ namespace
     //*************************************************************************
     TEST(test_lte)
     {
-      CHECK_EQUAL(a <= b,   (CompareInt::lte(a, b)));
-      CHECK_EQUAL(b <= a,   (CompareInt::lte(b, a)));
-      CHECK_EQUAL(a <= a,   (CompareInt::lte(a, a)));
+      CHECK_EQUAL(a <= b, (CompareInt::lte(a, b)));
+      CHECK_EQUAL(b <= a, (CompareInt::lte(b, a)));
+      CHECK_EQUAL(a <= a, (CompareInt::lte(a, a)));
       CHECK_EQUAL(ta <= tb, (CompareTest::lte(ta, tb)));
       CHECK_EQUAL(tb <= ta, (CompareTest::lte(tb, ta)));
       CHECK_EQUAL(ta <= ta, (CompareTest::lte(ta, ta)));
@@ -120,9 +120,9 @@ namespace
     //*************************************************************************
     TEST(test_gt)
     {
-      CHECK_EQUAL(a > b,   (CompareInt::gt(a, b)));
-      CHECK_EQUAL(b > a,   (CompareInt::gt(b, a)));
-      CHECK_EQUAL(a > a,   (CompareInt::gt(a, a)));
+      CHECK_EQUAL(a > b, (CompareInt::gt(a, b)));
+      CHECK_EQUAL(b > a, (CompareInt::gt(b, a)));
+      CHECK_EQUAL(a > a, (CompareInt::gt(a, a)));
       CHECK_EQUAL(ta > tb, (CompareTest::gt(ta, tb)));
       CHECK_EQUAL(tb > ta, (CompareTest::gt(tb, ta)));
       CHECK_EQUAL(ta > ta, (CompareTest::gt(ta, ta)));
@@ -131,9 +131,9 @@ namespace
     //*************************************************************************
     TEST(test_gte)
     {
-      CHECK_EQUAL(a >= b,   (CompareInt::gte(a, b)));
-      CHECK_EQUAL(b >= a,   (CompareInt::gte(b, a)));
-      CHECK_EQUAL(a >= a,   (CompareInt::gte(a, a)));
+      CHECK_EQUAL(a >= b, (CompareInt::gte(a, b)));
+      CHECK_EQUAL(b >= a, (CompareInt::gte(b, a)));
+      CHECK_EQUAL(a >= a, (CompareInt::gte(a, a)));
       CHECK_EQUAL(ta >= tb, (CompareTest::gte(ta, tb)));
       CHECK_EQUAL(tb >= ta, (CompareTest::gte(tb, ta)));
       CHECK_EQUAL(ta >= ta, (CompareTest::gte(ta, ta)));
@@ -142,9 +142,9 @@ namespace
     //*************************************************************************
     TEST(test_eq)
     {
-      CHECK_EQUAL(a == b,   (CompareInt::eq(a, b)));
-      CHECK_EQUAL(b == a,   (CompareInt::eq(b, a)));
-      CHECK_EQUAL(a == a,   (CompareInt::eq(a, a)));
+      CHECK_EQUAL(a == b, (CompareInt::eq(a, b)));
+      CHECK_EQUAL(b == a, (CompareInt::eq(b, a)));
+      CHECK_EQUAL(a == a, (CompareInt::eq(a, a)));
       CHECK_EQUAL(ta == tb, (CompareTest::eq(ta, tb)));
       CHECK_EQUAL(tb == ta, (CompareTest::eq(tb, ta)));
       CHECK_EQUAL(ta == ta, (CompareTest::eq(ta, ta)));
@@ -153,9 +153,9 @@ namespace
     //*************************************************************************
     TEST(test_ne)
     {
-      CHECK_EQUAL(a != b,   (CompareInt::ne(a, b)));
-      CHECK_EQUAL(b != a,   (CompareInt::ne(b, a)));
-      CHECK_EQUAL(a != a,   (CompareInt::ne(a, a)));
+      CHECK_EQUAL(a != b, (CompareInt::ne(a, b)));
+      CHECK_EQUAL(b != a, (CompareInt::ne(b, a)));
+      CHECK_EQUAL(a != a, (CompareInt::ne(a, a)));
       CHECK_EQUAL(ta != tb, (CompareTest::ne(ta, tb)));
       CHECK_EQUAL(tb != ta, (CompareTest::ne(tb, ta)));
       CHECK_EQUAL(ta != ta, (CompareTest::ne(ta, ta)));
@@ -164,12 +164,32 @@ namespace
     //*************************************************************************
     TEST(test_cmp)
     {
-      CHECK_EQUAL(CompareInt::LESS,     (CompareInt::cmp(2, 4)));
-      CHECK_EQUAL(CompareInt::GREATER,  (CompareInt::cmp(4, 2)));
-      CHECK_EQUAL(CompareInt::EQUAL,    (CompareInt::cmp(0, 0)));
-      CHECK_EQUAL(CompareTest::LESS,    (CompareTest::cmp(Object(0, 1), Object(2, 4))));
-      CHECK_EQUAL(CompareTest::GREATER, (CompareTest::cmp(Object(2, 4), Object(0, 1))));
-      CHECK_EQUAL(CompareTest::EQUAL,   (CompareTest::cmp(Object(2, 4), Object(2, 4))));
+      CHECK_EQUAL(CompareInt::Less, (CompareInt::cmp(2, 4)));
+      CHECK_EQUAL(CompareInt::Greater, (CompareInt::cmp(4, 2)));
+      CHECK_EQUAL(CompareInt::Equal, (CompareInt::cmp(0, 0)));
+      CHECK_EQUAL(CompareTest::Less, (CompareTest::cmp(Object{ 0, 1 }, Object{ 2, 4 })));
+      CHECK_EQUAL(CompareTest::Greater, (CompareTest::cmp(Object{ 2, 4 }, Object{ 0, 1 })));
+      CHECK_EQUAL(CompareTest::Equal, (CompareTest::cmp(Object{ 2, 4 }, Object{ 2, 4 })));
+    }
+
+    //*************************************************************************
+    TEST(test_constexpr_cmp)
+    {
+      constexpr int cmp_less    = CompareInt::cmp(2, 4);
+      constexpr int cmp_greater = CompareInt::cmp(4, 2);
+      constexpr int cmp_equal   = CompareInt::cmp(0, 0);
+
+      constexpr int cmp_test_less    = CompareTest::cmp(Object{ 0, 1 }, Object{ 2, 4 });
+      constexpr int cmp_test_greater = CompareTest::cmp(Object{ 2, 4 }, Object{ 0, 1 });
+      constexpr int cmp_test_equal   = CompareTest::cmp(Object{ 2, 4 }, Object{ 2, 4 });
+
+      CHECK_EQUAL(CompareInt::Less,    cmp_less);
+      CHECK_EQUAL(CompareInt::Greater, cmp_greater);
+      CHECK_EQUAL(CompareInt::Equal,   cmp_equal);
+
+      CHECK_EQUAL(CompareInt::Less,    cmp_test_less);
+      CHECK_EQUAL(CompareInt::Greater, cmp_test_greater);
+      CHECK_EQUAL(CompareInt::Equal,   cmp_test_equal);
     }
   };
 }

From a8ca216f4e92356c45502fe69f30c759c88acde8 Mon Sep 17 00:00:00 2001
From: Drew Rife <drew.rife95@gmail.com>
Date: Sat, 16 Mar 2024 08:07:00 -0400
Subject: [PATCH 100/131] Update ETL_CONSTEXPR and C++14 desgination from
 type_def (#862)

* feat: make type_def constexpr

* test: macro constexpr

* test: implicit constexpr

* test: get constexpr

* refactor: remove constexpr from assignment

* test: comparisons constexpr

* fix: cpp11 support for constexpr get method

* fix: c++11 issue with constexpr get reference

* refactor: remove constexpr from the get methods

* refactor: make assignment operators non-constexpr

* refactor: remove constexpr from assignment and get

* refactor: make other methods ETL_CONSTEXPR14

* test: operator preincrement

* test: postincrement

* test: predecrement constexpr

* test: post decrement constexpr

* fix: post decrement test

* test: addition assignment constexpr

* test: subtraction assignment constexpr

* test: multiplication assignment operator

* test: and assignment constexpr

* test: or assignment constexpr

* test: xor assignment constexpr

* tet: left shift assignment constexpr

* test: right shift assignment constexpr

* test: operator modules assignment

* style: revert personal clang-format changes

* refactor: use free functions to test

* refactor: remove constexpr non-constexpr test functions

* style: remove erroneous tab
---
 include/etl/type_def.h | 60 ++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 34 deletions(-)

diff --git a/include/etl/type_def.h b/include/etl/type_def.h
index 9b003313..7cb5c246 100644
--- a/include/etl/type_def.h
+++ b/include/etl/type_def.h
@@ -82,14 +82,14 @@ namespace etl
         }
 
         //*********************************************************************
-        type_def& operator ++()
+        ETL_CONSTEXPR14 type_def& operator ++()
         {
             ++value;
             return *this;
         }
 
         //*********************************************************************
-        type_def operator ++(int)
+        ETL_CONSTEXPR14 type_def operator ++(int)
         {
             type_def temp(*this);
             type_def::operator ++();
@@ -97,14 +97,14 @@ namespace etl
         }
 
         //*********************************************************************
-        type_def& operator --()
+        ETL_CONSTEXPR14 type_def& operator --()
         {
             --value;
             return *this;
         }
 
         //*********************************************************************
-        type_def operator --(int)
+        ETL_CONSTEXPR14 type_def operator --(int)
         {
             type_def temp(*this);
             type_def::operator --();
@@ -112,164 +112,156 @@ namespace etl
         }
 
         //*********************************************************************
-        type_def& operator +=(TValue rhs)
+        ETL_CONSTEXPR14 type_def& operator +=(TValue rhs)
         {
             value += rhs;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator +=(const type_def& rhs)
+        ETL_CONSTEXPR14 type_def& operator +=(const type_def& rhs)
         {
             value += rhs.value;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator -=(TValue rhs)
+        ETL_CONSTEXPR14 type_def& operator -=(TValue rhs)
         {
             value -= rhs;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator -=(const type_def& rhs)
+        ETL_CONSTEXPR14 type_def& operator -=(const type_def& rhs)
         {
             value -= rhs.value;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator *=(TValue rhs)
+        ETL_CONSTEXPR14 type_def& operator *=(TValue rhs)
         {
             value *= rhs;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator *=(const type_def& rhs)
+        ETL_CONSTEXPR14 type_def& operator *=(const type_def& rhs)
         {
             value *= rhs.value;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator /=(TValue rhs)
+        ETL_CONSTEXPR14 type_def& operator /=(TValue rhs)
         {
             value /= rhs;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator /=(const type_def& rhs)
+        ETL_CONSTEXPR14 type_def& operator /=(const type_def& rhs)
         {
             value /= rhs.value;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator %=(TValue rhs)
+        ETL_CONSTEXPR14 type_def& operator %=(TValue rhs)
         {
             value %= rhs;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator %=(const type_def& rhs)
+        ETL_CONSTEXPR14 type_def& operator %=(const type_def& rhs)
         {
             value %= rhs.value;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator &=(TValue rhs)
+        ETL_CONSTEXPR14 type_def& operator &=(TValue rhs)
         {
             value &= rhs;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator &=(const type_def& rhs)
+        ETL_CONSTEXPR14 type_def& operator &=(const type_def& rhs)
         {
             value &= rhs.value;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator |=(TValue rhs)
+        ETL_CONSTEXPR14 type_def& operator |=(TValue rhs)
         {
             value |= rhs;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator |=(const type_def& rhs)
+        ETL_CONSTEXPR14 type_def& operator |=(const type_def& rhs)
         {
             value |= rhs.value;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator ^=(TValue rhs)
+        ETL_CONSTEXPR14 type_def& operator ^=(TValue rhs)
         {
             value ^= rhs;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator ^=(const type_def& rhs)
+        ETL_CONSTEXPR14 type_def& operator ^=(const type_def& rhs)
         {
             value ^= rhs.value;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator <<=(TValue rhs)
+        ETL_CONSTEXPR14 type_def& operator <<=(TValue rhs)
         {
             value <<= rhs;
             return *this;
         }
 
         //*********************************************************************
-        type_def& operator >>=(TValue rhs)
+        ETL_CONSTEXPR14 type_def& operator >>=(TValue rhs)
         {
             value >>= rhs;
             return *this;
         }
 
         //*********************************************************************
-        ETL_CONSTEXPR type_def& operator =(TValue rhs)
+        ETL_CONSTEXPR14 type_def& operator =(TValue rhs)
         {
             value = rhs;
             return *this;
         }
 
         //*********************************************************************
-        ETL_CONSTEXPR type_def& operator =(const type_def& rhs)
+        ETL_CONSTEXPR14 type_def& operator =(const type_def& rhs)
         {
           value = rhs.value;
           return *this;
         }
 
         //*********************************************************************
-        ETL_CONSTEXPR TValue& get()
+        ETL_CONSTEXPR14 TValue& get()
         {
             return value;
         }
 
-#if ETL_USING_CPP14
         //*********************************************************************
-        ETL_CONSTEXPR const TValue& get() const
+        ETL_CONSTEXPR14 const TValue& get() const
         {
             return value;
         }
-#else 
-        //*********************************************************************
-        const TValue& get() const
-        {
-            return value;
-        }
-#endif // ETL_USING_CPP14
 
         //*********************************************************************
         friend ETL_CONSTEXPR bool operator <(const type_def& lhs, const type_def& rhs)

From 15675f29a66151faaffa2f964b897826ec1c7d82 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sun, 17 Mar 2024 13:56:56 +0000
Subject: [PATCH 101/131] Updates to constexpr operators

---
 include/etl/type_def.h | 450 ++++++++++++++++++++---------------------
 test/test_type_def.cpp |  69 +++++--
 2 files changed, 276 insertions(+), 243 deletions(-)

diff --git a/include/etl/type_def.h b/include/etl/type_def.h
index 7cb5c246..c124aa7e 100644
--- a/include/etl/type_def.h
+++ b/include/etl/type_def.h
@@ -35,274 +35,262 @@ SOFTWARE.
 
 namespace etl
 {
-    #define ETL_TYPEDEF(T, name) class name##_tag; typedef etl::type_def<name##_tag, T> name
+  #define ETL_TYPEDEF(T, name) class name##_tag; typedef etl::type_def<name##_tag, T> name
 
-    //*************************************************************************
-    /// A template type to define strong typedefs.
-    /// Usage:
-    ///\code
-    /// // Short form.
-    /// ETL_TYPEDEF(int, mytype);
-    ///
-    /// // Long form.
-    /// class mytype_t_tag;
-    /// typedef etl::type_def<mytype_t_tag, int> mytype_t_tag;
-    ///\endcode
-    //*************************************************************************
-    template <typename TIdType, typename TValue>
-    class type_def
+  //*************************************************************************
+  /// A template type to define strong typedefs.
+  /// Usage:
+  ///\code
+  /// // Short form.
+  /// ETL_TYPEDEF(int, mytype);
+  ///
+  /// // Long form.
+  /// class mytype_t_tag;
+  /// typedef etl::type_def<mytype_t_tag, int> mytype_t_tag;
+  ///\endcode
+  //*************************************************************************
+  template <typename TIdType, typename TValue>
+  class type_def
+  {
+  public:
+
+    typedef TValue  value_type;
+    typedef TIdType id_type;
+
+    //*********************************************************************
+    ETL_CONSTEXPR type_def()
+      : value(TValue())
     {
-    public:
+    }
 
-        typedef TValue  value_type;
-        typedef TIdType id_type;
+    //*********************************************************************
+    ETL_CONSTEXPR type_def(TValue value_)
+      : value(value_)
+    {
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR type_def()
-            : value(TValue())
-        {
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR type_def(const type_def& other)
+      : value(other.value)
+    {
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR type_def(TValue value_)
-            : value(value_)
-        {
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR operator TValue() const
+    {
+      return value;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR type_def(const type_def& other)
-            : value(other.value)
-        {
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator ++()
+    {
+      ++value;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR operator TValue() const
-        {
-            return value;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def operator ++(int)
+    {
+      type_def temp(*this);
+      type_def::operator ++();
+      return temp;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator ++()
-        {
-            ++value;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator --()
+    {
+      --value;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def operator ++(int)
-        {
-            type_def temp(*this);
-            type_def::operator ++();
-            return temp;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def operator --(int)
+    {
+      type_def temp(*this);
+      type_def::operator --();
+      return temp;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator --()
-        {
-            --value;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator +=(TValue rhs)
+    {
+      value += rhs;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def operator --(int)
-        {
-            type_def temp(*this);
-            type_def::operator --();
-            return temp;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator +=(const type_def& rhs)
+    {
+      value += rhs.value;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator +=(TValue rhs)
-        {
-            value += rhs;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator -=(TValue rhs)
+    {
+      value -= rhs;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator +=(const type_def& rhs)
-        {
-            value += rhs.value;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator -=(const type_def& rhs)
+    {
+      value -= rhs.value;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator -=(TValue rhs)
-        {
-            value -= rhs;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator *=(TValue rhs)
+    {
+      value *= rhs;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator -=(const type_def& rhs)
-        {
-            value -= rhs.value;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator *=(const type_def& rhs)
+    {
+      value *= rhs.value;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator *=(TValue rhs)
-        {
-            value *= rhs;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator /=(TValue rhs)
+    {
+      value /= rhs;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator *=(const type_def& rhs)
-        {
-            value *= rhs.value;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator /=(const type_def& rhs)
+    {
+      value /= rhs.value;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator /=(TValue rhs)
-        {
-            value /= rhs;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator %=(TValue rhs)
+    {
+      value %= rhs;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator /=(const type_def& rhs)
-        {
-            value /= rhs.value;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator %=(const type_def& rhs)
+    {
+      value %= rhs.value;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator %=(TValue rhs)
-        {
-            value %= rhs;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator &=(TValue rhs)
+    {
+      value &= rhs;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator %=(const type_def& rhs)
-        {
-            value %= rhs.value;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator &=(const type_def& rhs)
+    {
+      value &= rhs.value;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator &=(TValue rhs)
-        {
-            value &= rhs;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator |=(TValue rhs)
+    {
+      value |= rhs;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator &=(const type_def& rhs)
-        {
-            value &= rhs.value;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator |=(const type_def& rhs)
+    {
+      value |= rhs.value;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator |=(TValue rhs)
-        {
-            value |= rhs;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator ^=(TValue rhs)
+    {
+      value ^= rhs;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator |=(const type_def& rhs)
-        {
-            value |= rhs.value;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator ^=(const type_def& rhs)
+    {
+      value ^= rhs.value;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator ^=(TValue rhs)
-        {
-            value ^= rhs;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator <<=(TValue rhs)
+    {
+      value <<= rhs;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator ^=(const type_def& rhs)
-        {
-            value ^= rhs.value;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator >>=(TValue rhs)
+    {
+      value >>= rhs;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator <<=(TValue rhs)
-        {
-            value <<= rhs;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator =(TValue rhs)
+    {
+      value = rhs;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator >>=(TValue rhs)
-        {
-            value >>= rhs;
-            return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR14 type_def& operator =(const type_def& rhs)
+    {
+      value = rhs.value;
+      return *this;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator =(TValue rhs)
-        {
-            value = rhs;
-            return *this;
-        }
+    //*********************************************************************
+    TValue& get()
+    {
+      return value;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 type_def& operator =(const type_def& rhs)
-        {
-          value = rhs.value;
-          return *this;
-        }
+    //*********************************************************************
+    ETL_CONSTEXPR const TValue& get() const
+    {
+      return value;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 TValue& get()
-        {
-            return value;
-        }
+    //*********************************************************************
+    friend ETL_CONSTEXPR bool operator >(const type_def& lhs, const type_def& rhs)
+    {
+      return lhs.value > rhs.value;
+    }
 
-        //*********************************************************************
-        ETL_CONSTEXPR14 const TValue& get() const
-        {
-            return value;
-        }
+    //*********************************************************************
+    friend ETL_CONSTEXPR bool operator >=(const type_def& lhs, const type_def& rhs)
+    {
+      return lhs.value >= rhs.value;
+    }
 
-        //*********************************************************************
-        friend ETL_CONSTEXPR bool operator <(const type_def& lhs, const type_def& rhs)
-        {
-            return lhs.value < rhs.value;
-        }
+    //*********************************************************************
+    friend ETL_CONSTEXPR bool operator ==(const type_def& lhs, const type_def& rhs)
+    {
+      return lhs.value == rhs.value;
+    }
 
-        //*********************************************************************
-        friend ETL_CONSTEXPR bool operator <=(const type_def& lhs, const type_def& rhs)
-        {
-            return lhs.value <= rhs.value;
-        }
+    //*********************************************************************
+    friend ETL_CONSTEXPR bool operator !=(const type_def& lhs, const type_def& rhs)
+    {
+      return lhs.value != rhs.value;
+    }
 
-        //*********************************************************************
-        friend ETL_CONSTEXPR bool operator >(const type_def& lhs, const type_def& rhs)
-        {
-            return lhs.value > rhs.value;
-        }
+  private:
 
-        //*********************************************************************
-        friend ETL_CONSTEXPR bool operator >=(const type_def& lhs, const type_def& rhs)
-        {
-            return lhs.value >= rhs.value;
-        }
-
-        //*********************************************************************
-        friend ETL_CONSTEXPR bool operator ==(const type_def& lhs, const type_def& rhs)
-        {
-            return lhs.value == rhs.value;
-        }
-
-        //*********************************************************************
-        friend ETL_CONSTEXPR bool operator !=(const type_def& lhs, const type_def& rhs)
-        {
-            return lhs.value != rhs.value;
-        }
-
-    private:
-
-        TValue value;
-    };
+      TValue value;
+  };
 }
 
 #endif
diff --git a/test/test_type_def.cpp b/test/test_type_def.cpp
index b2f27172..8ce542e0 100644
--- a/test/test_type_def.cpp
+++ b/test/test_type_def.cpp
@@ -32,6 +32,8 @@ SOFTWARE.
 
 #include "etl/type_def.h"
 
+#include "etl/type_traits.h"
+
 namespace
 {
   SUITE(test_type_def)
@@ -198,19 +200,62 @@ namespace
 
       constexpr type_t t1(1);
       constexpr type_t t2(2);
-      constexpr type_t t3(t1);
-      constexpr type_t t4(t2);
 
-      CHECK(t1 <  t2);
-      CHECK(!(t2 <  t1));
-      CHECK(t1 <= t2);
-      CHECK(!(t2 <= t1));
-      CHECK(t1 <= t3);
-      CHECK(t2 >  t1);
-      CHECK(!(t1 >  t2));
-      CHECK(t2 >= t1);
-      CHECK(!(t1 >= t2));
-      CHECK(t2 >= t4);
+      constexpr bool eq   = t1 == t1;
+      constexpr bool neq  = t1 == t2;
+      constexpr bool lt   = t1  < t2;
+      constexpr bool nlt  = t2  < t1;
+      constexpr bool lte  = t1 <= t2;
+      constexpr bool nlte = t2 <= t1;
+      constexpr bool gt   = t1  > t2;
+      constexpr bool ngt  = t2  > t1;
+      constexpr bool gte  = t1 >= t2;
+      constexpr bool ngte = t2 >= t1;
+
+      CHECK_TRUE(eq);
+      CHECK_FALSE(neq);
+      CHECK_TRUE(lt);
+      CHECK_FALSE(nlt);
+      CHECK_TRUE(lte);
+      CHECK_FALSE(nlte);
+      CHECK_FALSE(gt);
+      CHECK_TRUE(ngt);
+      CHECK_FALSE(gte);
+      CHECK_TRUE(ngte);
+    }
+
+    //*************************************************************************
+    ETL_TYPEDEF(int32_t, arithmetic_type_t);
+
+    constexpr arithmetic_type_t CreatePlus()
+    {
+      arithmetic_type_t value = 0;
+
+      ++value;
+      value++;
+      value += 1;
+
+      return value;
+    }
+
+    constexpr arithmetic_type_t CreateMinus()
+    {
+      arithmetic_type_t value = 0;
+
+      --value;
+      value--;
+      value -= 1;
+
+      return value;
+    }
+    
+    TEST(test_arithmetic_constexpr)
+    {
+      constexpr arithmetic_type_t value_plus  = CreatePlus();
+      constexpr arithmetic_type_t value_minus = CreateMinus();
+
+      CHECK_EQUAL(3,  value_plus.get());
+      CHECK_EQUAL(-3, value_minus.get());
     }
   };
 }

From 8710dfc4ff4d14f1222ca8ea377dc9d0b9b59f8e Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Wed, 20 Mar 2024 23:27:18 +0000
Subject: [PATCH 102/131] Fixed dereference of state pointer when null.

---
 include/etl/fsm.h  | 57 ++++++++++++++++++++++++++++++----------------
 include/etl/hfsm.h | 39 ++++++++++++++++++-------------
 test/test_fsm.cpp  |  8 +++++++
 test/test_hfsm.cpp |  8 +++++++
 4 files changed, 77 insertions(+), 35 deletions(-)

diff --git a/include/etl/fsm.h b/include/etl/fsm.h
index 1e527d5d..ed1a9a7d 100644
--- a/include/etl/fsm.h
+++ b/include/etl/fsm.h
@@ -169,6 +169,18 @@ namespace etl
     }
   };
 
+  //***************************************************************************
+  /// Exception for message received but not started.
+  //***************************************************************************
+  class fsm_not_started : public etl::fsm_exception
+  {
+  public:
+    fsm_not_started(string_type file_name_, numeric_type line_number_)
+      : etl::fsm_exception(ETL_ERROR_TEXT("fsm:not started", ETL_FSM_FILE_ID"F"), file_name_, line_number_)
+    {
+    }
+  };
+
   namespace private_fsm
   {
     template <typename T = void>
@@ -404,31 +416,38 @@ namespace etl
     //*******************************************
     void receive(const etl::imessage& message) ETL_OVERRIDE
     {
-      etl::fsm_state_id_t next_state_id = p_state->process_event(message);
-
-      if (have_changed_state(next_state_id))
+      if (is_started())
       {
-        ETL_ASSERT(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
-        etl::ifsm_state* p_next_state = state_list[next_state_id];
+        etl::fsm_state_id_t next_state_id = p_state->process_event(message);
 
-        do
+        if (have_changed_state(next_state_id))
+        {
+          ETL_ASSERT(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
+          etl::ifsm_state* p_next_state = state_list[next_state_id];
+
+          do
+          {
+            p_state->on_exit_state();
+            p_state = p_next_state;
+
+            next_state_id = p_state->on_enter_state();
+
+            if (have_changed_state(next_state_id))
+            {
+              ETL_ASSERT(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
+              p_next_state = state_list[next_state_id];
+            }
+          } while (p_next_state != p_state); // Have we changed state again?
+        }
+        else if (is_self_transition(next_state_id))
         {
           p_state->on_exit_state();
-          p_state = p_next_state;
-
-          next_state_id = p_state->on_enter_state();
-
-          if (have_changed_state(next_state_id))
-          {
-            ETL_ASSERT(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
-            p_next_state = state_list[next_state_id];
-          }
-        } while (p_next_state != p_state); // Have we changed state again?
+          p_state->on_enter_state();
+        }
       }
-      else if (is_self_transition(next_state_id))
+      else
       {
-        p_state->on_exit_state();
-        p_state->on_enter_state();
+        ETL_ASSERT_FAIL(ETL_ERROR(etl::fsm_not_started));
       }
     }
 
diff --git a/include/etl/hfsm.h b/include/etl/hfsm.h
index c9ca12f3..47a936c5 100644
--- a/include/etl/hfsm.h
+++ b/include/etl/hfsm.h
@@ -98,30 +98,37 @@ namespace etl
     //*******************************************
     void receive(const etl::imessage& message) ETL_OVERRIDE
     {
-      etl::fsm_state_id_t next_state_id = p_state->process_event(message);
-
-      if (next_state_id != ifsm_state::No_State_Change)
+      if (is_started())
       {
-        ETL_ASSERT(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
-        etl::ifsm_state* p_next_state = state_list[next_state_id];
+        etl::fsm_state_id_t next_state_id = p_state->process_event(message);
 
-        // Have we changed state?
-        if (p_next_state != p_state)
+        if (next_state_id != ifsm_state::No_State_Change)
         {
-          etl::ifsm_state* p_root = common_ancestor(p_state, p_next_state);
-          do_exits(p_root, p_state);
+          ETL_ASSERT(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
+          etl::ifsm_state* p_next_state = state_list[next_state_id];
 
-          p_state = p_next_state;
-
-          next_state_id = do_enters(p_root, p_next_state, true);
-
-          if (next_state_id != ifsm_state::No_State_Change)
+          // Have we changed state?
+          if (p_next_state != p_state)
           {
-            ETL_ASSERT(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
-            p_state = state_list[next_state_id];
+            etl::ifsm_state* p_root = common_ancestor(p_state, p_next_state);
+            do_exits(p_root, p_state);
+
+            p_state = p_next_state;
+
+            next_state_id = do_enters(p_root, p_next_state, true);
+
+            if (next_state_id != ifsm_state::No_State_Change)
+            {
+              ETL_ASSERT(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
+              p_state = state_list[next_state_id];
+            }
           }
         }
       }
+      else
+      {
+        ETL_ASSERT_FAIL(ETL_ERROR(etl::fsm_not_started));
+      }
     }
 
   private:
diff --git a/test/test_fsm.cpp b/test/test_fsm.cpp
index e092f1d2..d3481dd3 100644
--- a/test/test_fsm.cpp
+++ b/test/test_fsm.cpp
@@ -672,5 +672,13 @@ namespace
       CHECK_TRUE(motorControl.exited_state);
       CHECK_TRUE(motorControl.entered_state);
     }
+
+    //*************************************************************************
+    TEST(test_fsm_no_states_and_no_start)
+    {
+      MotorControl mc;
+
+      CHECK_THROW(mc.receive(Start()), etl::fsm_not_started);
+    }
   };
 }
diff --git a/test/test_hfsm.cpp b/test/test_hfsm.cpp
index 584c3f48..4ea762ab 100644
--- a/test/test_hfsm.cpp
+++ b/test/test_hfsm.cpp
@@ -978,5 +978,13 @@ namespace
       bool exitsCorrect = std::equal(motorControl.stateExitHistory.begin(), motorControl.stateExitHistory.end(), expectedExits.begin());
       CHECK(exitsCorrect);
     }
+
+    //*************************************************************************
+    TEST(test_fsm_no_states_and_no_start)
+    {
+      MotorControl mc;
+
+      CHECK_THROW(mc.receive(Start()), etl::fsm_not_started);
+    }
   };
 }

From e64b489d5e2d71618812b5143650810db8a8a4a8 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Wed, 20 Mar 2024 23:33:18 +0000
Subject: [PATCH 103/131] Fixed dereference of state pointer when null.

---
 include/etl/fsm.h  | 4 ++--
 include/etl/hfsm.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/etl/fsm.h b/include/etl/fsm.h
index ed1a9a7d..04715779 100644
--- a/include/etl/fsm.h
+++ b/include/etl/fsm.h
@@ -422,7 +422,7 @@ namespace etl
 
         if (have_changed_state(next_state_id))
         {
-          ETL_ASSERT(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
+          ETL_ASSERT_OR_RETURN(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
           etl::ifsm_state* p_next_state = state_list[next_state_id];
 
           do
@@ -434,7 +434,7 @@ namespace etl
 
             if (have_changed_state(next_state_id))
             {
-              ETL_ASSERT(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
+              ETL_ASSERT_OR_RETURN(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
               p_next_state = state_list[next_state_id];
             }
           } while (p_next_state != p_state); // Have we changed state again?
diff --git a/include/etl/hfsm.h b/include/etl/hfsm.h
index 47a936c5..8afe94f4 100644
--- a/include/etl/hfsm.h
+++ b/include/etl/hfsm.h
@@ -104,7 +104,7 @@ namespace etl
 
         if (next_state_id != ifsm_state::No_State_Change)
         {
-          ETL_ASSERT(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
+          ETL_ASSERT_OR_RETURN(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
           etl::ifsm_state* p_next_state = state_list[next_state_id];
 
           // Have we changed state?
@@ -119,7 +119,7 @@ namespace etl
 
             if (next_state_id != ifsm_state::No_State_Change)
             {
-              ETL_ASSERT(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
+              ETL_ASSERT_OR_RETURN(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
               p_state = state_list[next_state_id];
             }
           }

From 1474d4add87b43e7c36a6b04bd05697ce3eaa391 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Thu, 21 Mar 2024 10:07:31 +0000
Subject: [PATCH 104/131] Added etl::mem_fn

---
 include/etl/functional.h |  67 ++++++++++++++++++++++++++
 test/test_functional.cpp | 101 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 168 insertions(+)

diff --git a/include/etl/functional.h b/include/etl/functional.h
index e6a72ad8..c20044f8 100644
--- a/include/etl/functional.h
+++ b/include/etl/functional.h
@@ -528,6 +528,73 @@ namespace etl
       return ~lhs;
     }
   };
+
+#if ETL_USING_CPP11
+  namespace private_functional
+  {
+    //***************************************************************************
+    template<typename TReturnType, typename TClassType, typename... TArgs>
+    class mem_fn_impl
+    {
+    public:
+
+      typedef TReturnType(TClassType::* MemberFunctionType)(TArgs...);
+
+      ETL_CONSTEXPR mem_fn_impl(MemberFunctionType member_function)
+        : member_function(member_function)
+      {
+      }
+
+      ETL_CONSTEXPR TReturnType operator()(TClassType& instance, TArgs... args) const
+      {
+        return (instance.*member_function)(std::forward<TArgs>(args)...);
+      }
+
+    private:
+
+      MemberFunctionType member_function;
+    };
+
+    //***************************************************************************
+    template<typename TReturnType, typename TClassType, typename... TArgs>
+    class const_mem_fn_impl
+    {
+    public:
+
+      typedef TReturnType(TClassType::* MemberFunctionType)(TArgs...) const;
+
+      ETL_CONSTEXPR const_mem_fn_impl(MemberFunctionType member_function)
+        : member_function(member_function)
+      {
+      }
+
+      ETL_CONSTEXPR TReturnType operator()(const TClassType& instance, TArgs... args) const
+      {
+        return (instance.*member_function)(std::forward<TArgs>(args)...);
+      }
+
+    private:
+
+      MemberFunctionType member_function;
+    };
+  }
+
+  //***************************************************************************
+  template<typename TReturnType, typename TClassType, typename... TArgs>
+  ETL_CONSTEXPR
+  private_functional::mem_fn_impl<TReturnType, TClassType, TArgs...> mem_fn(TReturnType(TClassType::* member_function)(TArgs...))
+  {
+    return private_functional::mem_fn_impl<TReturnType, TClassType, TArgs...>(member_function);
+  }
+
+  //***************************************************************************
+  template<typename TReturnType, typename TClassType, typename... TArgs>
+  ETL_CONSTEXPR
+  private_functional::const_mem_fn_impl<TReturnType, TClassType, TArgs...> mem_fn(TReturnType(TClassType::* member_function)(TArgs...) const)
+  {
+    return private_functional::const_mem_fn_impl<TReturnType, TClassType, TArgs...>(member_function);
+  }
+#endif
 }
 
 #endif
diff --git a/test/test_functional.cpp b/test/test_functional.cpp
index 1b9eea52..9970cf25 100644
--- a/test/test_functional.cpp
+++ b/test/test_functional.cpp
@@ -50,6 +50,41 @@ namespace
     }
   };
 
+  struct MemFnTest
+  {
+    std::string Function1()
+    {
+      return std::string("Function1");
+    }
+
+    std::string Function2(const std::string& arg1)
+    {
+      return std::string("Function2: ") + arg1;
+    }
+
+    std::string Function3(const std::string& arg1, const std::string& arg2)
+    {
+      return std::string("Function3: ") + arg1 + arg2;
+    }
+
+    std::string Function1_Const() const
+    {
+      return std::string("Function1_Const");
+    }
+
+    std::string Function2_Const(const std::string& arg1) const
+    {
+      return std::string("Function2_Const: ") + arg1;
+    }
+
+    std::string Function3_Const(const std::string& arg1, const std::string& arg2) const
+    {
+      return std::string("Function3_Const: ") + arg1 + arg2;
+    }
+
+    mutable std::string result;
+  };
+
   SUITE(test_functional)
   {
     //*************************************************************************
@@ -278,5 +313,71 @@ namespace
       CHECK_EQUAL(uint8_t(~0xAAU), f(0xAAU));
       CHECK_EQUAL(uint8_t(~0xFFU), f(0xFFU));
     }
+
+    //*************************************************************************
+    TEST(test_mem_fn)
+    {
+      MemFnTest mft;
+      std::string result;
+
+      auto f1 = etl::mem_fn(&MemFnTest::Function1);
+      result.clear();
+      result = f1(mft);
+      CHECK_EQUAL("Function1", result);
+
+      auto f2 = etl::mem_fn(&MemFnTest::Function2);
+      result.clear();
+      result = f2(mft, "Arg1");
+      CHECK_EQUAL("Function2: Arg1", result);
+
+      auto f3 = etl::mem_fn(&MemFnTest::Function3);
+      result.clear();
+      result = f3(mft, "Arg1", " : Arg2");
+      CHECK_EQUAL("Function3: Arg1 : Arg2", result);
+    }
+
+    //*************************************************************************
+    TEST(test_const_mem_fn)
+    {
+      const MemFnTest mft;
+      std::string result;
+
+      auto f1 = etl::mem_fn(&MemFnTest::Function1_Const);
+      result.clear();
+      result = f1(mft);
+      CHECK_EQUAL("Function1_Const", result);
+
+      auto f2 = etl::mem_fn(&MemFnTest::Function2_Const);
+      result.clear();
+      result = f2(mft, "Arg1");
+      CHECK_EQUAL("Function2_Const: Arg1", result);
+
+      auto f3 = etl::mem_fn(&MemFnTest::Function3_Const);
+      result.clear();
+      result = f3(mft, "Arg1", " : Arg2");
+      CHECK_EQUAL("Function3_Const: Arg1 : Arg2", result);
+    }
+
+    //*************************************************************************
+    TEST(test_constexpr_mem_fn)
+    {
+      const MemFnTest mft;
+      std::string result;
+
+      constexpr auto f1 = etl::mem_fn(&MemFnTest::Function1_Const);
+      result.clear();
+      result = f1(mft);
+      CHECK_EQUAL("Function1_Const", result);
+
+      constexpr auto f2 = etl::mem_fn(&MemFnTest::Function2_Const);
+      result.clear();
+      result = f2(mft, "Arg1");
+      CHECK_EQUAL("Function2_Const: Arg1", result);
+
+      constexpr auto f3 = etl::mem_fn(&MemFnTest::Function3_Const);
+      result.clear();
+      result = f3(mft, "Arg1", " : Arg2");
+      CHECK_EQUAL("Function3_Const: Arg1 : Arg2", result);
+    }
   };
 }

From 353419f28482bae02d719b350d320d2da1fada3e Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Thu, 21 Mar 2024 10:07:57 +0000
Subject: [PATCH 105/131] Updated with UnitTest++ macros

---
 include/etl/functional.h |  8 ++++----
 test/vs2022/cpp.hint     | 13 +++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/include/etl/functional.h b/include/etl/functional.h
index c20044f8..6e0148b1 100644
--- a/include/etl/functional.h
+++ b/include/etl/functional.h
@@ -540,8 +540,8 @@ namespace etl
 
       typedef TReturnType(TClassType::* MemberFunctionType)(TArgs...);
 
-      ETL_CONSTEXPR mem_fn_impl(MemberFunctionType member_function)
-        : member_function(member_function)
+      ETL_CONSTEXPR mem_fn_impl(MemberFunctionType member_function_)
+        : member_function(member_function_)
       {
       }
 
@@ -563,8 +563,8 @@ namespace etl
 
       typedef TReturnType(TClassType::* MemberFunctionType)(TArgs...) const;
 
-      ETL_CONSTEXPR const_mem_fn_impl(MemberFunctionType member_function)
-        : member_function(member_function)
+      ETL_CONSTEXPR const_mem_fn_impl(MemberFunctionType member_function_)
+        : member_function(member_function_)
       {
       }
 
diff --git a/test/vs2022/cpp.hint b/test/vs2022/cpp.hint
index 1412ab0f..6aeae32e 100644
--- a/test/vs2022/cpp.hint
+++ b/test/vs2022/cpp.hint
@@ -3,6 +3,7 @@
 // For more information see https://go.microsoft.com/fwlink/?linkid=865984
 #define ETL_CONSTANT
 #define ETL_CONSTEXPR
+#define ETL_CONSTEXPR11
 #define ETL_CONSTEXPR14
 #define ETL_CONSTEXPR17
 #define ETL_IF_CONSTEXPR
@@ -22,6 +23,18 @@
 #define ETL_CPP11_SUPPORTED
 #define ETL_CPP14_SUPPORTED
 #define ETL_CPP17_SUPPORTED
+#define ETL_CPP17_SUPPORTED
+#define ETL_USING_CPP11
+#define ETL_USING_CPP14
+#define ETL_USING_CPP17
+#define ETL_USING_CPP20
 #define ETL_ASSERT
 #define ETL_NULLPTR
 #define ETL_USING_STLPORT
+#define CHECK
+#define CHECK_FALSE
+#define CHECK_TRUE
+#define CHECK_EQUAL
+#define CHECK_ARRAY_EQUAL
+#define CHECK_CLOSE
+#define CHECK_THROW

From c4f772b5095c1dfc5bb845624e9304a27048f725 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Thu, 21 Mar 2024 12:23:50 +0000
Subject: [PATCH 106/131] Added C++14 guard around constexpr type_def  tests

---
 test/test_type_def.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test_type_def.cpp b/test/test_type_def.cpp
index 8ce542e0..b30278a9 100644
--- a/test/test_type_def.cpp
+++ b/test/test_type_def.cpp
@@ -224,6 +224,7 @@ namespace
       CHECK_TRUE(ngte);
     }
 
+#if ETL_USING_CPP14
     //*************************************************************************
     ETL_TYPEDEF(int32_t, arithmetic_type_t);
 
@@ -257,5 +258,6 @@ namespace
       CHECK_EQUAL(3,  value_plus.get());
       CHECK_EQUAL(-3, value_minus.get());
     }
+#endif
   };
 }

From ac93dc730d6f7e0972163ea716cb17ece09e0ce9 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Thu, 21 Mar 2024 14:28:09 +0000
Subject: [PATCH 107/131] Added etl::mem_fn

---
 include/etl/functional.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/etl/functional.h b/include/etl/functional.h
index 6e0148b1..3f3a73d2 100644
--- a/include/etl/functional.h
+++ b/include/etl/functional.h
@@ -547,7 +547,7 @@ namespace etl
 
       ETL_CONSTEXPR TReturnType operator()(TClassType& instance, TArgs... args) const
       {
-        return (instance.*member_function)(std::forward<TArgs>(args)...);
+        return (instance.*member_function)(etl::forward<TArgs>(args)...);
       }
 
     private:
@@ -570,7 +570,7 @@ namespace etl
 
       ETL_CONSTEXPR TReturnType operator()(const TClassType& instance, TArgs... args) const
       {
-        return (instance.*member_function)(std::forward<TArgs>(args)...);
+        return (instance.*member_function)(etl::forward<TArgs>(args)...);
       }
 
     private:

From 41a680436c87a3f3802aa0af160990539e90378c Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 23 Mar 2024 15:08:01 +0000
Subject: [PATCH 108/131] Added etl::mem_fn

---
 include/etl/functional.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/etl/functional.h b/include/etl/functional.h
index 3f3a73d2..d762506c 100644
--- a/include/etl/functional.h
+++ b/include/etl/functional.h
@@ -32,6 +32,7 @@ SOFTWARE.
 #define ETL_FUNCTIONAL_INCLUDED
 
 #include "platform.h"
+#include "utility.h"
 
 ///\defgroup functional functional
 ///\ingroup utilities

From b07019dac4122921bc9c3f2be1f3993391c712e6 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 23 Mar 2024 15:08:47 +0000
Subject: [PATCH 109/131] removed generator output files from VS2022 project

---
 test/vs2022/etl.vcxproj         | 135 --------------------------------
 test/vs2022/etl.vcxproj.filters |  30 -------
 2 files changed, 165 deletions(-)

diff --git a/test/vs2022/etl.vcxproj b/test/vs2022/etl.vcxproj
index b702cf36..c95a0d70 100644
--- a/test/vs2022/etl.vcxproj
+++ b/test/vs2022/etl.vcxproj
@@ -3003,141 +3003,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\arduino\Embedded_Template_Library.h" />
-    <ClInclude Include="..\..\build\generator_tmp\fsm.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\largest.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\message_packet.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\message_router.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\smallest.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\type_lookup.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\type_select.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\type_traits.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\variant_pool.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">true</ExcludedFromBuild>
-    </ClInclude>
     <ClInclude Include="..\..\include\etl\array_view.h" />
     <ClInclude Include="..\..\include\etl\array_wrapper.h" />
     <ClInclude Include="..\..\include\etl\atomic.h" />
diff --git a/test/vs2022/etl.vcxproj.filters b/test/vs2022/etl.vcxproj.filters
index 6d2a4440..c4825d0a 100644
--- a/test/vs2022/etl.vcxproj.filters
+++ b/test/vs2022/etl.vcxproj.filters
@@ -226,9 +226,6 @@
     <Filter Include="Tests\Codecs">
       <UniqueIdentifier>{9713a35d-8f0e-4722-9b15-a5c477c9ecdb}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Tests\Scripts\Generator test output">
-      <UniqueIdentifier>{6850e52c-a546-4219-a1bc-b3d1360f6ed7}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\etl\enum_type.h">
@@ -1398,33 +1395,6 @@
     <ClInclude Include="..\..\include\etl\crc8_j1850_zero.h">
       <Filter>ETL\Maths\CRC</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\fsm.h">
-      <Filter>Tests\Scripts\Generator test output</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\largest.h">
-      <Filter>Tests\Scripts\Generator test output</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\message_packet.h">
-      <Filter>Tests\Scripts\Generator test output</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\message_router.h">
-      <Filter>Tests\Scripts\Generator test output</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\smallest.h">
-      <Filter>Tests\Scripts\Generator test output</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\type_lookup.h">
-      <Filter>Tests\Scripts\Generator test output</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\type_select.h">
-      <Filter>Tests\Scripts\Generator test output</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\type_traits.h">
-      <Filter>Tests\Scripts\Generator test output</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\build\generator_tmp\variant_pool.h">
-      <Filter>Tests\Scripts\Generator test output</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\test_string_char.cpp">

From f1d80ba577614f92f7495d1f2bdee53bb97f928a Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 23 Mar 2024 20:32:26 +0000
Subject: [PATCH 110/131] Work in progree

---
 include/etl/compare.h                  |  20 ++++
 include/etl/private/variant_variadic.h | 152 +++++++++++++++++++++++++
 test/test_variant_variadic.cpp         | 102 +++++++++++++++++
 3 files changed, 274 insertions(+)

diff --git a/include/etl/compare.h b/include/etl/compare.h
index 1c3fa3c3..7a6d589b 100644
--- a/include/etl/compare.h
+++ b/include/etl/compare.h
@@ -99,6 +99,26 @@ namespace etl
       return lt(lhs, rhs) ? Less : gt(lhs, rhs) ? Greater : Equal;
     }
   };
+
+  //***************************************************************************
+  /// Default implementation of TLess is etl::less
+  //***************************************************************************
+  template <typename T, typename TLess = etl::less<T>>
+  ETL_CONSTEXPR14 int three_way_compare(const T& lhs, const T& rhs)
+  {
+    if (lhs < rhs)
+    {
+      return -1;
+    }
+    else if (lhs > rhs)
+    {
+      return 1;
+    }
+    else
+    {
+      return 0;
+    }
+  }
 }
 
 #endif
diff --git a/include/etl/private/variant_variadic.h b/include/etl/private/variant_variadic.h
index 5fb7d1ac..a5a96d5c 100644
--- a/include/etl/private/variant_variadic.h
+++ b/include/etl/private/variant_variadic.h
@@ -41,10 +41,15 @@ SOFTWARE.
 #include "../placement_new.h"
 #include "../visitor.h"
 #include "../memory.h"
+#include "../compare.h"
 #include "../initializer_list.h"
 
 #include <stdint.h>
 
+//#if ETL_USING_CPP20 && ETL_USING_STL
+//  #include <compare>
+//#endif
+
 #if defined(ETL_COMPILER_KEIL)
   #pragma diag_suppress 940
   #pragma diag_suppress 111
@@ -1824,5 +1829,152 @@ namespace etl
   {
     return private_variant::visit<TDeducedReturn>(static_cast<TCallable&&>(f), static_cast<TVariants&&>(vs)...);
   }
+
+  //***************************************************************************
+  /// Checks if the variants are equal.
+  /// https://en.cppreference.com/w/cpp/utility/variant/operator_cmp
+  //***************************************************************************
+  template <typename... TTypes>
+  ETL_CONSTEXPR14 bool operator ==(const etl::variant<TTypes...>& lhs, const etl::variant<TTypes...>& rhs)
+  {
+    // If both variants are valueless, they are considered equal
+    if (lhs.valueless_by_exception() && rhs.valueless_by_exception())
+    {
+      return true;
+    }
+
+    // If one variant is valueless and the other is not, they are not equal
+    if (lhs.valueless_by_exception() || rhs.valueless_by_exception())
+    {
+      return false;
+    }
+
+    // If variants have different types, they are not equal
+    if (lhs.index() != rhs.index())
+    {
+      return false;
+    }
+
+    // Variants have the same type, apply the equality operator for the contained values
+    return etl::visit([&](auto const& lhs_downcasted)
+      {
+        return lhs_downcasted == etl::get<decltype(lhs_downcasted)>(rhs);
+      }, lhs);
+  }
+
+  //***************************************************************************
+  /// Checks if the variants not equal.
+  /// https://en.cppreference.com/w/cpp/utility/variant/operator_cmp
+  //***************************************************************************
+  template <typename... TTypes>
+  ETL_CONSTEXPR14 bool operator !=(const etl::variant<TTypes...>& lhs, const etl::variant<TTypes...>& rhs)
+  {
+    return !(lhs == rhs);
+  }
+
+  //***************************************************************************
+  /// Checks if the lhs variant is less than rhs.
+  /// https://en.cppreference.com/w/cpp/utility/variant/operator_cmp
+  //***************************************************************************
+  template <typename... TTypes>
+  ETL_CONSTEXPR14 bool operator <(const etl::variant<TTypes...>& lhs, const etl::variant<TTypes...>& rhs)
+  {
+    // If both variants are valueless, they are considered equal, so not less than
+    if (lhs.valueless_by_exception() && rhs.valueless_by_exception())
+    {
+      return false;
+    }
+
+    // A valueless variant is always less than a variant with a value
+    if (lhs.valueless_by_exception())
+    {
+      return true;
+    }
+
+    // A variant with a value is never less than a valueless variant
+    if (rhs.valueless_by_exception())
+    {
+      return false;
+    }
+
+    // If variants have different types, compare the type index
+    if (lhs.index() != rhs.index())
+    {
+      return lhs.index() < rhs.index();
+    }
+
+    // Variants have the same type, apply the equality operator for the contained values
+    return etl::visit([&](auto const& lhs_downcasted)
+      {
+        return lhs_downcasted < etl::get<decltype(lhs_downcasted)>(rhs);
+      }, lhs);
+  }
+
+  //***************************************************************************
+  /// Checks if the lhs variant is greater than rhs.
+  /// https://en.cppreference.com/w/cpp/utility/variant/operator_cmp
+  //***************************************************************************
+  template <typename... TTypes>
+  ETL_CONSTEXPR14 bool operator >(const etl::variant<TTypes...>& lhs, const etl::variant<TTypes...>& rhs)
+  {
+    return (rhs < lhs);
+  }
+
+  //***************************************************************************
+  /// Checks if the lhs variant is less than or equal to rhs.
+  /// https://en.cppreference.com/w/cpp/utility/variant/operator_cmp
+  //***************************************************************************
+  template <typename... TTypes>
+  ETL_CONSTEXPR14 bool operator <=(const etl::variant<TTypes...>& lhs, const etl::variant<TTypes...>& rhs)
+  {
+    return  !(lhs > rhs);
+  }
+
+  //***************************************************************************
+  /// Checks if the lhs variant is greater than or equal to rhs.
+  /// https://en.cppreference.com/w/cpp/utility/variant/operator_cmp
+  //***************************************************************************
+  template <typename... TTypes>
+  ETL_CONSTEXPR14 bool operator >=(const etl::variant<TTypes...>& lhs, const etl::variant<TTypes...>& rhs)
+  {
+    return !(lhs < rhs);
+  }
+
+  //***************************************************************************
+  /// Checks if the lhs variant is greater than or equal to rhs.
+  /// Only defined if using C++20 and STL.
+  /// https://en.cppreference.com/w/cpp/utility/variant/operator_cmp
+  //***************************************************************************
+#if ETL_USING_CPP20 && ETL_USING_STL
+  template <typename... TTypes>
+  ETL_CONSTEXPR14 
+  std::common_comparison_category_t<std::compare_three_way_result_t<TTypes>...>
+    operator <=>(const etl::variant<TTypes...>& lhs, const etl::variant<TTypes...>& rhs)
+  {
+    if (lhs.valueless_by_exception() && rhs.valueless_by_exception())
+    {
+      return std::strong_ordering::equal;
+    }
+    else if (lhs.valueless_by_exception())
+    {
+      return std::strong_ordering::less;
+    }
+    else if (rhs.valueless_by_exception())
+    {
+      return std::strong_ordering::greater;
+    }
+    else if (lhs.index() != rhs.index())
+    {
+      return lhs.index() <=> rhs.index();
+    }
+    else
+    {
+      return etl::visit([&](auto const& lhs_downcasted)
+        {
+          return lhs_downcasted <=> etl::get<decltype(lhs_downcasted)>(rhs);
+        }, lhs);
+    }
+  }
+#endif
 }
 #endif
diff --git a/test/test_variant_variadic.cpp b/test/test_variant_variadic.cpp
index e35d48e8..c6fbcb7c 100644
--- a/test/test_variant_variadic.cpp
+++ b/test/test_variant_variadic.cpp
@@ -169,6 +169,28 @@ namespace
     return os;
   }
 
+  std::ostream& operator <<(std::ostream& os, std::strong_ordering ordering)
+  {
+    if (ordering == std::strong_ordering::equal)
+    {
+      os << "std::strong_ordering::equal";
+    }
+    else if (ordering == std::strong_ordering::equivalent)
+    {
+      os << "std::strong_ordering::equivalent";
+    }
+    else if (ordering == std::strong_ordering::greater)
+    {
+      os << "std::strong_ordering::greater";
+    }
+    else if (ordering == std::strong_ordering::less)
+    {
+      os << "std::strong_ordering::less";
+    }
+
+    return os;
+  }
+
   typedef etl::variant<etl::monostate, D1, D2, D3, D4> test_variant_emplace;
 
   //*********************************************
@@ -1918,6 +1940,86 @@ namespace
       CHECK_EQUAL(std::string("TypeD"), result);
     }
 #endif
+
+    //*************************************************************************
+    TEST(test_variant_comparisons)
+    {
+      using Variant = etl::variant<char, int, std::string>;
+    
+      Variant v_empty1;
+      Variant v_empty2;
+
+      Variant v_char_a('A');
+      Variant v_char_b('B');
+
+      Variant v_int_1(1);
+      Variant v_int_2(2);
+
+      Variant v_hello(std::string("hello"));
+      Variant v_world(std::string("world"));
+
+      CHECK_TRUE(v_empty1 == v_empty2);
+    }
+
+#if ETL_USING_CPP20 && ETL_USING_STL
+    //*************************************************************************
+    TEST(test_variant_spaceship_operator)
+    {
+      using Variant = etl::variant<char, int>;
+
+      Variant v_empty1;
+      Variant v_empty2;
+
+      Variant v_char_a('A');
+      Variant v_char_b('B');
+
+      Variant v_int_1(1);
+      Variant v_int_2(2);
+
+      CHECK_EQUAL(std::strong_ordering::equal,   v_empty1 <=> v_empty2);
+      CHECK_EQUAL(std::strong_ordering::less,    v_empty1 <=> v_char_a);
+      CHECK_EQUAL(std::strong_ordering::greater, v_char_a <=> v_empty1);
+
+      CHECK_EQUAL(std::strong_ordering::equal,   v_char_a <=> v_char_a);
+      CHECK_EQUAL(std::strong_ordering::less,    v_char_a <=> v_char_b);
+      CHECK_EQUAL(std::strong_ordering::greater, v_char_b <=> v_char_a);
+
+      CHECK_EQUAL(std::strong_ordering::equal,   v_int_1 <=> v_int_1);
+      CHECK_EQUAL(std::strong_ordering::less,    v_int_1 <=> v_int_2);
+      CHECK_EQUAL(std::strong_ordering::greater, v_int_2 <=> v_int_1);
+
+      CHECK_EQUAL(std::strong_ordering::less,    v_char_a <=> v_int_1);
+      CHECK_EQUAL(std::strong_ordering::greater, v_int_2  <=> v_char_a);
+    }
+#endif
+
+    //*************************************************************************
+    TEST(test_variant_three_way_compare)
+    {
+      using Variant = etl::variant<char, int>;
+
+      Variant v_empty1;
+      Variant v_empty2;
+
+      Variant v_char_a('A');
+      Variant v_char_b('B');
+
+      Variant v_int_1(1);
+      Variant v_int_2(2);
+
+      CHECK_EQUAL( 0, (etl::three_way_compare(v_empty1, v_empty2)));
+      
+      CHECK_EQUAL( 0, (etl::three_way_compare(v_char_a, v_char_a)));
+      CHECK_EQUAL(-1, (etl::three_way_compare(v_char_a, v_char_b)));
+      CHECK_EQUAL( 1, (etl::three_way_compare(v_char_b, v_char_a)));
+      
+      CHECK_EQUAL( 0, (etl::three_way_compare(v_int_1,  v_int_1)));
+      CHECK_EQUAL(-1, (etl::three_way_compare(v_int_1,  v_int_2)));
+      CHECK_EQUAL( 1, (etl::three_way_compare(v_int_2,  v_int_1)));
+
+      CHECK_EQUAL(-1, (etl::three_way_compare(v_char_a, v_int_1)));
+      CHECK_EQUAL( 1, (etl::three_way_compare(v_int_1,  v_char_a)));
+    }
   };
 }
 

From 4bc8d007372056856534f087c7b2e46b06f3b7c4 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Wed, 27 Mar 2024 21:01:05 +0000
Subject: [PATCH 111/131] Modified return types

---
 include/etl/compare.h | 48 +++++++++++++++----------------------------
 1 file changed, 16 insertions(+), 32 deletions(-)

diff --git a/include/etl/compare.h b/include/etl/compare.h
index 7a6d589b..e143366c 100644
--- a/include/etl/compare.h
+++ b/include/etl/compare.h
@@ -42,61 +42,56 @@ SOFTWARE.
 //*****************************************************************************
 namespace etl
 {
-  struct compare_types
-  {
-    typedef bool result_type;
-
-    enum cmp_result
-    {
-      Less    = 0,
-      Equal   = 1,
-      Greater = 2
-    };
-  };
-
   //***************************************************************************
   /// Defines <=, >, >=, ==, !=, <=> in terms of <
   /// Default implementation of TLess is etl::less
   //***************************************************************************
   template <typename T, typename TLess = etl::less<T> >
-  struct compare : public compare_types
+  struct compare
   {
+    enum  cmp_result
+    {
+      Less    = -1,
+      Equal   = 0,
+      Greater = 1
+    };
+
     typedef typename etl::parameter_type<T>::type first_argument_type;
     typedef typename etl::parameter_type<T>::type second_argument_type;
 
-    static ETL_CONSTEXPR result_type lt(first_argument_type lhs, second_argument_type rhs)
+    static ETL_CONSTEXPR bool lt(first_argument_type lhs, second_argument_type rhs)
     {
       return TLess()(lhs, rhs);
     }
 
-    static ETL_CONSTEXPR result_type gt(first_argument_type lhs, second_argument_type rhs)
+    static ETL_CONSTEXPR bool gt(first_argument_type lhs, second_argument_type rhs)
     {
       return TLess()(rhs, lhs);
     }
 
-    static ETL_CONSTEXPR result_type lte(first_argument_type lhs, second_argument_type rhs)
+    static ETL_CONSTEXPR bool lte(first_argument_type lhs, second_argument_type rhs)
     {
       return !gt(lhs, rhs);
     }
 
-    static ETL_CONSTEXPR result_type gte(first_argument_type lhs, second_argument_type rhs)
+    static ETL_CONSTEXPR bool gte(first_argument_type lhs, second_argument_type rhs)
     {
       return !lt(lhs, rhs);
     }
 
-    static ETL_CONSTEXPR result_type eq(first_argument_type lhs, second_argument_type rhs)
+    static ETL_CONSTEXPR bool eq(first_argument_type lhs, second_argument_type rhs)
     {
       return gte(lhs, rhs) && lte(lhs, rhs);
     }
 
-    static ETL_CONSTEXPR result_type ne(first_argument_type lhs, second_argument_type rhs)
+    static ETL_CONSTEXPR bool ne(first_argument_type lhs, second_argument_type rhs)
     {
       return !eq(lhs, rhs);
     }
 
     static ETL_CONSTEXPR cmp_result cmp(first_argument_type lhs, second_argument_type rhs)
     {
-      return lt(lhs, rhs) ? Less : gt(lhs, rhs) ? Greater : Equal;
+      return lt(lhs, rhs) ? cmp_result::Less : gt(lhs, rhs) ? cmp_result::Greater : cmp_result::Equal;
     }
   };
 
@@ -106,18 +101,7 @@ namespace etl
   template <typename T, typename TLess = etl::less<T>>
   ETL_CONSTEXPR14 int three_way_compare(const T& lhs, const T& rhs)
   {
-    if (lhs < rhs)
-    {
-      return -1;
-    }
-    else if (lhs > rhs)
-    {
-      return 1;
-    }
-    else
-    {
-      return 0;
-    }
+    return etl::compare<T>::cmp(lhs, rhs);
   }
 }
 

From 39205e719dd2e627a3a67111ad6b013a5baee58f Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Fri, 29 Mar 2024 16:35:45 +0000
Subject: [PATCH 112/131] Added comparison operators

---
 include/etl/private/variant_variadic.h | 101 ++++++++++++++++++++-----
 test/test_variant_variadic.cpp         |  31 +++++---
 2 files changed, 101 insertions(+), 31 deletions(-)

diff --git a/include/etl/private/variant_variadic.h b/include/etl/private/variant_variadic.h
index a5a96d5c..bacfa8f7 100644
--- a/include/etl/private/variant_variadic.h
+++ b/include/etl/private/variant_variadic.h
@@ -46,10 +46,6 @@ SOFTWARE.
 
 #include <stdint.h>
 
-//#if ETL_USING_CPP20 && ETL_USING_STL
-//  #include <compare>
-//#endif
-
 #if defined(ETL_COMPILER_KEIL)
   #pragma diag_suppress 940
   #pragma diag_suppress 111
@@ -1821,7 +1817,7 @@ namespace etl
   }  // namespace private_variant
 
   //***************************************************************************
-  /// c++11/14 compatible etl::visit for etl::variant. Supports both c++17
+  /// C++11/14 compatible etl::visit for etl::variant. Supports both c++17
   /// "auto return type" signature and c++20 explicit template return type.
   //***************************************************************************
   template <typename TRet = private_variant::visit_auto_return, typename... TVariants, typename TCallable, typename TDeducedReturn = private_variant::visit_result_t<TRet, TCallable, TVariants...> >
@@ -1830,6 +1826,51 @@ namespace etl
     return private_variant::visit<TDeducedReturn>(static_cast<TCallable&&>(f), static_cast<TVariants&&>(vs)...);
   }
 
+  namespace private_variant
+  {
+    //***************************************************************************
+    /// C++11 compatible visitor function for testing variant equality.
+    /// Assumes that the two variants are already known to contain the same type.
+    //***************************************************************************
+    template <typename TVariant>
+    struct equality_visitor
+    {
+      equality_visitor(const TVariant& rhs_)
+        : rhs(rhs_)
+      {
+      }
+
+      template <typename TValue>
+      bool operator()(const TValue& lhs_downcasted)
+      {
+        return lhs_downcasted == etl::get<TValue>(rhs);
+      }
+
+      const TVariant& rhs;
+    };
+
+    //***************************************************************************
+    /// C++11 compatible visitor function for testing variant '<' (less than).
+    /// Assumes that the two variants are already known to contain the same type.
+    //***************************************************************************
+    template <typename TVariant>
+    struct less_than_visitor
+    {
+      less_than_visitor(const TVariant& rhs_)
+        : rhs(rhs_)
+      {
+      }
+
+      template <typename TValue>
+      bool operator()(const TValue& lhs_downcasted)
+      {
+        return lhs_downcasted < etl::get<TValue>(rhs);
+      }
+
+      const TVariant& rhs;
+    };
+  }
+
   //***************************************************************************
   /// Checks if the variants are equal.
   /// https://en.cppreference.com/w/cpp/utility/variant/operator_cmp
@@ -1856,10 +1897,9 @@ namespace etl
     }
 
     // Variants have the same type, apply the equality operator for the contained values
-    return etl::visit([&](auto const& lhs_downcasted)
-      {
-        return lhs_downcasted == etl::get<decltype(lhs_downcasted)>(rhs);
-      }, lhs);
+    private_variant::equality_visitor<etl::variant<TTypes...>> visitor(rhs);
+
+    return etl::visit(visitor, lhs);
   }
 
   //***************************************************************************
@@ -1903,11 +1943,10 @@ namespace etl
       return lhs.index() < rhs.index();
     }
 
-    // Variants have the same type, apply the equality operator for the contained values
-    return etl::visit([&](auto const& lhs_downcasted)
-      {
-        return lhs_downcasted < etl::get<decltype(lhs_downcasted)>(rhs);
-      }, lhs);
+    // Variants have the same type, apply the less than operator for the contained values
+    private_variant::less_than_visitor<etl::variant<TTypes...>> visitor(rhs);
+
+    return etl::visit(visitor, lhs);
   }
 
   //***************************************************************************
@@ -1940,8 +1979,32 @@ namespace etl
     return !(lhs < rhs);
   }
 
+  namespace private_variant
+  {
+    //***************************************************************************
+    /// C++20 compatible visitor function for testing variant '<=>'.
+    /// Assumes that the two variants are already known to contain the same type.
+    //***************************************************************************
+    template <typename TVariant>
+    struct compare_visitor
+    {
+      compare_visitor(const TVariant& rhs_)
+        : rhs(rhs_)
+      {
+      }
+
+      template <typename TValue>
+      std::strong_ordering operator()(const TValue& lhs_downcasted)
+      {
+        return lhs_downcasted <=> etl::get<TValue>(rhs);
+      }
+
+      const TVariant& rhs;
+    };
+  }
+
   //***************************************************************************
-  /// Checks if the lhs variant is greater than or equal to rhs.
+  /// Defines the 'spaceship' <=> operator for comparing variants.
   /// Only defined if using C++20 and STL.
   /// https://en.cppreference.com/w/cpp/utility/variant/operator_cmp
   //***************************************************************************
@@ -1969,10 +2032,10 @@ namespace etl
     }
     else
     {
-      return etl::visit([&](auto const& lhs_downcasted)
-        {
-          return lhs_downcasted <=> etl::get<decltype(lhs_downcasted)>(rhs);
-        }, lhs);
+      // Variants have the same type, apply the equality operator for the contained values
+      private_variant::compare_visitor<etl::variant<TTypes...>> visitor(rhs);
+
+      return etl::visit(visitor, lhs);
     }
   }
 #endif
diff --git a/test/test_variant_variadic.cpp b/test/test_variant_variadic.cpp
index c6fbcb7c..9d334a91 100644
--- a/test/test_variant_variadic.cpp
+++ b/test/test_variant_variadic.cpp
@@ -169,6 +169,7 @@ namespace
     return os;
   }
 
+#if ETL_USING_CPP20 && ETL_USING_STL
   std::ostream& operator <<(std::ostream& os, std::strong_ordering ordering)
   {
     if (ordering == std::strong_ordering::equal)
@@ -190,6 +191,7 @@ namespace
 
     return os;
   }
+#endif
 
   typedef etl::variant<etl::monostate, D1, D2, D3, D4> test_variant_emplace;
 
@@ -1941,6 +1943,7 @@ namespace
     }
 #endif
 
+#if ETL_USING_CPP14
     //*************************************************************************
     TEST(test_variant_comparisons)
     {
@@ -1959,7 +1962,9 @@ namespace
       Variant v_world(std::string("world"));
 
       CHECK_TRUE(v_empty1 == v_empty2);
+      CHECK_TRUE(v_empty1 < v_char_a);
     }
+#endif
 
 #if ETL_USING_CPP20 && ETL_USING_STL
     //*************************************************************************
@@ -1994,7 +1999,7 @@ namespace
 #endif
 
     //*************************************************************************
-    TEST(test_variant_three_way_compare)
+    TEST(test_variant_three_way_compare_using_etl_compare_cmp)
     {
       using Variant = etl::variant<char, int>;
 
@@ -2007,18 +2012,20 @@ namespace
       Variant v_int_1(1);
       Variant v_int_2(2);
 
-      CHECK_EQUAL( 0, (etl::three_way_compare(v_empty1, v_empty2)));
-      
-      CHECK_EQUAL( 0, (etl::three_way_compare(v_char_a, v_char_a)));
-      CHECK_EQUAL(-1, (etl::three_way_compare(v_char_a, v_char_b)));
-      CHECK_EQUAL( 1, (etl::three_way_compare(v_char_b, v_char_a)));
-      
-      CHECK_EQUAL( 0, (etl::three_way_compare(v_int_1,  v_int_1)));
-      CHECK_EQUAL(-1, (etl::three_way_compare(v_int_1,  v_int_2)));
-      CHECK_EQUAL( 1, (etl::three_way_compare(v_int_2,  v_int_1)));
+      using Compare = etl::compare<Variant>;
 
-      CHECK_EQUAL(-1, (etl::three_way_compare(v_char_a, v_int_1)));
-      CHECK_EQUAL( 1, (etl::three_way_compare(v_int_1,  v_char_a)));
+      CHECK_EQUAL(Compare::Equal,   (Compare::cmp(v_empty1, v_empty2)));
+      
+      CHECK_EQUAL(Compare::Equal,   (Compare::cmp(v_char_a, v_char_a)));
+      CHECK_EQUAL(Compare::Less,    (Compare::cmp(v_char_a, v_char_b)));
+      CHECK_EQUAL(Compare::Greater, (Compare::cmp(v_char_b, v_char_a)));
+      
+      CHECK_EQUAL(Compare::Equal,   (Compare::cmp(v_int_1,  v_int_1)));
+      CHECK_EQUAL(Compare::Less,    (Compare::cmp(v_int_1,  v_int_2)));
+      CHECK_EQUAL(Compare::Greater, (Compare::cmp(v_int_2,  v_int_1)));
+
+      CHECK_EQUAL(Compare::Less,    (Compare::cmp(v_char_a, v_int_1)));
+      CHECK_EQUAL(Compare::Greater, (Compare::cmp(v_int_1,  v_char_a)));
     }
   };
 }

From 309154d0cef9a1ea9a17068376d0341156db8b29 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 30 Mar 2024 08:47:54 +0000
Subject: [PATCH 113/131] Added diagnostic_null_dereference_push.h

---
 .../diagnostic_null_dereference_push.h        | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 include/etl/private/diagnostic_null_dereference_push.h

diff --git a/include/etl/private/diagnostic_null_dereference_push.h b/include/etl/private/diagnostic_null_dereference_push.h
new file mode 100644
index 00000000..3f48168c
--- /dev/null
+++ b/include/etl/private/diagnostic_null_dereference_push.h
@@ -0,0 +1,44 @@
+///\file
+
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+https://github.com/ETLCPP/etl
+https://www.etlcpp.com
+
+Copyright(c) 2024 John Wellbelove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+******************************************************************************/
+
+/*
+ * The header include guard has been intentionally omitted.
+ * This file is intended to evaluated multiple times by design.
+ */
+
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__)
+  #pragma GCC diagnostic push 
+  #pragma GCC diagnostic ignored "-Wnull-dereference"
+#endif
+
+#if defined(__clang__) || defined(__llvm__)
+  #pragma clang diagnostic push 
+  #pragma clang diagnostic ignored "-Wnull-dereference"
+#endif

From 96846f9b57622a31b7378037ed5fdb2e95a5004d Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 1 Apr 2024 16:57:46 +0100
Subject: [PATCH 114/131] Removed 'possible nullptr' warning.

---
 include/etl/intrusive_forward_list.h |  2 +
 include/etl/intrusive_list.h         |  2 +
 include/etl/map.h                    | 32 +++++++--------
 include/etl/multimap.h               | 16 ++++----
 include/etl/multiset.h               | 16 ++++----
 include/etl/set.h                    | 16 ++++----
 include/etl/unordered_map.h          | 56 +++++++++++++-------------
 include/etl/unordered_multimap.h     | 36 ++++++++---------
 include/etl/unordered_multiset.h     | 36 ++++++++---------
 include/etl/unordered_set.h          | 36 ++++++++---------
 test/test_forward_list.cpp           |  9 +++--
 test/test_map.cpp                    |  2 +
 test/test_multimap.cpp               | 59 +++++++++++++++++++++++-----
 test/test_multiset.cpp               | 42 +++++++++++++++-----
 test/test_set.cpp                    |  9 ++++-
 15 files changed, 225 insertions(+), 144 deletions(-)

diff --git a/include/etl/intrusive_forward_list.h b/include/etl/intrusive_forward_list.h
index 665d42e2..60de1db2 100644
--- a/include/etl/intrusive_forward_list.h
+++ b/include/etl/intrusive_forward_list.h
@@ -404,7 +404,9 @@ namespace etl
 
       reference operator *() const
       {
+#include "etl/private/diagnostic_null_dereference_push.h"
         return *static_cast<pointer>(p_value);
+#include "etl/private/diagnostic_pop.h"
       }
 
       pointer operator &() const
diff --git a/include/etl/intrusive_list.h b/include/etl/intrusive_list.h
index 4a48f83e..826c9825 100644
--- a/include/etl/intrusive_list.h
+++ b/include/etl/intrusive_list.h
@@ -458,7 +458,9 @@ namespace etl
 
       reference operator *() const
       {
+#include "etl/private/diagnostic_null_dereference_push.h"
         return *static_cast<pointer>(p_value);
+#include "etl/private/diagnostic_pop.h"
       }
 
       pointer operator &() const
diff --git a/include/etl/map.h b/include/etl/map.h
index ce81317d..88449df9 100644
--- a/include/etl/map.h
+++ b/include/etl/map.h
@@ -1496,10 +1496,10 @@ namespace etl
     //*************************************************************************
     Data_Node& allocate_data_node(const_reference value)
     {
-      Data_Node& node = allocate_data_node();
-      ::new (&node.value) value_type(value);
+      Data_Node* node = allocate_data_node();
+      ::new (&node->value) value_type(value);
       ETL_INCREMENT_DEBUG_COUNT;
-      return node;
+      return *node;
     }
 
     //*************************************************************************
@@ -1507,12 +1507,12 @@ namespace etl
     //*************************************************************************
     Data_Node& allocate_data_node_with_key(const_key_reference key)
     {
-      Data_Node& node = allocate_data_node();
+      Data_Node* node = allocate_data_node();
 
-      ::new ((void*)etl::addressof(node.value.first))  key_type(key);
-      ::new ((void*)etl::addressof(node.value.second)) mapped_type();
+      ::new ((void*)etl::addressof(node->value.first))  key_type(key);
+      ::new ((void*)etl::addressof(node->value.second)) mapped_type();
       ETL_INCREMENT_DEBUG_COUNT;
-      return node;
+      return *node;
     }
 
 #if ETL_USING_CPP11
@@ -1521,10 +1521,10 @@ namespace etl
     //*************************************************************************
     Data_Node& allocate_data_node(rvalue_reference value)
     {
-      Data_Node& node = allocate_data_node();
-      ::new (&node.value) value_type(etl::move(value));
+      Data_Node* node = allocate_data_node();
+      ::new (&node->value) value_type(etl::move(value));
       ETL_INCREMENT_DEBUG_COUNT;
-      return node;
+      return *node;
     }
 
     //*************************************************************************
@@ -1532,12 +1532,12 @@ namespace etl
     //*************************************************************************
     Data_Node& allocate_data_node_with_key(rvalue_key_reference key)
     {
-      Data_Node& node = allocate_data_node();
+      Data_Node* node = allocate_data_node();
 
-      ::new ((void*)etl::addressof(node.value.first))  key_type(etl::move(key));
-      ::new ((void*)etl::addressof(node.value.second)) mapped_type();
+      ::new ((void*)etl::addressof(node->value.first))  key_type(etl::move(key));
+      ::new ((void*)etl::addressof(node->value.second)) mapped_type();
       ETL_INCREMENT_DEBUG_COUNT;
-      return node;
+      return *node;
     }
 
 #endif
@@ -1545,10 +1545,10 @@ namespace etl
     //*************************************************************************
     /// Create a Data_Node.
     //*************************************************************************
-    Data_Node& allocate_data_node()
+    Data_Node* allocate_data_node()
     {
       Data_Node* (etl::ipool::*func)() = &etl::ipool::allocate<Data_Node>;
-      return *(p_node_pool->*func)();
+      return (p_node_pool->*func)();
     }
 
     //*************************************************************************
diff --git a/include/etl/multimap.h b/include/etl/multimap.h
index a6411cc3..6d9dfa6f 100644
--- a/include/etl/multimap.h
+++ b/include/etl/multimap.h
@@ -1542,10 +1542,10 @@ namespace etl
     //*************************************************************************
     Data_Node& allocate_data_node(const_reference value)
     {
-      Data_Node& node = allocate_data_node();
-      ::new (&node.value) const value_type(value);
+      Data_Node* node = allocate_data_node();
+      ::new (&node->value) const value_type(value);
       ETL_INCREMENT_DEBUG_COUNT;
-      return node;
+      return *node;
     }
 
 #if ETL_USING_CPP11
@@ -1554,20 +1554,20 @@ namespace etl
     //*************************************************************************
     Data_Node& allocate_data_node(rvalue_reference value)
     {
-      Data_Node& node = allocate_data_node();
-      ::new (&node.value) const value_type(etl::move(value));
+      Data_Node* node = allocate_data_node();
+      ::new (&node->value) const value_type(etl::move(value));
       ETL_INCREMENT_DEBUG_COUNT;
-      return node;
+      return *node;
     }
 #endif
 
     //*************************************************************************
     /// Create a Data_Node.
     //*************************************************************************
-    Data_Node& allocate_data_node()
+    Data_Node* allocate_data_node()
     {
       Data_Node* (etl::ipool::*func)() = &etl::ipool::allocate<Data_Node>;
-      return *(p_node_pool->*func)();
+      return (p_node_pool->*func)();
     }
 
     //*************************************************************************
diff --git a/include/etl/multiset.h b/include/etl/multiset.h
index d2c35f68..596c31d6 100644
--- a/include/etl/multiset.h
+++ b/include/etl/multiset.h
@@ -1530,10 +1530,10 @@ namespace etl
     //*************************************************************************
     Data_Node& allocate_data_node(const_reference value)
     {
-      Data_Node& node = allocate_data_node();
-      ::new ((void*)&node.value) value_type(value);
+      Data_Node* node = allocate_data_node();
+      ::new ((void*)&node->value) value_type(value);
       ETL_INCREMENT_DEBUG_COUNT;
-      return node;
+      return *node;
     }
 
 #if ETL_USING_CPP11
@@ -1542,20 +1542,20 @@ namespace etl
     //*************************************************************************
     Data_Node& allocate_data_node(rvalue_reference value)
     {
-      Data_Node& node = allocate_data_node();
-      ::new ((void*)&node.value) value_type(etl::move(value));
+      Data_Node* node = allocate_data_node();
+      ::new ((void*)&node->value) value_type(etl::move(value));
       ETL_INCREMENT_DEBUG_COUNT;
-      return node;
+      return *node;
     }
 #endif
 
     //*************************************************************************
     /// Create a Data_Node.
     //*************************************************************************
-    Data_Node& allocate_data_node()
+    Data_Node* allocate_data_node()
     {
       Data_Node* (etl::ipool::*func)() = &etl::ipool::allocate<Data_Node>;
-      return *(p_node_pool->*func)();
+      return (p_node_pool->*func)();
     }
 
     //*************************************************************************
diff --git a/include/etl/set.h b/include/etl/set.h
index b3babaa2..6dac5d54 100644
--- a/include/etl/set.h
+++ b/include/etl/set.h
@@ -1407,10 +1407,10 @@ namespace etl
     //*************************************************************************
     Data_Node& allocate_data_node(const_reference value)
     {
-      Data_Node& node = allocate_data_node();
-      ::new ((void*)&node.value) value_type(value);
+      Data_Node* node = allocate_data_node();
+      ::new ((void*)&node->value) value_type(value);
       ETL_INCREMENT_DEBUG_COUNT;
-      return node;
+      return *node;
     }
 
 #if ETL_USING_CPP11
@@ -1419,20 +1419,20 @@ namespace etl
     //*************************************************************************
     Data_Node& allocate_data_node(rvalue_reference value)
     {
-      Data_Node& node = allocate_data_node();
-      ::new ((void*)&node.value) value_type(etl::move(value));
+      Data_Node* node = allocate_data_node();
+      ::new ((void*)&node->value) value_type(etl::move(value));
       ETL_INCREMENT_DEBUG_COUNT;
-      return node;
+      return *node;
     }
 #endif
 
     //*************************************************************************
     /// Create a Data_Node.
     //*************************************************************************
-    Data_Node& allocate_data_node()
+    Data_Node* allocate_data_node()
     {
       Data_Node* (etl::ipool::*func)() = &etl::ipool::allocate<Data_Node>;
-      return *(p_node_pool->*func)();
+      return (p_node_pool->*func)();
     }
 
     //*************************************************************************
diff --git a/include/etl/unordered_map.h b/include/etl/unordered_map.h
index 417d95a0..fab74e86 100644
--- a/include/etl/unordered_map.h
+++ b/include/etl/unordered_map.h
@@ -659,13 +659,13 @@ namespace etl
 
       // Doesn't exist, so add a new one.
       // Get a new node.
-      node_t& node = allocate_data_node();
-      node.clear();
-      ::new ((void*)etl::addressof(node.key_value_pair.first))  key_type(etl::move(key));
-      ::new ((void*)etl::addressof(node.key_value_pair.second)) mapped_type();
+      node_t* node = allocate_data_node();
+      node->clear();
+      ::new ((void*)etl::addressof(node->key_value_pair.first))  key_type(etl::move(key));
+      ::new ((void*)etl::addressof(node->key_value_pair.second)) mapped_type();
       ETL_INCREMENT_DEBUG_COUNT;
 
-      pbucket->insert_after(pbucket->before_begin(), node);
+      pbucket->insert_after(pbucket->before_begin(), *node);
 
       adjust_first_last_markers_after_insert(pbucket);
 
@@ -703,13 +703,13 @@ namespace etl
 
       // Doesn't exist, so add a new one.
       // Get a new node.
-      node_t& node = allocate_data_node();
-      node.clear();
-      ::new ((void*)etl::addressof(node.key_value_pair.first))  key_type(key);
-      ::new ((void*)etl::addressof(node.key_value_pair.second)) mapped_type();
+      node_t* node = allocate_data_node();
+      node->clear();
+      ::new ((void*)etl::addressof(node->key_value_pair.first))  key_type(key);
+      ::new ((void*)etl::addressof(node->key_value_pair.second)) mapped_type();
       ETL_INCREMENT_DEBUG_COUNT;
 
-        pbucket->insert_after(pbucket->before_begin(), node);
+        pbucket->insert_after(pbucket->before_begin(), *node);
 
       adjust_first_last_markers_after_insert(pbucket);
 
@@ -835,13 +835,13 @@ namespace etl
       if (bucket.empty())
       {
         // Get a new node.
-        node_t& node = allocate_data_node();
-        node.clear();
-        ::new ((void*)etl::addressof(node.key_value_pair)) value_type(key_value_pair);        
+        node_t* node = allocate_data_node();
+        node->clear();
+        ::new ((void*)etl::addressof(node->key_value_pair)) value_type(key_value_pair);        
         ETL_INCREMENT_DEBUG_COUNT;
 
         // Just add the pointer to the bucket;
-        bucket.insert_after(bucket.before_begin(), node);
+        bucket.insert_after(bucket.before_begin(), *node);
 
         adjust_first_last_markers_after_insert(pbucket);
 
@@ -870,13 +870,13 @@ namespace etl
         if (inode == bucket.end())
         {
           // Get a new node.
-          node_t& node = allocate_data_node();
-          node.clear();
-          ::new ((void*)etl::addressof(node.key_value_pair)) value_type(key_value_pair);
+          node_t* node = allocate_data_node();
+          node->clear();
+          ::new ((void*)etl::addressof(node->key_value_pair)) value_type(key_value_pair);
           ETL_INCREMENT_DEBUG_COUNT;
 
           // Add the node to the end of the bucket;
-          bucket.insert_after(inode_previous, node);
+          bucket.insert_after(inode_previous, *node);
           adjust_first_last_markers_after_insert(&bucket);
           ++inode_previous;
 
@@ -913,13 +913,13 @@ namespace etl
       if (bucket.empty())
       {
         // Get a new node.
-        node_t& node = allocate_data_node();
-        node.clear();
-        ::new ((void*)etl::addressof(node.key_value_pair)) value_type(etl::move(key_value_pair));
+        node_t* node = allocate_data_node();
+        node->clear();
+        ::new ((void*)etl::addressof(node->key_value_pair)) value_type(etl::move(key_value_pair));
         ETL_INCREMENT_DEBUG_COUNT;
 
         // Just add the pointer to the bucket;
-        bucket.insert_after(bucket.before_begin(), node);
+        bucket.insert_after(bucket.before_begin(), *node);
 
         adjust_first_last_markers_after_insert(pbucket);
 
@@ -948,13 +948,13 @@ namespace etl
         if (inode == bucket.end())
         {
           // Get a new node.
-          node_t& node = allocate_data_node();
-          node.clear();
-          ::new ((void*)etl::addressof(node.key_value_pair)) value_type(etl::move(key_value_pair));
+          node_t* node = allocate_data_node();
+          node->clear();
+          ::new ((void*)etl::addressof(node->key_value_pair)) value_type(etl::move(key_value_pair));
           ETL_INCREMENT_DEBUG_COUNT;
 
           // Add the node to the end of the bucket;
-          bucket.insert_after(inode_previous, node);
+          bucket.insert_after(inode_previous, *node);
           adjust_first_last_markers_after_insert(&bucket);
           ++inode_previous;
 
@@ -1437,10 +1437,10 @@ namespace etl
     //*************************************************************************
     /// Create a node.
     //*************************************************************************
-    node_t& allocate_data_node()
+    node_t* allocate_data_node()
     {
       node_t* (etl::ipool::*func)() = &etl::ipool::allocate<node_t>;
-      return *(pnodepool->*func)();
+      return (pnodepool->*func)();
     }
 
     //*********************************************************************
diff --git a/include/etl/unordered_multimap.h b/include/etl/unordered_multimap.h
index 79705360..53d9f43f 100644
--- a/include/etl/unordered_multimap.h
+++ b/include/etl/unordered_multimap.h
@@ -675,13 +675,13 @@ namespace etl
       if (bucket.empty())
       {
         // Get a new node.
-        node_t& node = allocate_data_node();
-        node.clear();
-        ::new (&node.key_value_pair) value_type(key_value_pair);
+        node_t* node = allocate_data_node();
+        node->clear();
+        ::new (&node->key_value_pair) value_type(key_value_pair);
         ETL_INCREMENT_DEBUG_COUNT;
 
         // Just add the pointer to the bucket;
-        bucket.insert_after(bucket.before_begin(), node);
+        bucket.insert_after(bucket.before_begin(), *node);
         adjust_first_last_markers_after_insert(pbucket);
 
         result = iterator((pbuckets + number_of_buckets), pbucket, pbucket->begin());
@@ -705,13 +705,13 @@ namespace etl
         }
 
         // Get a new node.
-        node_t& node = allocate_data_node();
-        node.clear();
-        ::new (&node.key_value_pair) value_type(key_value_pair);
+        node_t* node = allocate_data_node();
+        node->clear();
+        ::new (&node->key_value_pair) value_type(key_value_pair);
         ETL_INCREMENT_DEBUG_COUNT;
 
         // Add the node to the end of the bucket;
-        bucket.insert_after(inode_previous, node);
+        bucket.insert_after(inode_previous, *node);
         adjust_first_last_markers_after_insert(&bucket);
         ++inode_previous;
 
@@ -746,13 +746,13 @@ namespace etl
       if (bucket.empty())
       {
         // Get a new node.
-        node_t& node = allocate_data_node();
-        node.clear();
-        ::new (&node.key_value_pair) value_type(etl::move(key_value_pair));
+        node_t* node = allocate_data_node();
+        node->clear();
+        ::new (&node->key_value_pair) value_type(etl::move(key_value_pair));
         ETL_INCREMENT_DEBUG_COUNT;
 
           // Just add the pointer to the bucket;
-          bucket.insert_after(bucket.before_begin(), node);
+          bucket.insert_after(bucket.before_begin(), *node);
         adjust_first_last_markers_after_insert(pbucket);
 
         result = iterator((pbuckets + number_of_buckets), pbucket, pbucket->begin());
@@ -776,13 +776,13 @@ namespace etl
         }
 
         // Get a new node.
-        node_t& node = allocate_data_node();
-        node.clear();
-        ::new (&node.key_value_pair) value_type(etl::move(key_value_pair));
+        node_t* node = allocate_data_node();
+        node->clear();
+        ::new (&node->key_value_pair) value_type(etl::move(key_value_pair));
         ETL_INCREMENT_DEBUG_COUNT;
 
           // Add the node to the end of the bucket;
-          bucket.insert_after(inode_previous, node);
+          bucket.insert_after(inode_previous, *node);
         adjust_first_last_markers_after_insert(&bucket);
         ++inode_previous;
 
@@ -1291,10 +1291,10 @@ namespace etl
     //*************************************************************************
     /// Create a node.
     //*************************************************************************
-    node_t& allocate_data_node()
+    node_t* allocate_data_node()
     {
       node_t* (etl::ipool::*func)() = &etl::ipool::allocate<node_t>;
-      return *(pnodepool->*func)();
+      return (pnodepool->*func)();
     }
 
     //*********************************************************************
diff --git a/include/etl/unordered_multiset.h b/include/etl/unordered_multiset.h
index 66b67a54..a24eb3ff 100644
--- a/include/etl/unordered_multiset.h
+++ b/include/etl/unordered_multiset.h
@@ -664,13 +664,13 @@ namespace etl
       if (bucket.empty())
       {
         // Get a new node.
-        node_t& node = allocate_data_node();
-        node.clear();
-        ::new (&node.key) value_type(key);
+        node_t* node = allocate_data_node();
+        node->clear();
+        ::new (&node->key) value_type(key);
         ETL_INCREMENT_DEBUG_COUNT;
 
         // Just add the pointer to the bucket;
-        bucket.insert_after(bucket.before_begin(), node);
+        bucket.insert_after(bucket.before_begin(), *node);
         adjust_first_last_markers_after_insert(&bucket);
 
         result.first = iterator((pbuckets + number_of_buckets), pbucket, pbucket->begin());
@@ -695,13 +695,13 @@ namespace etl
         }
 
         // Get a new node.
-        node_t& node = allocate_data_node();
-        node.clear();
-        ::new (&node.key) value_type(key);
+        node_t* node = allocate_data_node();
+        node->clear();
+        ::new (&node->key) value_type(key);
         ETL_INCREMENT_DEBUG_COUNT;
 
         // Add the node to the end of the bucket;
-        bucket.insert_after(inode_previous, node);
+        bucket.insert_after(inode_previous, *node);
         adjust_first_last_markers_after_insert(&bucket);
         ++inode_previous;
 
@@ -735,13 +735,13 @@ namespace etl
       if (bucket.empty())
       {
         // Get a new node.
-        node_t& node = allocate_data_node();
-        node.clear();
-        ::new (&node.key) value_type(etl::move(key));
+        node_t* node = allocate_data_node();
+        node->clear();
+        ::new (&node->key) value_type(etl::move(key));
         ETL_INCREMENT_DEBUG_COUNT;
 
         // Just add the pointer to the bucket;
-        bucket.insert_after(bucket.before_begin(), node);
+        bucket.insert_after(bucket.before_begin(), *node);
         adjust_first_last_markers_after_insert(&bucket);
 
         result.first = iterator((pbuckets + number_of_buckets), pbucket, pbucket->begin());
@@ -766,13 +766,13 @@ namespace etl
         }
 
         // Get a new node.
-        node_t& node = allocate_data_node();
-        node.clear();
-        ::new (&node.key) value_type(etl::move(key));
+        node_t* node = allocate_data_node();
+        node->clear();
+        ::new (&node->key) value_type(etl::move(key));
         ETL_INCREMENT_DEBUG_COUNT;
 
           // Add the node to the end of the bucket;
-          bucket.insert_after(inode_previous, node);
+          bucket.insert_after(inode_previous, *node);
         adjust_first_last_markers_after_insert(&bucket);
         ++inode_previous;
 
@@ -1269,10 +1269,10 @@ namespace etl
     //*************************************************************************
     /// Create a node.
     //*************************************************************************
-    node_t& allocate_data_node()
+    node_t* allocate_data_node()
     {
       node_t* (etl::ipool::*func)() = &etl::ipool::allocate<node_t>;
-      return *(pnodepool->*func)();
+      return (pnodepool->*func)();
     }
 
     //*********************************************************************
diff --git a/include/etl/unordered_set.h b/include/etl/unordered_set.h
index aad0ca5e..28e6360d 100644
--- a/include/etl/unordered_set.h
+++ b/include/etl/unordered_set.h
@@ -678,13 +678,13 @@ namespace etl
       if (bucket.empty())
       {
         // Get a new node.
-        node_t& node = allocate_data_node();
-        node.clear();
-        ::new (&node.key) value_type(key);
+        node_t* node = allocate_data_node();
+        node->clear();
+        ::new (&node->key) value_type(key);
         ETL_INCREMENT_DEBUG_COUNT;
 
         // Just add the pointer to the bucket;
-        bucket.insert_after(bucket.before_begin(), node);
+        bucket.insert_after(bucket.before_begin(), *node);
         adjust_first_last_markers_after_insert(&bucket);
 
         result.first = iterator(pbuckets + number_of_buckets, pbucket, pbucket->begin());
@@ -712,13 +712,13 @@ namespace etl
         if (inode == bucket.end())
         {
           // Get a new node.
-          node_t& node = allocate_data_node();
-          node.clear();
-          ::new (&node.key) value_type(key);
+          node_t* node = allocate_data_node();
+          node->clear();
+          ::new (&node->key) value_type(key);
           ETL_INCREMENT_DEBUG_COUNT;
 
           // Add the node to the end of the bucket;
-          bucket.insert_after(inode_previous, node);
+          bucket.insert_after(inode_previous, *node);
           adjust_first_last_markers_after_insert(&bucket);
           ++inode_previous;
 
@@ -766,13 +766,13 @@ namespace etl
       if (bucket.empty())
       {
         // Get a new node.
-        node_t& node = allocate_data_node();
-        node.clear();
-        ::new (&node.key) value_type(etl::move(key));
+        node_t* node = allocate_data_node();
+        node->clear();
+        ::new (&node->key) value_type(etl::move(key));
         ETL_INCREMENT_DEBUG_COUNT;
 
           // Just add the pointer to the bucket;
-          bucket.insert_after(bucket.before_begin(), node);
+          bucket.insert_after(bucket.before_begin(), *node);
         adjust_first_last_markers_after_insert(&bucket);
 
         result.first = iterator(pbuckets + number_of_buckets, pbucket, pbucket->begin());
@@ -800,13 +800,13 @@ namespace etl
         if (inode == bucket.end())
         {
           // Get a new node.
-          node_t& node = allocate_data_node();
-          node.clear();
-          ::new (&node.key) value_type(etl::move(key));
+          node_t* node = allocate_data_node();
+          node->clear();
+          ::new (&node->key) value_type(etl::move(key));
           ETL_INCREMENT_DEBUG_COUNT;
 
             // Add the node to the end of the bucket;
-            bucket.insert_after(inode_previous, node);
+            bucket.insert_after(inode_previous, *node);
           adjust_first_last_markers_after_insert(&bucket);
           ++inode_previous;
 
@@ -1295,10 +1295,10 @@ namespace etl
     //*************************************************************************
     /// Create a node.
     //*************************************************************************
-    node_t& allocate_data_node()
+    node_t* allocate_data_node()
     {
       node_t* (etl::ipool::*func)() = &etl::ipool::allocate<node_t>;
-      return *(pnodepool->*func)();
+      return (pnodepool->*func)();
     }
 
     //*********************************************************************
diff --git a/test/test_forward_list.cpp b/test/test_forward_list.cpp
index 3c23aa0b..4f46eefe 100644
--- a/test/test_forward_list.cpp
+++ b/test/test_forward_list.cpp
@@ -1000,10 +1000,13 @@ namespace
       compare_data.unique();
       data.unique();
 
-      CHECK_EQUAL(size_t(std::distance(compare_data.begin(), compare_data.end())), data.size());
+      if ((compare_data.begin() != compare_data.end()) && (data.begin() != data.end()))
+      {
+        CHECK_EQUAL(size_t(std::distance(compare_data.begin(), compare_data.end())), data.size());
 
-      are_equal = std::equal(data.begin(), data.end(), compare_data.begin());
-      CHECK(are_equal);
+        are_equal = std::equal(data.begin(), data.end(), compare_data.begin());
+        CHECK(are_equal);
+      }
     }
 
     //*************************************************************************
diff --git a/test/test_map.cpp b/test/test_map.cpp
index ee6f0eae..bd8817ce 100644
--- a/test/test_map.cpp
+++ b/test/test_map.cpp
@@ -86,6 +86,7 @@ namespace
   SUITE(test_map)
   {
     //*************************************************************************
+#include "etl/private/diagnostic_null_dereference_push.h"
     template <typename T1, typename T2>
     bool Check_Equal(T1 begin1, T1 end1, T2 begin2)
     {
@@ -102,6 +103,7 @@ namespace
 
       return true;
     }
+#include "etl/private/diagnostic_pop.h"
 
     //*************************************************************************
     struct SetupFixture
diff --git a/test/test_multimap.cpp b/test/test_multimap.cpp
index 90410fca..a6a29e03 100644
--- a/test/test_multimap.cpp
+++ b/test/test_multimap.cpp
@@ -86,6 +86,7 @@ namespace
   SUITE(test_multimap)
   {
     //*************************************************************************
+#include "etl/private/diagnostic_null_dereference_push.h"
     template <typename T1, typename T2>
     bool Check_Equal(T1 begin1, T1 end1, T2 begin2)
     {
@@ -102,6 +103,7 @@ namespace
 
       return true;
     }
+#include "etl/private/diagnostic_null_dereference_push.h"
 
     //*************************************************************************
     struct SetupFixture
@@ -276,10 +278,28 @@ namespace
 
       CHECK(!data1.empty()); // Move does not clear the source.
 
-      CHECK(1 == data2.find("1")->second.value);
-      CHECK(2 == data2.find("2")->second.value);
-      CHECK(3 == data2.find("3")->second.value);
-      CHECK(4 == data2.find("4")->second.value);
+      DataM::iterator itr;
+      int result;
+
+      itr = data2.find("1");
+      CHECK(itr != data2.end());
+      result = itr->second.value;
+      CHECK_EQUAL(1, result);
+
+      itr = data2.find("2");
+      CHECK(itr != data2.end());
+      result = itr->second.value;
+      CHECK_EQUAL(2, result);
+
+      itr = data2.find("3");
+      CHECK(itr != data2.end());
+      result = itr->second.value;
+      CHECK_EQUAL(3, result);
+
+      itr = data2.find("4");
+      CHECK(itr != data2.end());
+      result = itr->second.value;
+      CHECK_EQUAL(4, result);
     }
 
     //*************************************************************************
@@ -391,10 +411,28 @@ namespace
       data2.insert(DataM::value_type(std::string("5"), ItemM(5)));
       data2 = std::move(data1);
 
-      CHECK(1 == data2.find("1")->second.value);
-      CHECK(2 == data2.find("2")->second.value);
-      CHECK(3 == data2.find("3")->second.value);
-      CHECK(4 == data2.find("4")->second.value);
+      DataM::iterator itr;
+      int result;
+
+      itr = data2.find("1");
+      CHECK(itr != data2.end());
+      result = itr->second.value;
+      CHECK_EQUAL(1, result);
+
+      itr = data2.find("2");
+      CHECK(itr != data2.end());
+      result = itr->second.value;
+      CHECK_EQUAL(2, result);
+
+      itr = data2.find("3");
+      CHECK(itr != data2.end());
+      result = itr->second.value;
+      CHECK_EQUAL(3, result);
+
+      itr = data2.find("4");
+      CHECK(itr != data2.end());
+      result = itr->second.value;
+      CHECK_EQUAL(4, result);
     }
 
     //*************************************************************************
@@ -1577,7 +1615,10 @@ namespace
           break;
         }
 
-        prv = pos->first;
+        if (pos != data.crend())
+        {
+          prv = pos->first;
+        }
       }
 
       CHECK(pass);
diff --git a/test/test_multiset.cpp b/test/test_multiset.cpp
index 4a9fab01..cb64956c 100644
--- a/test/test_multiset.cpp
+++ b/test/test_multiset.cpp
@@ -101,6 +101,7 @@ namespace
   SUITE(test_multiset)
   {
     //*************************************************************************
+#include "etl/private/diagnostic_null_dereference_push.h"
     template <typename T1, typename T2>
     bool Check_Equal(T1 begin1, T1 end1, T2 begin2)
     {
@@ -117,6 +118,7 @@ namespace
 
       return true;
     }
+#include "etl/private/diagnostic_pop.h"
 
     //*************************************************************************
     struct SetupFixture
@@ -1157,7 +1159,12 @@ namespace
 
       i_compare = compare_data.lower_bound(99);
       i_data = data.lower_bound(99);
-      CHECK(*i_compare == *i_data);
+      CHECK(i_data != data.end());
+      
+      if ((i_data != data.end()) && (i_compare != compare_data.end()))
+      {
+        CHECK(*i_compare == *i_data);
+      }
 #else
       i_compare = compare_data.lower_bound(-1);
       i_data = data.lower_bound(-1);
@@ -1214,7 +1221,12 @@ namespace
 
       i_compare = compare_data.lower_bound(99);
       i_data = data.lower_bound(99);
-      CHECK(*i_compare == *i_data);
+      CHECK(i_data != data.end());
+
+      if ((i_data != data.end()) && (i_compare != compare_data.end()))
+      {
+        CHECK(*i_compare == *i_data);
+      }
 #else
       i_compare = compare_data.lower_bound(-1);
       i_data = data.lower_bound(-1);
@@ -1271,7 +1283,12 @@ namespace
 
       i_compare = compare_data.upper_bound(99);
       i_data = data.upper_bound(99);
-      CHECK(*i_compare == *i_data);
+      CHECK(i_data != data.end());
+
+      if ((i_data != data.end()) && (i_compare != compare_data.end()))
+      {
+        CHECK(*i_compare == *i_data);
+      }
 #else
       i_compare = compare_data.upper_bound(-1);
       i_data = data.upper_bound(-1);
@@ -1328,7 +1345,12 @@ namespace
 
       i_compare = compare_data.upper_bound(99);
       i_data = data.upper_bound(99);
-      CHECK(*i_compare == *i_data);
+      CHECK(i_data != data.end());
+
+      if ((i_data != data.end()) && (i_compare != compare_data.end()))
+      {
+        CHECK(*i_compare == *i_data);
+      }
 #else
       i_compare = compare_data.upper_bound(-1);
       i_data = data.upper_bound(-1);
@@ -1444,7 +1466,7 @@ namespace
             if((compare.lower_bound(i) == compare.end()) == (data.lower_bound(i) == data.end()))
             {
                 //if both are not end
-                if(compare.lower_bound(i) != compare.end())
+                if ((data.lower_bound(i) != data.end()) && (compare.lower_bound(i) != compare.end()))
                 {
                     CHECK((*compare.lower_bound(i)) == (*data.lower_bound(i)));
                 }
@@ -1467,10 +1489,10 @@ namespace
             //upper_bound
             CHECK_EQUAL(compare.upper_bound(i) == compare.end(), data.upper_bound(i) == data.end());
             //if both end, or none
-            if((compare.upper_bound(i) == compare.end()) == (data.upper_bound(i) == data.end()))
+            if ((compare.upper_bound(i) == compare.end()) == (data.upper_bound(i) == data.end()))
             {
                 //if both are not end
-                if(compare.upper_bound(i) != compare.end())
+                if ((data.upper_bound(i) != data.end()) && (compare.upper_bound(i) != compare.end()))
                 {
                     CHECK((*compare.upper_bound(i)) == (*data.upper_bound(i)));
                 }
@@ -1506,7 +1528,7 @@ namespace
         if ((compare.lower_bound(i) == compare.end()) == (data.lower_bound(i) == data.end()))
         {
           //if both are not end
-          if (compare.lower_bound(i) != compare.end())
+          if ((data.lower_bound(i) != data.end()) && (compare.lower_bound(i) != compare.end()))
           {
             CHECK((*compare.lower_bound(i)) == (*data.lower_bound(i)));
           }
@@ -1532,7 +1554,7 @@ namespace
         if ((compare.upper_bound(i) == compare.end()) == (data.upper_bound(i) == data.end()))
         {
           //if both are not end
-          if (compare.upper_bound(i) != compare.end())
+          if ((data.upper_bound(i) != data.end()) && (compare.upper_bound(i) != compare.end()))
           {
             CHECK((*compare.upper_bound(i)) == (*data.upper_bound(i)));
           }
@@ -1563,6 +1585,7 @@ namespace
 
       for (pos = data.crbegin(); pos != data.crend(); ++pos)
       {
+#include "etl/private/diagnostic_null_dereference_push.h"
         if (*pos > prv)
         {
           pass = false;
@@ -1570,6 +1593,7 @@ namespace
         }
 
         prv = *pos;
+#include "etl/private/diagnostic_pop.h"
       }
 
       CHECK(pass);
diff --git a/test/test_set.cpp b/test/test_set.cpp
index ae177f19..a8d93776 100644
--- a/test/test_set.cpp
+++ b/test/test_set.cpp
@@ -106,6 +106,7 @@ namespace
   SUITE(test_set)
   {
     //*************************************************************************
+#include "etl/private/diagnostic_null_dereference_push.h"
     template <typename T1, typename T2>
     bool Check_Equal(T1 begin1, T1 end1, T2 begin2)
     {
@@ -122,6 +123,7 @@ namespace
 
       return true;
     }
+#include "etl/private/diagnostic_pop.h"
 
     //*************************************************************************
     struct SetupFixture
@@ -1031,7 +1033,12 @@ namespace
 
       i_compare = compare_data.lower_bound(11);
       i_data = data.lower_bound(11);
-      CHECK(*i_compare == *i_data);
+      CHECK(i_data != data.end());
+
+      if ((i_data != data.end()) && (i_compare != compare_data.end()))
+      {
+        CHECK(*i_compare == *i_data);
+      }
 #else
       i_compare = compare_data.lower_bound(-1);
       i_data = data.lower_bound(-1);

From 19c59feba7128d93dd5fb90af328fe3516343da4 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 1 Apr 2024 17:13:24 +0100
Subject: [PATCH 115/131] Minor comment change

---
 test/test_variant_legacy.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_variant_legacy.cpp b/test/test_variant_legacy.cpp
index afd36fa7..4e53473b 100644
--- a/test/test_variant_legacy.cpp
+++ b/test/test_variant_legacy.cpp
@@ -912,7 +912,7 @@ namespace
     {
       test_variant_3 variant;
       variant = int8_t{};
-      // c++98 should generate a const ref of dispatchern.
+      // c++98 should generate a const ref of dispatcher.
       int16_t type = etl::legacy::visit<int16_t>(variant_test_visit_dispatcher{}, variant);
       CHECK_EQUAL(1, type);
       test_variant_3 const& variant_const = variant;

From 3696fa4239a946e62b26bdddaf37a6ea48dd0dea Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Mon, 1 Apr 2024 17:13:45 +0100
Subject: [PATCH 116/131] Added more comparison tests

---
 test/test_variant_variadic.cpp | 37 ++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/test/test_variant_variadic.cpp b/test/test_variant_variadic.cpp
index 9d334a91..fbbd5a26 100644
--- a/test/test_variant_variadic.cpp
+++ b/test/test_variant_variadic.cpp
@@ -1963,6 +1963,43 @@ namespace
 
       CHECK_TRUE(v_empty1 == v_empty2);
       CHECK_TRUE(v_empty1 < v_char_a);
+      CHECK_FALSE(v_char_a < v_empty1);
+
+      CHECK_TRUE(v_char_a == v_char_a);
+      CHECK_TRUE(v_char_a < v_char_b);
+      CHECK_FALSE(v_char_b < v_char_a);
+      CHECK_FALSE(v_char_a > v_char_b);
+      CHECK_TRUE(v_char_b > v_char_a);
+      CHECK_TRUE(v_char_a <= v_char_b);
+      CHECK_FALSE(v_char_b <= v_char_a);
+      CHECK_FALSE(v_char_a >= v_char_b);
+      CHECK_TRUE(v_char_b >= v_char_a);
+      CHECK_TRUE(v_char_a <= v_char_a);
+      CHECK_TRUE(v_char_a >= v_char_a);
+
+      CHECK_TRUE(v_int_1 == v_int_1);
+      CHECK_TRUE(v_int_1 < v_int_2);
+      CHECK_FALSE(v_int_2 < v_int_1);
+      CHECK_FALSE(v_int_1 > v_int_2);
+      CHECK_TRUE(v_int_2 > v_int_1);
+      CHECK_TRUE(v_int_1 <= v_int_2);
+      CHECK_FALSE(v_int_2 <= v_int_1);
+      CHECK_FALSE(v_int_1 >= v_int_2);
+      CHECK_TRUE(v_int_2 >= v_int_1);
+      CHECK_TRUE(v_int_1 <= v_int_1);
+      CHECK_TRUE(v_int_1 >= v_int_1);
+
+      CHECK_TRUE(v_hello == v_hello);
+      CHECK_TRUE(v_hello < v_world);
+      CHECK_FALSE(v_world < v_hello);
+      CHECK_FALSE(v_hello > v_world);
+      CHECK_TRUE(v_world > v_hello);
+      CHECK_TRUE(v_hello <= v_world);
+      CHECK_FALSE(v_world <= v_hello);
+      CHECK_FALSE(v_hello >= v_world);
+      CHECK_TRUE(v_world >= v_hello);
+      CHECK_TRUE(v_hello <= v_hello);
+      CHECK_TRUE(v_hello >= v_hello);
     }
 #endif
 

From 106c4fd540b654146fe508a4e8d9c0d8020c4f82 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 2 Apr 2024 11:41:01 +0100
Subject: [PATCH 117/131] Added erase(node_type&) member function.

Added node_type typedef to intrusive lists
---
 include/etl/intrusive_forward_list.h | 71 +++++++++++++++++++++--
 include/etl/intrusive_list.h         | 65 +++++++++++++++++++--
 test/test_intrusive_forward_list.cpp | 84 +++++++++++++++++++++++++++
 test/test_intrusive_list.cpp         | 86 +++++++++++++++++++++++++++-
 4 files changed, 295 insertions(+), 11 deletions(-)

diff --git a/include/etl/intrusive_forward_list.h b/include/etl/intrusive_forward_list.h
index 60de1db2..5106be4a 100644
--- a/include/etl/intrusive_forward_list.h
+++ b/include/etl/intrusive_forward_list.h
@@ -209,7 +209,7 @@ namespace etl
 #if defined(ETL_CHECK_PUSH_POP)
       ETL_ASSERT_OR_RETURN(!empty(), ETL_ERROR(intrusive_forward_list_empty));
 #endif
-      remove_link_after(start);
+      disconnect_link_after(start);
     }
 
     //*************************************************************************
@@ -297,7 +297,7 @@ namespace etl
     //*************************************************************************
     /// Remove a link.
     //*************************************************************************
-    void remove_link_after(link_type& link)
+    void disconnect_link_after(link_type& link)
     {
       link_type* p_next = link.etl_next;
 
@@ -333,6 +333,59 @@ namespace etl
       start.etl_next = &terminator;
       current_size = 0;
     }
+
+    //*************************************************************************
+    /// Tests if the link is in this list.
+    /// Returns the previous link to it, if found, otherwise ETL_NULLPTR.
+    //*************************************************************************
+    link_type* is_link_in_list(link_type& search_link)
+    {
+      link_type* p_link     = start.etl_next;
+      link_type* p_previous = &start;
+
+      while (p_link != ETL_NULLPTR)
+      {
+        if (&search_link == p_link)
+        {
+          return p_previous;
+        }
+
+        p_previous = p_link;
+
+        if (p_link != ETL_NULLPTR)
+        {
+          p_link = p_link->link_type::etl_next;
+        }
+      }
+
+      return ETL_NULLPTR;
+    }
+
+    //*************************************************************************
+    /// Remove the specified node from the list.
+    /// Returns ETL_NULLPTR if the link was not in this list.
+    /// Returns the next 
+    //*************************************************************************
+    link_type* remove_link(link_type& link)
+    {
+      link_type* result = ETL_NULLPTR;
+
+      link_type* p_previous = is_link_in_list(link);
+
+      if (p_previous != ETL_NULLPTR)
+      {
+        link_type* p_next = link.etl_next;
+
+        disconnect_link_after(*p_previous);
+
+        if (p_next != &this->terminator)
+        {
+          result = p_next;
+        }
+      }
+
+      return result;
+    }
   };
 
   template <typename TLink>
@@ -361,6 +414,8 @@ namespace etl
 
     typedef intrusive_forward_list<TValue, TLink> list_type;
 
+    typedef TValue node_type;
+
     //*************************************************************************
     /// iterator.
     //*************************************************************************
@@ -664,7 +719,7 @@ namespace etl
         if (next != end())
         {
           ++next;
-          this->remove_link_after(*position.p_value);
+          this->disconnect_link_after(*position.p_value);
         }
       }
 
@@ -712,6 +767,14 @@ namespace etl
       }
     }
 
+    //*************************************************************************
+    /// Erases the specified node.
+    //*************************************************************************
+    node_type* erase(node_type& node)
+    {
+      return static_cast<node_type*>(this->remove_link(node));
+    }
+
     //*************************************************************************
     /// Removes all but the one element from every consecutive group of equal
     /// elements in the container.
@@ -732,7 +795,7 @@ namespace etl
         // Is this value the same as the last?
         if (isEqual(*static_cast<pointer>(current), *static_cast<pointer>(last)))
         {
-          this->remove_link_after(*last);
+          this->disconnect_link_after(*last);
         }
         else
         {
diff --git a/include/etl/intrusive_list.h b/include/etl/intrusive_list.h
index 826c9825..cce99b31 100644
--- a/include/etl/intrusive_list.h
+++ b/include/etl/intrusive_list.h
@@ -175,7 +175,7 @@ namespace etl
 #if defined(ETL_CHECK_PUSH_POP)
       ETL_ASSERT(!empty(), ETL_ERROR(intrusive_list_empty));
 #endif
-      remove_link(get_head());
+      disconnect_link(get_head());
     }
 
     //*************************************************************************
@@ -196,7 +196,7 @@ namespace etl
 #if defined(ETL_CHECK_PUSH_POP)
       ETL_ASSERT(!empty(), ETL_ERROR(intrusive_list_empty));
 #endif
-      remove_link(get_tail());
+      disconnect_link(get_tail());
     }
 
     //*************************************************************************
@@ -320,7 +320,7 @@ namespace etl
     //*************************************************************************
     /// Remove a link.
     //*************************************************************************
-    void remove_link(link_type& link)
+    void disconnect_link(link_type& link)
     {
       etl::unlink<link_type>(link);
       --current_size;
@@ -329,7 +329,7 @@ namespace etl
     //*************************************************************************
     /// Remove a link.
     //*************************************************************************
-    void remove_link(link_type* link)
+    void disconnect_link(link_type* link)
     {
       etl::unlink<link_type>(*link);
       --current_size;
@@ -375,6 +375,49 @@ namespace etl
       etl::link(terminal_link, terminal_link);
       current_size = 0;
     }
+
+    //*************************************************************************
+    /// Tests if the link is in this list.
+    //*************************************************************************
+    bool is_link_in_list(link_type& search_link) const
+    {
+      link_type* p_link = terminal_link.link_type::etl_next;
+
+      while (p_link != &terminal_link)
+      {
+        if (&search_link == p_link)
+        {
+          return true;
+        }
+
+        p_link = p_link->link_type::etl_next;
+      }
+
+      return false;
+    }
+
+    //*************************************************************************
+    /// Remove the specified node from the list.
+    /// Returns ETL_NULLPTR if the link was not in this list or was the last in the list.
+    //*************************************************************************
+    link_type* remove_link(link_type& link)
+    {
+      link_type* result = ETL_NULLPTR;
+
+      if (is_link_in_list(link))
+      {
+        link_type* p_next = link.etl_next;
+
+        disconnect_link(link);
+
+        if (p_next != &this->terminal_link)
+        {
+          result = p_next;
+        }
+      }
+
+      return result;
+    }
   };
 
   //***************************************************************************
@@ -392,6 +435,8 @@ namespace etl
 
     typedef intrusive_list<TValue, TLink> list_type;
 
+    typedef TValue node_type;
+
     // STL style typedefs.
     typedef TValue            value_type;
     typedef value_type*       pointer;
@@ -726,7 +771,7 @@ namespace etl
       iterator next(position);
       ++next;
 
-      this->remove_link(*position.p_value);
+      this->disconnect_link(*position.p_value);
 
       return next;
     }
@@ -739,7 +784,7 @@ namespace etl
       iterator next(position);
       ++next;
 
-      this->remove_link(*position.p_value);
+      this->disconnect_link(*position.p_value);
 
       return next;
     }
@@ -778,6 +823,14 @@ namespace etl
       }
     }
 
+    //*************************************************************************
+    /// Erases the specified node.
+    //*************************************************************************
+    node_type* erase(node_type& node)
+    {
+      return static_cast<node_type*>(this->remove_link(node));
+    }
+
     //*************************************************************************
     /// Removes all but the one element from every consecutive group of equal
     /// elements in the container.
diff --git a/test/test_intrusive_forward_list.cpp b/test/test_intrusive_forward_list.cpp
index 88fe6958..f1366511 100644
--- a/test/test_intrusive_forward_list.cpp
+++ b/test/test_intrusive_forward_list.cpp
@@ -615,6 +615,90 @@ namespace
       CHECK(are_equal);
     }
 
+    //*************************************************************************
+    TEST_FIXTURE(SetupFixture, test_erase_single_by_node_reference)
+    {
+      bool are_equal;
+
+      std::vector<ItemNDCNode> compare_data(sorted_data.begin(), sorted_data.end());
+      DataNDC0 data0(sorted_data.begin(), sorted_data.end());
+      DataNDC1 data1(sorted_data.begin(), sorted_data.end());
+
+      // Move to the third value and erase.
+      std::vector<ItemNDCNode>::iterator i_compare_data = compare_data.begin();
+      std::advance(i_compare_data, 3);
+
+      DataNDC0::iterator i_data = data0.begin();
+      std::advance(i_data, 3);
+
+      ItemNDCNode& node1 = *i_data;
+      ItemNDCNode* p_next1 = static_cast<ItemNDCNode*>(node1.FirstLink::get_next());
+      ItemNDCNode* p_node1 = data0.erase(node1);
+      i_compare_data = compare_data.erase(i_compare_data);
+
+      are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
+
+      CHECK(are_equal);
+      CHECK_EQUAL(p_next1, p_node1);
+      CHECK_EQUAL(compare_data.size(), data0.size());
+      CHECK_EQUAL(compare_data.size(), size_t(std::distance(data0.begin(), data0.end())));
+
+      // Move to the first value and erase.
+      i_compare_data = compare_data.begin();
+      i_compare_data = compare_data.erase(i_compare_data);
+
+      i_data = data0.begin();
+
+      ItemNDCNode& node2 = *i_data;
+      ItemNDCNode* p_next2 = static_cast<ItemNDCNode*>(node2.FirstLink::get_next());
+      ItemNDCNode* p_node2 = data0.erase(node2);
+
+      are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
+
+      CHECK(are_equal);
+      CHECK_EQUAL(p_next2, p_node2);
+      CHECK_EQUAL(compare_data.size(), data0.size());
+      CHECK_EQUAL(compare_data.size(), size_t(std::distance(data0.begin(), data0.end())));
+
+      // Move to the last value and erase.
+      i_compare_data = compare_data.begin();
+      std::advance(i_compare_data, compare_data.size() - 1);
+
+      i_data = data0.begin();
+      std::advance(i_data, data0.size() - 1);
+
+      ItemNDCNode& node3 = *i_data;
+      ItemNDCNode* p_next3 = static_cast<ItemNDCNode*>(node3.FirstLink::get_next());
+      ItemNDCNode* p_node3 = data0.erase(node3);
+      i_compare_data = compare_data.erase(i_compare_data);
+
+      are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
+
+      CHECK(are_equal);
+      CHECK_NOT_EQUAL(p_next3, p_node3);
+      CHECK_EQUAL(ETL_NULLPTR, p_node3);
+      CHECK_EQUAL(compare_data.size(), data0.size());
+      CHECK_EQUAL(compare_data.size(), size_t(std::distance(data0.begin(), data0.end())));
+
+      // Try removing a node that isn't in the list.
+      auto node_not_in_list = ItemNDCNode("9");
+
+      ItemNDCNode* p_node4 = data0.erase(node_not_in_list);
+      CHECK(p_node4 == ETL_NULLPTR);
+
+      // Try removing the only node in the list.
+      while (data0.size() > 1)
+      {
+        data0.pop_front();
+      }
+
+      ItemNDCNode* p_node5 = &data0.front();
+
+      ItemNDCNode* p_next5 = static_cast<ItemNDCNode*>(p_node5->FirstLink::get_next());
+      p_node5 = data0.erase(*p_node5);
+      CHECK_EQUAL(ETL_NULLPTR, p_node5);
+    }
+
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_erase_after_range)
     {
diff --git a/test/test_intrusive_list.cpp b/test/test_intrusive_list.cpp
index 0f3e0479..9a803d83 100644
--- a/test/test_intrusive_list.cpp
+++ b/test/test_intrusive_list.cpp
@@ -734,7 +734,7 @@ namespace
       are_equal = *i_data == *i_compare_data;
       CHECK(are_equal);
 
-      // Move to the last value and erase.
+      // Move to the first value and erase.
       i_compare_data = compare_data.begin();
       i_compare_data = compare_data.erase(i_compare_data);
 
@@ -756,6 +756,90 @@ namespace
       CHECK(are_equal);
     }
 
+    //*************************************************************************
+    TEST_FIXTURE(SetupFixture, test_erase_single_by_node_reference)
+    {
+      bool are_equal;
+
+      std::vector<ItemNDCNode> compare_data(sorted_data.begin(), sorted_data.end());
+      DataNDC0 data0(sorted_data.begin(), sorted_data.end());
+      DataNDC1 data1(sorted_data.begin(), sorted_data.end());
+
+      // Move to the third value and erase.
+      std::vector<ItemNDCNode>::iterator i_compare_data = compare_data.begin();
+      std::advance(i_compare_data, 3);
+
+      DataNDC0::iterator i_data = data0.begin();
+      std::advance(i_data, 3);
+
+      ItemNDCNode& node1   = *i_data;
+      ItemNDCNode* p_next1 = static_cast<ItemNDCNode*>(node1.FirstLink::get_next());
+      ItemNDCNode* p_node1 = data0.erase(node1);
+      i_compare_data = compare_data.erase(i_compare_data);
+
+      are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
+
+      CHECK(are_equal);
+      CHECK_EQUAL(p_next1, p_node1);
+      CHECK_EQUAL(compare_data.size(), data0.size());
+      CHECK_EQUAL(compare_data.size(), size_t(std::distance(data0.begin(), data0.end())));
+
+      // Move to the first value and erase.
+      i_compare_data = compare_data.begin();
+      i_compare_data = compare_data.erase(i_compare_data);
+
+      i_data = data0.begin();
+
+      ItemNDCNode& node2   = *i_data;
+      ItemNDCNode* p_next2 = static_cast<ItemNDCNode*>(node2.FirstLink::get_next());
+      ItemNDCNode* p_node2 = data0.erase(node2);
+
+      are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
+
+      CHECK(are_equal);
+      CHECK_EQUAL(p_next2, p_node2);
+      CHECK_EQUAL(compare_data.size(), data0.size());
+      CHECK_EQUAL(compare_data.size(), size_t(std::distance(data0.begin(), data0.end())));
+
+      // Move to the last value and erase.
+      i_compare_data = compare_data.begin();
+      std::advance(i_compare_data, compare_data.size() - 1);
+
+      i_data = data0.begin();
+      std::advance(i_data, data0.size() - 1);
+
+      ItemNDCNode& node3 = *i_data;
+      ItemNDCNode* p_next3 = static_cast<ItemNDCNode*>(node3.FirstLink::get_next());
+      ItemNDCNode* p_node3 = data0.erase(node3);
+      i_compare_data = compare_data.erase(i_compare_data);
+
+      are_equal = std::equal(data0.begin(), data0.end(), compare_data.begin());
+
+      CHECK(are_equal);
+      CHECK_NOT_EQUAL(p_next3, p_node3);
+      CHECK_EQUAL(ETL_NULLPTR, p_node3);
+      CHECK_EQUAL(compare_data.size(), data0.size());
+      CHECK_EQUAL(compare_data.size(), size_t(std::distance(data0.begin(), data0.end())));
+
+      // Try removing a node that isn't in the list.
+      auto node_not_in_list = ItemNDCNode("9");
+
+      ItemNDCNode* p_node4 = data0.erase(node_not_in_list);
+      CHECK(p_node4 == ETL_NULLPTR);
+
+      // Try removing the only node in the list.
+      while (data0.size() > 1)
+      {
+        data0.pop_back();
+      }
+
+      ItemNDCNode* p_node5 = &data0.front();
+
+      ItemNDCNode* p_next5 = static_cast<ItemNDCNode*>(p_node5->FirstLink::get_next());
+      p_node5 = data0.erase(*p_node5);
+      CHECK_EQUAL(ETL_NULLPTR, p_node5);
+    }
+
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_erase_range)
     {

From 02a11e943e189dfe4312aca20ae560f1d6d38cbe Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 2 Apr 2024 17:12:19 +0100
Subject: [PATCH 118/131] Moved include for clang compatibility

---
 test/test_variant_variadic.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/test_variant_variadic.cpp b/test/test_variant_variadic.cpp
index fbbd5a26..39ae086f 100644
--- a/test/test_variant_variadic.cpp
+++ b/test/test_variant_variadic.cpp
@@ -26,8 +26,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#include "unit_test_framework.h"
-
 #include "etl/private/variant_variadic.h"
 #include "etl/visitor.h"
 #include "etl/overload.h"
@@ -44,6 +42,10 @@ SOFTWARE.
   #include <variant>
 #endif
 
+#if ETL_USING_CPP20
+  #include <compare>
+#endif
+
 #include "etl/private/diagnostic_useless_cast_push.h"
 
 namespace
@@ -170,7 +172,7 @@ namespace
   }
 
 #if ETL_USING_CPP20 && ETL_USING_STL
-  std::ostream& operator <<(std::ostream& os, std::strong_ordering ordering)
+  std::ostream& operator <<(std::ostream& os, const std::strong_ordering& ordering)
   {
     if (ordering == std::strong_ordering::equal)
     {
@@ -320,6 +322,10 @@ namespace
   };
 }
 
+// Moved from the top of the file otherwise clang has issues with
+// operator<< for std::strong_ordering.
+#include "unit_test_framework.h"
+
 // Definitions for when the STL and compiler built-ins are not available.
 #if ETL_NOT_USING_STL && !defined(ETL_USE_TYPE_TRAITS_BUILTINS)
 

From 52083acff3bb02d9058e99119eb4a9d11702cae7 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 2 Apr 2024 17:12:51 +0100
Subject: [PATCH 119/131] Added node erase member functions

---
 include/etl/intrusive_forward_list.h | 47 +++++++++++++++++++---------
 include/etl/intrusive_list.h         | 39 ++++++++++++++++-------
 test/test_intrusive_forward_list.cpp |  4 +--
 test/test_intrusive_list.cpp         |  4 +--
 4 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/include/etl/intrusive_forward_list.h b/include/etl/intrusive_forward_list.h
index 5106be4a..a38cf43e 100644
--- a/include/etl/intrusive_forward_list.h
+++ b/include/etl/intrusive_forward_list.h
@@ -386,6 +386,36 @@ namespace etl
 
       return result;
     }
+
+    //*************************************************************************
+    /// Remove a range of elements.
+    //*************************************************************************
+    link_type* remove_link_range_after(link_type* p_first, link_type* p_last)
+    {
+      link_type* p_after = p_first->etl_next;
+
+      // Join the ends.
+      etl::link<link_type>(p_first, p_last);
+
+      // Unlink the erased range.
+      link_type* p_unlink = p_after;
+
+      while (p_unlink != p_last)
+      {
+        link_type* p_next = p_unlink->etl_next;
+        p_unlink->clear();
+        p_unlink = p_next;
+      }
+
+      if (p_after == &this->terminator)
+      {
+        return ETL_NULLPTR;
+      }
+      else
+      {
+        return p_last;
+      }
+    }
   };
 
   template <typename TLink>
@@ -737,22 +767,9 @@ namespace etl
 
         link_type* p_first = first.p_value;
         link_type* p_last  = last.p_value;
-        link_type* p_after = p_first->etl_next;
-        
-        // Join the ends.
-        etl::link<link_type>(p_first, p_last);
+        link_type* p_after = this->remove_link_range_after(p_first, p_last);
 
-        // Unlink the erased range.
-        link_type* p_unlink = p_after;
-
-        while (p_unlink != p_last)
-        {
-          link_type* p_next = p_unlink->etl_next;
-          p_unlink->clear();
-          p_unlink = p_next;
-        }
-
-        if (p_after == &this->terminator)
+        if (p_after == ETL_NULLPTR)
         {
           return end();
         }
diff --git a/include/etl/intrusive_list.h b/include/etl/intrusive_list.h
index cce99b31..58c976e8 100644
--- a/include/etl/intrusive_list.h
+++ b/include/etl/intrusive_list.h
@@ -410,7 +410,7 @@ namespace etl
 
         disconnect_link(link);
 
-        if (p_next != &this->terminal_link)
+        if (p_next != &terminal_link)
         {
           result = p_next;
         }
@@ -418,6 +418,31 @@ namespace etl
 
       return result;
     }
+
+    //*************************************************************************
+    /// Removes a range of links.
+    //*************************************************************************
+    link_type* remove_link_range(link_type* p_first, link_type* p_last)
+    {
+      // Join the ends.
+      etl::link<link_type>(p_first->etl_previous, p_last);
+
+      while (p_first != p_last)
+      {
+        link_type* p_next = p_first->etl_next;
+        p_first->clear();
+        p_first = p_next;
+      }
+
+      if (p_last == &terminal_link)
+      {
+        return ETL_NULLPTR;
+      }
+      else
+      {
+        return p_last;
+      }
+    }
   };
 
   //***************************************************************************
@@ -803,17 +828,9 @@ namespace etl
 
       this->current_size -= etl::distance(first, last);
 
-      // Join the ends.
-      etl::link<link_type>(p_first->etl_previous, p_last);
+      p_last = this->remove_link_range(p_first, p_last);
 
-      while (p_first != p_last)
-      {
-        link_type* p_next = p_first->etl_next;
-        p_first->clear();
-        p_first = p_next;
-      }
-
-      if (p_last == &this->terminal_link)
+      if (p_last == ETL_NULLPTR)
       {
         return end();
       }
diff --git a/test/test_intrusive_forward_list.cpp b/test/test_intrusive_forward_list.cpp
index f1366511..637d26db 100644
--- a/test/test_intrusive_forward_list.cpp
+++ b/test/test_intrusive_forward_list.cpp
@@ -695,8 +695,8 @@ namespace
       ItemNDCNode* p_node5 = &data0.front();
 
       ItemNDCNode* p_next5 = static_cast<ItemNDCNode*>(p_node5->FirstLink::get_next());
-      p_node5 = data0.erase(*p_node5);
-      CHECK_EQUAL(ETL_NULLPTR, p_node5);
+      p_next5 = data0.erase(*p_node5);
+      CHECK_EQUAL(ETL_NULLPTR, p_next5);
     }
 
     //*************************************************************************
diff --git a/test/test_intrusive_list.cpp b/test/test_intrusive_list.cpp
index 9a803d83..0329511d 100644
--- a/test/test_intrusive_list.cpp
+++ b/test/test_intrusive_list.cpp
@@ -836,8 +836,8 @@ namespace
       ItemNDCNode* p_node5 = &data0.front();
 
       ItemNDCNode* p_next5 = static_cast<ItemNDCNode*>(p_node5->FirstLink::get_next());
-      p_node5 = data0.erase(*p_node5);
-      CHECK_EQUAL(ETL_NULLPTR, p_node5);
+      p_next5 = data0.erase(*p_node5);
+      CHECK_EQUAL(ETL_NULLPTR, p_next5);
     }
 
     //*************************************************************************

From a5560b2ce192fb384f3c5acd25fde2179faa7f7b Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 9 Apr 2024 13:46:33 +0100
Subject: [PATCH 120/131] Added etl::partition

---
 include/etl/algorithm.h | 67 ++++++++++++++++++++++++++++++++++
 test/test_algorithm.cpp | 79 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+)

diff --git a/include/etl/algorithm.h b/include/etl/algorithm.h
index 9098d39e..4d88910c 100644
--- a/include/etl/algorithm.h
+++ b/include/etl/algorithm.h
@@ -3073,6 +3073,73 @@ namespace etl
     return multimin_iter_compare(compare, t, multimin_iter_compare(compare, tx...));
   }
 #endif
+
+  //***************************************************************************
+  /// partition
+  /// For forward iterators only
+  /// Does at most etl::distance(first, last) swaps.
+  //***************************************************************************
+  template <typename TIterator, typename TPredicate>
+  ETL_CONSTEXPR14 
+  typename etl::enable_if<etl::is_forward_iterator<TIterator>::value, TIterator>::type
+    partition(TIterator first, TIterator last, TPredicate predicate)
+  {
+    first = etl::find_if_not(first, last, predicate);
+
+    if (first == last)
+    {
+      return first;
+    }
+
+    for (TIterator i = etl::next(first); i != last; ++i)
+    {
+      if (predicate(*i))
+      {
+        using ETL_OR_STD::swap;
+        swap(*i, *first);
+        ++first;
+      }
+    }
+
+    return first;
+  }
+
+  //***************************************************************************
+  /// partition
+  /// For iterators that support bidirectional iteration.
+  /// Does at most (etl::distance(first, last) / 2) swaps.
+  //***************************************************************************
+  template <typename TIterator, typename TPredicate>
+  ETL_CONSTEXPR14
+  typename etl::enable_if<etl::is_bidirectional_iterator_concept<TIterator>::value, TIterator>::type
+    partition(TIterator first, TIterator last, TPredicate predicate) 
+  {
+    while (first != last)
+    {
+      first = etl::find_if_not(first, last, predicate);
+
+      if (first == last)
+      {
+        break;
+      }
+
+      last = etl::find_if(etl::reverse_iterator<TIterator>(last),
+                          etl::reverse_iterator<TIterator>(first),
+                          predicate).base();
+
+      if (first == last)
+      {
+        break;
+      }
+
+      --last;
+      using ETL_OR_STD::swap;
+      swap(*first, *last);
+      ++first;
+    }
+
+    return first;
+  }
 }
 
 #include "private/minmax_pop.h"
diff --git a/test/test_algorithm.cpp b/test/test_algorithm.cpp
index 1be3f7f3..b7e8e663 100644
--- a/test/test_algorithm.cpp
+++ b/test/test_algorithm.cpp
@@ -30,6 +30,7 @@ SOFTWARE.
 
 #include "etl/algorithm.h"
 #include "etl/container.h"
+#include "etl/binary.h"
 
 #include "data.h"
 #include "iterators_for_unit_tests.h"
@@ -2224,5 +2225,83 @@ namespace
 
       CHECK_ARRAY_EQUAL(expected.data(), actual.data(), expected.size());
     }
+
+    //*************************************************************************
+    TEST(partition_forward_iterator_container)
+    {
+      // 40,320 permutations.
+      std::array<int, 8> origin = { 0, 1, 2, 3, 4, 5, 6, 7 };
+
+      std::forward_list<int> compare(origin.begin(), origin.end());
+      std::forward_list<int> data(origin.begin(), origin.end());
+
+      bool complete = false;
+
+      while (!complete)
+      {
+        auto pivot1 = std::partition(compare.begin(), compare.end(), [](int i) { return etl::is_even(i); });
+        auto pivot2 = etl::partition(data.begin(), data.end(), [](int i) { return etl::is_even(i); });
+
+        auto distance1 = std::distance(compare.begin(), pivot1);
+        auto distance2 = std::distance(data.begin(), pivot2);
+
+        CHECK_EQUAL(*pivot1, *pivot2);
+        CHECK_EQUAL(distance1, distance2);
+
+        for (auto itr = compare.begin(); itr != pivot1; ++itr)
+        {
+          CHECK_TRUE((etl::is_even(*itr)));
+        }
+
+        for (auto itr = pivot1; itr != compare.end(); ++itr)
+        {
+          CHECK_FALSE((etl::is_even(*itr)));
+        }
+
+        complete = !std::next_permutation(origin.begin(), origin.end());
+
+        compare.assign(origin.begin(), origin.end());
+        data.assign(origin.begin(), origin.end());
+      }
+    }
+
+    //*************************************************************************
+    TEST(partition_bidirectional_iterator_container)
+    {
+      // 40,320 permutations.
+      std::array<int, 8> initial = { 0, 1, 2, 3, 4, 5, 6, 7 };
+      
+      std::array<int, 8> compare = initial;
+      std::array<int, 8> data = initial;
+
+      bool complete = false;
+
+      while (!complete)
+      {
+        auto pivot1 = std::partition(compare.begin(), compare.end(), [](int i) { return etl::is_even(i); });
+        auto pivot2 = etl::partition(data.begin(), data.end(), [](int i) { return etl::is_even(i); });
+
+        auto distance1 = std::distance(compare.begin(), pivot1);
+        auto distance2 = std::distance(data.begin(), pivot2);
+
+        CHECK_EQUAL(*pivot1, *pivot2);
+        CHECK_EQUAL(distance1, distance2);
+
+        for (auto itr = compare.begin(); itr != pivot1; ++itr)
+        {
+          CHECK_TRUE((etl::is_even(*itr)));
+        }
+
+        for (auto itr = pivot1; itr != compare.end(); ++itr)
+        {
+          CHECK_FALSE((etl::is_even(*itr)));
+        }
+
+        complete = !std::next_permutation(initial.begin(), initial.end());
+
+        compare = initial;
+        data = initial;
+      }
+    }
   };
 }

From 4f440a429e490c3df0d784fdb9138efc8f35bf6f Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 9 Apr 2024 14:45:35 +0100
Subject: [PATCH 121/131] Optimised string_view::find_first_not_of &
 string_view::find_last_not_of

---
 include/etl/string_view.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/etl/string_view.h b/include/etl/string_view.h
index a196b908..7ddce503 100644
--- a/include/etl/string_view.h
+++ b/include/etl/string_view.h
@@ -662,6 +662,7 @@ namespace etl
             if (mbegin[i] == view[j])
             {
               found = true;
+              break;
             }
           }
 
@@ -715,6 +716,7 @@ namespace etl
           if (mbegin[position] == view[j])
           {
             found = true;
+            break;
           }
         }
 

From d67a2c63faa27072f595b896339065ceba020556 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 9 Apr 2024 14:46:12 +0100
Subject: [PATCH 122/131] Changed unit test checks for C++14 compatibility

---
 test/test_intrusive_forward_list.cpp | 4 ++--
 test/test_intrusive_list.cpp         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/test_intrusive_forward_list.cpp b/test/test_intrusive_forward_list.cpp
index 637d26db..20c8d830 100644
--- a/test/test_intrusive_forward_list.cpp
+++ b/test/test_intrusive_forward_list.cpp
@@ -676,7 +676,7 @@ namespace
 
       CHECK(are_equal);
       CHECK_NOT_EQUAL(p_next3, p_node3);
-      CHECK_EQUAL(ETL_NULLPTR, p_node3);
+      CHECK(ETL_NULLPTR == p_node3);
       CHECK_EQUAL(compare_data.size(), data0.size());
       CHECK_EQUAL(compare_data.size(), size_t(std::distance(data0.begin(), data0.end())));
 
@@ -696,7 +696,7 @@ namespace
 
       ItemNDCNode* p_next5 = static_cast<ItemNDCNode*>(p_node5->FirstLink::get_next());
       p_next5 = data0.erase(*p_node5);
-      CHECK_EQUAL(ETL_NULLPTR, p_next5);
+      CHECK(ETL_NULLPTR == p_next5);
     }
 
     //*************************************************************************
diff --git a/test/test_intrusive_list.cpp b/test/test_intrusive_list.cpp
index 0329511d..33aa4467 100644
--- a/test/test_intrusive_list.cpp
+++ b/test/test_intrusive_list.cpp
@@ -817,7 +817,7 @@ namespace
 
       CHECK(are_equal);
       CHECK_NOT_EQUAL(p_next3, p_node3);
-      CHECK_EQUAL(ETL_NULLPTR, p_node3);
+      CHECK(ETL_NULLPTR == p_node3);
       CHECK_EQUAL(compare_data.size(), data0.size());
       CHECK_EQUAL(compare_data.size(), size_t(std::distance(data0.begin(), data0.end())));
 
@@ -837,7 +837,7 @@ namespace
 
       ItemNDCNode* p_next5 = static_cast<ItemNDCNode*>(p_node5->FirstLink::get_next());
       p_next5 = data0.erase(*p_node5);
-      CHECK_EQUAL(ETL_NULLPTR, p_next5);
+      CHECK(ETL_NULLPTR == p_next5);
     }
 
     //*************************************************************************

From ddcabd65143a8ea16107d241e7b6c2eb356e4213 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 9 Apr 2024 14:46:51 +0100
Subject: [PATCH 123/131] Disable <=> compare code when not C++20

---
 include/etl/private/variant_variadic.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/etl/private/variant_variadic.h b/include/etl/private/variant_variadic.h
index bacfa8f7..97f8ce88 100644
--- a/include/etl/private/variant_variadic.h
+++ b/include/etl/private/variant_variadic.h
@@ -1981,6 +1981,7 @@ namespace etl
 
   namespace private_variant
   {
+#if ETL_USING_CPP20 && ETL_USING_STL
     //***************************************************************************
     /// C++20 compatible visitor function for testing variant '<=>'.
     /// Assumes that the two variants are already known to contain the same type.
@@ -2001,6 +2002,7 @@ namespace etl
 
       const TVariant& rhs;
     };
+#endif
   }
 
   //***************************************************************************

From 749d4a3a0304cabd35b2caa07c37dd6903e74310 Mon Sep 17 00:00:00 2001
From: David Hebbeker <hebbeker@stoerk-tronic.com>
Date: Thu, 11 Apr 2024 11:38:16 +0200
Subject: [PATCH 124/131] Render include paths relative. (#879)

By removing `etl/` from include paths (in `#include` statements), the path to the directory `include/` doesn't need to be provided to the preprocessor as an include path if the files in `include/etl/` are included by other means.
This has no disadvantages.
Actually the form `#include "..."` is intended to be used for relative paths in the first place.

This is relevant if one wants to include the source files from `include/etl` only indirectly.

For example we use special generated header files which wrap the include statement of the vanilla header files with diagnostic commands.
Those commands allow to disable diagnostic for ETL's files and re-enable them after the file inclusion.
Wrapper files are generated for every non-private header file.
We provide the directory with the wrapper files as include path to the preprocessor instead of the normal `include/` directory.
Thus include statements like `#include "etl/private/..."` are invalid in that case.
---
 include/etl/limits.h | 8 ++++----
 include/etl/random.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/etl/limits.h b/include/etl/limits.h
index d64f6c57..ac31ca6b 100644
--- a/include/etl/limits.h
+++ b/include/etl/limits.h
@@ -80,19 +80,19 @@ SOFTWARE.
 
 #if defined(ETL_NO_CPP_NAN_SUPPORT)
   #if defined(NAN)
-  #include "etl/private/diagnostic_useless_cast_push.h"
+  #include "private/diagnostic_useless_cast_push.h"
     #define ETL_NANF    NAN
     #define ETL_NAN     static_cast<double>(NAN)
     #define ETL_NANL    static_cast<long double>(NAN)
     #define ETL_HAS_NAN true
-  #include "etl/private/diagnostic_pop.h"
+  #include "private/diagnostic_pop.h"
   #else
-  #include "etl/private/diagnostic_useless_cast_push.h"
+  #include "private/diagnostic_useless_cast_push.h"
     #define ETL_NANF HUGE_VALF    
     #define ETL_NAN  HUGE_VAL
     #define ETL_NANL HUGE_VALL
     #define ETL_HAS_NAN false
-  #include "etl/private/diagnostic_pop.h"
+  #include "private/diagnostic_pop.h"
   #endif
 #else
   #define ETL_NANF    nanf("")
diff --git a/include/etl/random.h b/include/etl/random.h
index e24bb84d..2a480506 100644
--- a/include/etl/random.h
+++ b/include/etl/random.h
@@ -462,12 +462,12 @@ namespace etl
 
     random_pcg()
     {
-#include "etl/private/diagnostic_useless_cast_push.h"
+#include "private/diagnostic_useless_cast_push.h"
       // An attempt to come up with a unique non-zero seed,
       // based on the address of the instance.
       uintptr_t n = reinterpret_cast<uintptr_t>(this);
       value = static_cast<uint64_t>(n);
-#include "etl/private/diagnostic_pop.h"
+#include "private/diagnostic_pop.h"
     }
 
     //***************************************************************************

From 937ec7189a578c70ed3ae3f871cb0150fbae8e0a Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 16 Apr 2024 08:04:49 +0100
Subject: [PATCH 125/131] Make first() and last() static for template based
 limits specialisation

---
 include/etl/cyclic_value.h | 91 +++++++++++++++++++-------------------
 test/test_cyclic_value.cpp |  9 +++-
 2 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/include/etl/cyclic_value.h b/include/etl/cyclic_value.h
index 03f19325..392c7a14 100644
--- a/include/etl/cyclic_value.h
+++ b/include/etl/cyclic_value.h
@@ -49,19 +49,19 @@ namespace etl
   //***************************************************************************
   /// Provides a value that cycles between two limits.
   //***************************************************************************
-  template <typename T, T FIRST = 0, T LAST = 0, bool EtlRuntimeSpecialisation = ((FIRST == 0) && (LAST == 0))>
+  template <typename T, T First = 0, T Last = 0, bool EtlRuntimeSpecialisation = ((First == 0) && (Last == 0))>
   class cyclic_value;
 
   //***************************************************************************
-  /// Provides a value that cycles between two limits.
+  /// Provides a value that cycles between two compile time limits.
   /// Supports incrementing and decrementing.
   ///\tparam T     The type of the variable.
-  ///\tparam FIRST The first value of the range.
-  ///\tparam LAST  The last value of the range.
+  ///\tparam First The first value of the range.
+  ///\tparam Last  The last value of the range.
   ///\ingroup cyclic_value
   //***************************************************************************
-  template <typename T, T FIRST, T LAST>
-  class cyclic_value<T, FIRST, LAST, false>
+  template <typename T, T First, T Last>
+  class cyclic_value<T, First, Last, false>
   {
   public:
 
@@ -70,7 +70,7 @@ namespace etl
     /// The initial value is set to the first value.
     //*************************************************************************
     cyclic_value()
-      : value(FIRST)
+      : value(First)
     {
     }
 
@@ -87,7 +87,7 @@ namespace etl
     //*************************************************************************
     /// Copy constructor.
     //*************************************************************************
-    cyclic_value(const cyclic_value<T, FIRST, LAST>& other)
+    cyclic_value(const cyclic_value<T, First, Last>& other)
       : value(other.value)
     {
     }
@@ -95,7 +95,7 @@ namespace etl
     //*************************************************************************
     /// Assignment operator.
     //*************************************************************************
-    cyclic_value& operator =(const cyclic_value<T, FIRST, LAST>& other)
+    cyclic_value& operator =(const cyclic_value<T, First, Last>& other)
     {
       value = other.value;
 
@@ -104,17 +104,18 @@ namespace etl
 
     //*************************************************************************
     /// Sets the value.
+    /// Truncates to the First/Last range.
     ///\param value The value.
     //*************************************************************************
     void set(T value_)
     {
-      if (value_ > LAST)
+      if (value_ > Last)
       {
-        value_ = LAST;
+        value_ = Last;
       }
-      else if (value_ < FIRST)
+      else if (value_ < First)
       {
-        value_ = FIRST;
+        value_ = First;
       }
 
       value = value_;
@@ -125,7 +126,7 @@ namespace etl
     //*************************************************************************
     void to_first()
     {
-      value = FIRST;
+      value = First;
     }
 
     //*************************************************************************
@@ -133,7 +134,7 @@ namespace etl
     //*************************************************************************
     void to_last()
     {
-      value = LAST;
+      value = Last;
     }
 
     //*************************************************************************
@@ -181,9 +182,9 @@ namespace etl
     //*************************************************************************
     cyclic_value& operator ++()
     {
-      if (value >= LAST) ETL_UNLIKELY
+      if (value >= Last) ETL_UNLIKELY
       {
-        value = FIRST;
+        value = First;
       }
       else
       {
@@ -210,9 +211,9 @@ namespace etl
     //*************************************************************************
     cyclic_value& operator --()
     {
-      if (value <= FIRST) ETL_UNLIKELY
+      if (value <= First) ETL_UNLIKELY
       {
-        value = LAST;
+        value = Last;
       }
       else
       {
@@ -264,23 +265,23 @@ namespace etl
     //*************************************************************************
     /// Gets the first value.
     //*************************************************************************
-    const T first() const
+    static ETL_CONSTEXPR T first()
     {
-      return FIRST;
+      return First;
     }
 
     //*************************************************************************
     /// Gets the last value.
     //*************************************************************************
-    const T last() const
+    static ETL_CONSTEXPR T last()
     {
-      return LAST;
+      return Last;
     }
 
     //*************************************************************************
     /// Swaps the values.
     //*************************************************************************
-    void swap(cyclic_value<T, FIRST, LAST>& other)
+    void swap(cyclic_value<T, First, Last>& other)
     {
       using ETL_OR_STD::swap; // Allow ADL
 
@@ -290,7 +291,7 @@ namespace etl
     //*************************************************************************
     /// Swaps the values.
     //*************************************************************************
-    friend void swap(cyclic_value<T, FIRST, LAST>& lhs, cyclic_value<T, FIRST, LAST>& rhs)
+    friend void swap(cyclic_value<T, First, Last>& lhs, cyclic_value<T, First, Last>& rhs)
     {
       lhs.swap(rhs);
     }
@@ -298,7 +299,7 @@ namespace etl
     //*************************************************************************
     /// Operator ==.
     //*************************************************************************
-    friend bool operator == (const cyclic_value<T, FIRST, LAST>& lhs, const cyclic_value<T, FIRST, LAST>& rhs)
+    friend bool operator == (const cyclic_value<T, First, Last>& lhs, const cyclic_value<T, First, Last>& rhs)
     {
       return lhs.value == rhs.value;
     }
@@ -306,7 +307,7 @@ namespace etl
     //*************************************************************************
     /// Operator !=.
     //*************************************************************************
-    friend bool operator != (const cyclic_value<T, FIRST, LAST>& lhs, const cyclic_value<T, FIRST, LAST>& rhs)
+    friend bool operator != (const cyclic_value<T, First, Last>& lhs, const cyclic_value<T, First, Last>& rhs)
     {
       return !(lhs == rhs);
     }
@@ -317,15 +318,15 @@ namespace etl
   };
 
   //***************************************************************************
-  /// Provides a value that cycles between two limits.
+  /// Provides a value that cycles between two run time limits.
   /// Supports incrementing and decrementing.
   ///\tparam T     The type of the variable.
-  ///\tparam FIRST The first value of the range.
-  ///\tparam LAST  The last value of the range.
+  ///\tparam First The first value of the range.
+  ///\tparam Last  The last value of the range.
   ///\ingroup cyclic_value
   //***************************************************************************
-  template <typename T, T FIRST, T LAST>
-  class cyclic_value<T, FIRST, LAST, true>
+  template <typename T, T First, T Last>
+  class cyclic_value<T, First, Last, true>
   {
   public:
 
@@ -335,9 +336,9 @@ namespace etl
     /// The initial value is set to the first value.
     //*************************************************************************
     cyclic_value()
-      : value(FIRST),
-        first_value(FIRST),
-        last_value(LAST)
+      : value(First)
+      , first_value(First)
+      , last_value(Last)
     {
     }
 
@@ -348,9 +349,9 @@ namespace etl
     ///\param last  The last value in the range.
     //*************************************************************************
     cyclic_value(T first_, T last_)
-      : value(first_),
-        first_value(first_),
-        last_value(last_) 
+      : value(first_)
+      , first_value(first_)
+      , last_value(last_) 
     {
     }
 
@@ -372,9 +373,9 @@ namespace etl
     /// Copy constructor.
     //*************************************************************************
     cyclic_value(const cyclic_value& other)
-      : value(other.value),
-        first_value(other.first_value),
-        last_value(other.last_value)
+      : value(other.value)
+      , first_value(other.first_value)
+      , last_value(other.last_value)
     {
     }
 
@@ -570,7 +571,7 @@ namespace etl
     //*************************************************************************
     /// Swaps the values.
     //*************************************************************************
-    void swap(cyclic_value<T, FIRST, LAST>& other)
+    void swap(cyclic_value<T, First, Last>& other)
     {
       using ETL_OR_STD::swap; // Allow ADL
 
@@ -582,7 +583,7 @@ namespace etl
     //*************************************************************************
     /// Swaps the values.
     //*************************************************************************
-    friend void swap(cyclic_value<T, FIRST, LAST>& lhs, cyclic_value<T, FIRST, LAST>& rhs)
+    friend void swap(cyclic_value<T, First, Last>& lhs, cyclic_value<T, First, Last>& rhs)
     {
       lhs.swap(rhs);
     }
@@ -590,7 +591,7 @@ namespace etl
     //*************************************************************************
     /// Operator ==.
     //*************************************************************************
-    friend bool operator == (const cyclic_value<T, FIRST, LAST>& lhs, const cyclic_value<T, FIRST, LAST>& rhs)
+    friend bool operator == (const cyclic_value<T, First, Last>& lhs, const cyclic_value<T, First, Last>& rhs)
     {
       return (lhs.value       == rhs.value) &&
              (lhs.first_value == rhs.first_value) &&
@@ -600,7 +601,7 @@ namespace etl
     //*************************************************************************
     /// Operator !=.
     //*************************************************************************
-    friend bool operator != (const cyclic_value<T, FIRST, LAST>& lhs, const cyclic_value<T, FIRST, LAST>& rhs)
+    friend bool operator != (const cyclic_value<T, First, Last>& lhs, const cyclic_value<T, First, Last>& rhs)
     {
       return !(lhs == rhs);
     }
diff --git a/test/test_cyclic_value.cpp b/test/test_cyclic_value.cpp
index a15d1699..face6086 100644
--- a/test/test_cyclic_value.cpp
+++ b/test/test_cyclic_value.cpp
@@ -75,7 +75,14 @@ namespace
     //*************************************************************************
     TEST(test_set_compile_time)
     {
-      etl::cyclic_value<int, 2, 7> value;
+      using CV = etl::cyclic_value<int, 2, 7>;
+
+      CV value;
+
+      CHECK_EQUAL(2, value.first());
+      CHECK_EQUAL(7, value.last());
+      CHECK_EQUAL(2, CV::first());
+      CHECK_EQUAL(7, CV::last());
 
       value.set(5);
       CHECK_EQUAL(5, value.get());

From 676b5f330a2008e48b1ecfbc72f9247da8dbebbf Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 16 Apr 2024 08:06:01 +0100
Subject: [PATCH 126/131] Modified tests for <=> operator

---
 test/test_variant_variadic.cpp | 72 +++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/test/test_variant_variadic.cpp b/test/test_variant_variadic.cpp
index 39ae086f..6a7f9469 100644
--- a/test/test_variant_variadic.cpp
+++ b/test/test_variant_variadic.cpp
@@ -26,6 +26,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
+#include "unit_test_framework.h"
+
 #include "etl/private/variant_variadic.h"
 #include "etl/visitor.h"
 #include "etl/overload.h"
@@ -44,6 +46,28 @@ SOFTWARE.
 
 #if ETL_USING_CPP20
   #include <compare>
+
+  std::ostream& operator <<(std::ostream& os, const std::strong_ordering& ordering)
+  {
+    if (ordering == std::strong_ordering::equal)
+    {
+      os << "std::strong_ordering::equal";
+    }
+    else if (ordering == std::strong_ordering::equivalent)
+    {
+      os << "std::strong_ordering::equivalent";
+    }
+    else if (ordering == std::strong_ordering::greater)
+    {
+      os << "std::strong_ordering::greater";
+    }
+    else if (ordering == std::strong_ordering::less)
+    {
+      os << "std::strong_ordering::less";
+    }
+
+    return os;
+  }
 #endif
 
 #include "etl/private/diagnostic_useless_cast_push.h"
@@ -171,30 +195,6 @@ namespace
     return os;
   }
 
-#if ETL_USING_CPP20 && ETL_USING_STL
-  std::ostream& operator <<(std::ostream& os, const std::strong_ordering& ordering)
-  {
-    if (ordering == std::strong_ordering::equal)
-    {
-      os << "std::strong_ordering::equal";
-    }
-    else if (ordering == std::strong_ordering::equivalent)
-    {
-      os << "std::strong_ordering::equivalent";
-    }
-    else if (ordering == std::strong_ordering::greater)
-    {
-      os << "std::strong_ordering::greater";
-    }
-    else if (ordering == std::strong_ordering::less)
-    {
-      os << "std::strong_ordering::less";
-    }
-
-    return os;
-  }
-#endif
-
   typedef etl::variant<etl::monostate, D1, D2, D3, D4> test_variant_emplace;
 
   //*********************************************
@@ -324,7 +324,7 @@ namespace
 
 // Moved from the top of the file otherwise clang has issues with
 // operator<< for std::strong_ordering.
-#include "unit_test_framework.h"
+//#include "unit_test_framework.h"
 
 // Definitions for when the STL and compiler built-ins are not available.
 #if ETL_NOT_USING_STL && !defined(ETL_USE_TYPE_TRAITS_BUILTINS)
@@ -2024,20 +2024,20 @@ namespace
       Variant v_int_1(1);
       Variant v_int_2(2);
 
-      CHECK_EQUAL(std::strong_ordering::equal,   v_empty1 <=> v_empty2);
-      CHECK_EQUAL(std::strong_ordering::less,    v_empty1 <=> v_char_a);
-      CHECK_EQUAL(std::strong_ordering::greater, v_char_a <=> v_empty1);
+      CHECK(std::strong_ordering::equal   == v_empty1 <=> v_empty2);
+      CHECK(std::strong_ordering::less    == v_empty1 <=> v_char_a);
+      CHECK(std::strong_ordering::greater == v_char_a <=> v_empty1);
 
-      CHECK_EQUAL(std::strong_ordering::equal,   v_char_a <=> v_char_a);
-      CHECK_EQUAL(std::strong_ordering::less,    v_char_a <=> v_char_b);
-      CHECK_EQUAL(std::strong_ordering::greater, v_char_b <=> v_char_a);
+      CHECK(std::strong_ordering::equal   == v_char_a <=> v_char_a);
+      CHECK(std::strong_ordering::less    == v_char_a <=> v_char_b);
+      CHECK(std::strong_ordering::greater == v_char_b <=> v_char_a);
 
-      CHECK_EQUAL(std::strong_ordering::equal,   v_int_1 <=> v_int_1);
-      CHECK_EQUAL(std::strong_ordering::less,    v_int_1 <=> v_int_2);
-      CHECK_EQUAL(std::strong_ordering::greater, v_int_2 <=> v_int_1);
+      CHECK(std::strong_ordering::equal   == v_int_1 <=> v_int_1);
+      CHECK(std::strong_ordering::less    == v_int_1 <=> v_int_2);
+      CHECK(std::strong_ordering::greater == v_int_2 <=> v_int_1);
 
-      CHECK_EQUAL(std::strong_ordering::less,    v_char_a <=> v_int_1);
-      CHECK_EQUAL(std::strong_ordering::greater, v_int_2  <=> v_char_a);
+      CHECK(std::strong_ordering::less    == v_char_a <=> v_int_1);
+      CHECK(std::strong_ordering::greater == v_int_2  <=> v_char_a);
     }
 #endif
 

From 55f508b315932b362fcdd7056b991f10ffcfefe9 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 16 Apr 2024 08:07:33 +0100
Subject: [PATCH 127/131] Added etl::partition and etl::nth_element

---
 include/etl/algorithm.h | 81 +++++++++++++++++++++++++++++++++++++++++
 test/test_algorithm.cpp | 81 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 162 insertions(+)

diff --git a/include/etl/algorithm.h b/include/etl/algorithm.h
index 4d88910c..313a2c87 100644
--- a/include/etl/algorithm.h
+++ b/include/etl/algorithm.h
@@ -3140,6 +3140,87 @@ namespace etl
 
     return first;
   }
+
+  //*********************************************************
+  namespace private_algorithm
+  {
+    using ETL_OR_STD::swap;
+
+    template <typename TIterator, typename TCompare>
+#if (ETL_USING_CPP20 && ETL_USING_STL) || (ETL_USING_CPP14 && ETL_NOT_USING_STL && !defined(ETL_IN_UNIT_TEST))
+    constexpr
+#endif
+    TIterator nth_partition(TIterator first, TIterator last, TCompare compare)
+    {
+      typedef typename etl::iterator_traits<TIterator>::value_type value_type;
+
+      TIterator  pivot = last; // Maybe find a better pivot choice?
+      value_type pivot_value = *pivot;
+
+      // Swap the pivot with the last, if necessary.
+      if (pivot != last)
+      {
+        swap(*pivot, *last);
+      }
+
+      TIterator i = first;
+
+      for (TIterator j = first; j < last; ++j)
+      {
+        if (!compare(pivot_value, *j)) // Hack to get '*j <= pivot_value' in terms of 'pivot_value < *j'
+        {
+          swap(*i, *j);
+          ++i;
+        }
+      }
+
+      swap(*i, *last);
+
+      return i;
+    }
+  }
+
+  //*********************************************************
+  /// nth_element
+  /// see https://en.cppreference.com/w/cpp/algorithm/nth_element
+  //*********************************************************
+#if ETL_USING_CPP11
+  template <typename TIterator, typename TCompare = etl::less<typename etl::iterator_traits<TIterator>::value_type> >
+#else
+  template <typename TIterator, typename TCompare>
+#endif
+#if (ETL_USING_CPP20 && ETL_USING_STL) || (ETL_USING_CPP14 && ETL_NOT_USING_STL && !defined(ETL_IN_UNIT_TEST))
+  constexpr
+#endif
+  typename etl::enable_if<etl::is_random_access_iterator_concept<TIterator>::value, void>::type
+    nth_element(TIterator first, TIterator nth, TIterator last, TCompare compare = TCompare())
+  {
+    if (first == last)
+    {
+      return;
+    }
+
+    // 'last' must point to the actual last value.
+    --last;
+
+    while (first <= last)
+    {
+      TIterator p = private_algorithm::nth_partition(first, last, compare);
+
+      if (p == nth)
+      {
+        return;
+      }
+      else if (p > nth)
+      {
+        last = p - 1;
+      }
+      else
+      {
+        first = p + 1;
+      }
+    }
+  }
 }
 
 #include "private/minmax_pop.h"
diff --git a/test/test_algorithm.cpp b/test/test_algorithm.cpp
index b7e8e663..875884c6 100644
--- a/test/test_algorithm.cpp
+++ b/test/test_algorithm.cpp
@@ -2303,5 +2303,86 @@ namespace
         data = initial;
       }
     }
+
+    //*************************************************************************
+    TEST(nth_element_with_default_less_than_comparison)
+    {
+      // 40,320 permutations.
+      std::array<int, 8> initial = { 0, 1, 2, 3, 4, 5, 6, 7 };
+
+      std::array<int, 8> compare = initial;
+      std::array<int, 8> data    = initial;
+
+      bool complete = false;
+
+      // For each nth position of each permutation.
+      while (!complete)
+      {
+        // Try each nth position.
+        for (size_t i = 0; i < initial.size(); ++i)
+        {
+          std::sort(compare.begin(), compare.end());
+          etl::nth_element(data.begin(), data.begin() + i, data.end());
+
+          CHECK_EQUAL(compare[i], data[i]);
+        }
+
+        complete = !std::next_permutation(initial.begin(), initial.end());
+
+        compare = initial;
+        data    = initial;
+      }
+    }
+
+#if (ETL_USING_CPP20 && ETL_USING_STL) || (ETL_USING_CPP14 && ETL_NOT_USING_STL && !defined(ETL_IN_UNIT_TEST))
+    //*************************************************************************
+    constexpr int MakeNth(int nth_index)
+    {
+      std::array<int, 8> data = { 5, 1, 3, 7, 6, 2, 4, 0 };
+
+      etl::nth_element(data.begin(), data.begin() + nth_index, data.end());
+
+      return data[nth_index];
+    }
+    
+    TEST(constexpr_nth_element_with_default_less_than_comparison)
+    {
+      std::array<int, 8> compare = { 0, 1, 2, 3, 4, 5, 6, 7 };
+
+      constexpr int nth = MakeNth(3);
+
+      CHECK_EQUAL(compare[3], nth);
+    }
+#endif
+
+    //*************************************************************************
+    TEST(nth_element_with_custom_comparison)
+    {
+      // 40,320 permutations.
+      std::array<int, 8> initial = { 0, 1, 2, 3, 4, 5, 6, 7 };
+
+      std::array<int, 8> compare = initial;
+      std::array<int, 8> data = initial;
+
+      bool complete = false;
+
+      // For each nth position of each permutation.
+      while (!complete)
+      {
+        // Try each nth position.
+        for (size_t i = 0; i < initial.size(); ++i)
+        {
+          std::sort(compare.begin(), compare.end(), std::greater<int>());
+          etl::nth_element(data.begin(), data.begin() + i, data.end(), std::greater<int>());
+
+          CHECK_EQUAL(compare[i], data[i]);
+        }
+
+        complete = !std::next_permutation(initial.begin(), initial.end());
+
+        compare = initial;
+        data = initial;
+      }
+    }
   };
 }

From ae372afe8519dc170fddc78551d944d8a933de13 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 16 Apr 2024 08:08:35 +0100
Subject: [PATCH 128/131] Added conditional compilation for C++03 for
 etl::three_way_compare()

---
 include/etl/compare.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/etl/compare.h b/include/etl/compare.h
index e143366c..63208242 100644
--- a/include/etl/compare.h
+++ b/include/etl/compare.h
@@ -49,7 +49,7 @@ namespace etl
   template <typename T, typename TLess = etl::less<T> >
   struct compare
   {
-    enum  cmp_result
+    enum cmp_result
     {
       Less    = -1,
       Equal   = 0,
@@ -91,14 +91,18 @@ namespace etl
 
     static ETL_CONSTEXPR cmp_result cmp(first_argument_type lhs, second_argument_type rhs)
     {
-      return lt(lhs, rhs) ? cmp_result::Less : gt(lhs, rhs) ? cmp_result::Greater : cmp_result::Equal;
+      return lt(lhs, rhs) ? Less : gt(lhs, rhs) ? Greater : Equal;
     }
   };
 
   //***************************************************************************
   /// Default implementation of TLess is etl::less
   //***************************************************************************
-  template <typename T, typename TLess = etl::less<T>>
+#if ETL_USING_CPP11
+  template <typename T, typename TLess = etl::less<T> >
+#else
+  template <typename T, typename TLess>
+#endif
   ETL_CONSTEXPR14 int three_way_compare(const T& lhs, const T& rhs)
   {
     return etl::compare<T>::cmp(lhs, rhs);

From f12629b9d9c42e268a73f8fd3fc74a157693fba1 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 16 Apr 2024 08:08:57 +0100
Subject: [PATCH 129/131] Small format change

---
 include/etl/private/bitset_new.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/etl/private/bitset_new.h b/include/etl/private/bitset_new.h
index a439ffb4..cd9b28a9 100644
--- a/include/etl/private/bitset_new.h
+++ b/include/etl/private/bitset_new.h
@@ -168,7 +168,7 @@ namespace etl
     {
     public:
 
-      typedef TElement            element_type;
+      typedef TElement        element_type;
       typedef TElement*       pointer;
       typedef const TElement* const_pointer;
 

From ea9d5b0962978fe09d9b08f5729e4881a61726ff Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 16 Apr 2024 09:02:59 +0100
Subject: [PATCH 130/131] Changes for OSX + C++20 + STL compatibility

---
 include/etl/private/variant_variadic.h |  2 +-
 test/UnitTest++/Checks.h               | 25 ++++++++++++++++++++-----
 test/test_variant_variadic.cpp         |  2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/include/etl/private/variant_variadic.h b/include/etl/private/variant_variadic.h
index 97f8ce88..d1543f70 100644
--- a/include/etl/private/variant_variadic.h
+++ b/include/etl/private/variant_variadic.h
@@ -2010,7 +2010,7 @@ namespace etl
   /// Only defined if using C++20 and STL.
   /// https://en.cppreference.com/w/cpp/utility/variant/operator_cmp
   //***************************************************************************
-#if ETL_USING_CPP20 && ETL_USING_STL
+#if ETL_USING_CPP20 && ETL_USING_STL && !(defined(ETL_DEVELOPMENT_OS_APPLE) && defined(ETL_COMPILER_CLANG))
   template <typename... TTypes>
   ETL_CONSTEXPR14 
   std::common_comparison_category_t<std::compare_three_way_result_t<TTypes>...>
diff --git a/test/UnitTest++/Checks.h b/test/UnitTest++/Checks.h
index 88f1a1c3..501ab7ff 100644
--- a/test/UnitTest++/Checks.h
+++ b/test/UnitTest++/Checks.h
@@ -34,7 +34,7 @@ namespace UnitTest
   template <>
   inline std::string DisplayValue(const char& c)
   {
-    using type = std::char_traits<char>::int_type;
+    typedef std::char_traits<char>::int_type type;
 
     std::ostringstream oss;
 
@@ -47,7 +47,7 @@ namespace UnitTest
   template <>
   inline std::string DisplayValue(const char8_t& c)
   {
-    using type = std::char_traits<char8_t>::int_type;
+    typedef std::char_traits<char8_t>::int_type type;
 
     std::ostringstream oss;
 
@@ -60,7 +60,7 @@ namespace UnitTest
   template <>
   inline std::string DisplayValue(const wchar_t& c)
   {
-    using type = std::char_traits<wchar_t>::int_type;
+    typedef std::char_traits<wchar_t>::int_type type;
 
     std::ostringstream oss;
 
@@ -73,7 +73,7 @@ namespace UnitTest
   template <>
   inline std::string DisplayValue(const char16_t& c)
   {
-    using type = std::char_traits<char16_t>::int_type;
+    typedef std::char_traits<char16_t>::int_type type;
 
     std::ostringstream oss;
 
@@ -85,7 +85,7 @@ namespace UnitTest
   template <>
   inline std::string DisplayValue(const char32_t& c)
   {
-    using type = std::char_traits<char32_t>::int_type;
+    typedef std::char_traits<char32_t>::int_type type;
 
     std::ostringstream oss;
 
@@ -171,6 +171,7 @@ namespace UnitTest
      return !value;
    }
 
+#if __cplusplus >= 201103L
    template< typename Expected, typename Actual >
    void CheckEqual(TestResults& results, Expected&& expected, Actual&& actual, TestDetails const& details)
    {
@@ -183,6 +184,20 @@ namespace UnitTest
        results.OnTestFailure(details, stream.GetText());
      }
    }
+#else
+   template< typename Expected, typename Actual >
+   void CheckEqual(TestResults& results, Expected const& expected, Actual const& actual, TestDetails const& details)
+   {
+     if (!(expected == actual))
+     {
+       UnitTest::MemoryOutStream stream;
+       stream << "Expected "
+         << DisplayValue(expected) << " but was " << DisplayValue(actual);
+
+       results.OnTestFailure(details, stream.GetText());
+     }
+   }
+#endif
 
    template< typename Expected, typename Actual >
    void CheckEqualHex(TestResults& results, Expected const& expected, Actual const& actual, TestDetails const& details)
diff --git a/test/test_variant_variadic.cpp b/test/test_variant_variadic.cpp
index 6a7f9469..a9a7331e 100644
--- a/test/test_variant_variadic.cpp
+++ b/test/test_variant_variadic.cpp
@@ -2009,7 +2009,7 @@ namespace
     }
 #endif
 
-#if ETL_USING_CPP20 && ETL_USING_STL
+#if ETL_USING_CPP20 && ETL_USING_STL && !(defined(ETL_DEVELOPMENT_OS_APPLE) && defined(ETL_COMPILER_CLANG))
     //*************************************************************************
     TEST(test_variant_spaceship_operator)
     {

From 754eba9aaf696165e26a95581c52d26a98fd2d25 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 16 Apr 2024 09:41:44 +0100
Subject: [PATCH 131/131] Updated generator headers

---
 include/etl/generators/fsm_generator.h        | 57 ++++++++++++-------
 .../etl/generators/message_router_generator.h | 40 +++++++++----
 include/etl/message_router.h                  |  6 +-
 3 files changed, 71 insertions(+), 32 deletions(-)

diff --git a/include/etl/generators/fsm_generator.h b/include/etl/generators/fsm_generator.h
index 31985e4f..d0e029f7 100644
--- a/include/etl/generators/fsm_generator.h
+++ b/include/etl/generators/fsm_generator.h
@@ -188,6 +188,18 @@ namespace etl
     }
   };
 
+  //***************************************************************************
+  /// Exception for message received but not started.
+  //***************************************************************************
+  class fsm_not_started : public etl::fsm_exception
+  {
+  public:
+    fsm_not_started(string_type file_name_, numeric_type line_number_)
+      : etl::fsm_exception(ETL_ERROR_TEXT("fsm:not started", ETL_FSM_FILE_ID"F"), file_name_, line_number_)
+    {
+    }
+  };
+
   namespace private_fsm
   {
     template <typename T = void>
@@ -430,31 +442,38 @@ namespace etl
     //*******************************************
     void receive(const etl::imessage& message) ETL_OVERRIDE
     {
-      etl::fsm_state_id_t next_state_id = p_state->process_event(message);
-
-      if (have_changed_state(next_state_id))
+      if (is_started())
       {
-        ETL_ASSERT(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
-        etl::ifsm_state* p_next_state = state_list[next_state_id];
+        etl::fsm_state_id_t next_state_id = p_state->process_event(message);
 
-        do
+        if (have_changed_state(next_state_id))
+        {
+          ETL_ASSERT_OR_RETURN(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
+          etl::ifsm_state* p_next_state = state_list[next_state_id];
+
+          do
+          {
+            p_state->on_exit_state();
+            p_state = p_next_state;
+
+            next_state_id = p_state->on_enter_state();
+
+            if (have_changed_state(next_state_id))
+            {
+              ETL_ASSERT_OR_RETURN(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
+              p_next_state = state_list[next_state_id];
+            }
+          } while (p_next_state != p_state); // Have we changed state again?
+        }
+        else if (is_self_transition(next_state_id))
         {
           p_state->on_exit_state();
-          p_state = p_next_state;
-
-          next_state_id = p_state->on_enter_state();
-
-          if (have_changed_state(next_state_id))
-          {
-            ETL_ASSERT(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
-            p_next_state = state_list[next_state_id];
-          }
-        } while (p_next_state != p_state); // Have we changed state again?
+          p_state->on_enter_state();
+        }
       }
-      else if (is_self_transition(next_state_id))
+      else
       {
-        p_state->on_exit_state();
-        p_state->on_enter_state();
+        ETL_ASSERT_FAIL(ETL_ERROR(etl::fsm_not_started));
       }
     }
 
diff --git a/include/etl/generators/message_router_generator.h b/include/etl/generators/message_router_generator.h
index 02ed6736..35d47d70 100644
--- a/include/etl/generators/message_router_generator.h
+++ b/include/etl/generators/message_router_generator.h
@@ -354,11 +354,22 @@ namespace etl
     }
   };
 
+  //***************************************************************************
+  /// Is T ultimately derived from etl::imessage_router?
+  //***************************************************************************
+  template <typename T>
+  struct is_message_router : public etl::bool_constant<etl::is_base_of<etl::imessage_router, typename etl::remove_cvref<T>::type>::value>
+  {
+  };
+
   //***************************************************************************
   /// Send a message to a router.
   //***************************************************************************
-  static inline void send_message(etl::imessage_router& destination,
-                                  const etl::imessage&  message)
+  template <typename TRouter, typename TMessage>
+  static
+  typename etl::enable_if<etl::is_message_router<TRouter>::value && etl::is_message<TMessage>::value, void>::type
+    send_message(TRouter&        destination,
+                 const TMessage& message)
   {
     destination.receive(message);
   }
@@ -366,8 +377,11 @@ namespace etl
   //***************************************************************************
   /// Send a shared message to a router.
   //***************************************************************************
-  static inline void send_message(etl::imessage_router& destination,
-                                  etl::shared_message message)
+  template <typename TRouter>
+  static
+  typename etl::enable_if<etl::is_message_router<TRouter>::value, void>::type
+    send_message(TRouter&            destination,
+                 etl::shared_message message)
   {
     destination.receive(message);
   }
@@ -375,9 +389,12 @@ namespace etl
   //***************************************************************************
   /// Send a message to a router with a particular id.
   //***************************************************************************
-  static inline void send_message(etl::imessage_router& destination,
-                                  etl::message_router_id_t id,
-                                  const etl::imessage& message)
+  template <typename TRouter, typename TMessage>
+  static
+  typename etl::enable_if<etl::is_message_router<TRouter>::value && etl::is_message<TMessage>::value, void>::type
+    send_message(TRouter&                 destination,
+                 etl::message_router_id_t id,
+                 const TMessage&          message)
   {
     destination.receive(id, message);
   }
@@ -385,9 +402,12 @@ namespace etl
   //***************************************************************************
   /// Send a shared message to a router with a particular id.
   //***************************************************************************
-  static inline void send_message(etl::imessage_router& destination,
-                                  etl::message_router_id_t id,
-                                  etl::shared_message message)
+  template <typename TRouter>
+  static
+  typename etl::enable_if<etl::is_message_router<TRouter>::value, void>::type
+    send_message(TRouter&                 destination,
+                 etl::message_router_id_t id,
+                 etl::shared_message      message)
   {
     destination.receive(id, message);
   }
diff --git a/include/etl/message_router.h b/include/etl/message_router.h
index 63c726b2..3f846ef9 100644
--- a/include/etl/message_router.h
+++ b/include/etl/message_router.h
@@ -354,7 +354,7 @@ namespace etl
   /// Send a message to a router.
   //***************************************************************************
   template <typename TRouter, typename TMessage>
-  static 
+  static
   typename etl::enable_if<etl::is_message_router<TRouter>::value && etl::is_message<TMessage>::value, void>::type
     send_message(TRouter&        destination,
                  const TMessage& message)
@@ -366,7 +366,7 @@ namespace etl
   /// Send a shared message to a router.
   //***************************************************************************
   template <typename TRouter>
-  static 
+  static
   typename etl::enable_if<etl::is_message_router<TRouter>::value, void>::type
     send_message(TRouter&            destination,
                  etl::shared_message message)
@@ -378,7 +378,7 @@ namespace etl
   /// Send a message to a router with a particular id.
   //***************************************************************************
   template <typename TRouter, typename TMessage>
-  static 
+  static
   typename etl::enable_if<etl::is_message_router<TRouter>::value && etl::is_message<TMessage>::value, void>::type
     send_message(TRouter&                 destination,
                  etl::message_router_id_t id,