Sync to ETL 20.43.3

Author: John Wellbelove

library.json

@@ -1,6 +1,6 @@
 {
   "name": "Embedded Template Library ETL",
-  "version": "20.43.2",
+  "version": "20.43.3",
   "authors": {
     "name": "John Wellbelove",
     "email": "[email protected]"

library.properties

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

src/etl/alignment.h

@@ -450,17 +450,10 @@ namespace etl
     template <typename... TArgs>
     reference create(TArgs&&... args) ETL_NOEXCEPT_EXPR(ETL_NOT_USING_EXCEPTIONS)
     {
-      if (has_value())
-      {
-        storage.value = T(args...);
-      }
-      else
-      {
-        valid = true;
-        ::new (&storage.value) value_type(etl::forward<TArgs>(args)...);
-      }
-
-      return storage.value;
+      ETL_ASSERT(!has_value(), ETL_ERROR(etl::typed_storage_error));
+      pointer p = ::new (&storage.value) value_type(etl::forward<TArgs>(args)...);
+      valid = true;
+      return *p;
     }
 #else
     //***************************************************************************
@@ -470,17 +463,10 @@ namespace etl
     template <typename T1>
     reference create(const T1& t1)
     {
-      if (has_value())
-      {
-        storage.value = T(t1);
-      }
-      else
-      {
-        valid = true;
-        ::new (&storage.value) value_type(t1);
-      }
-
-      return storage.value;
+      ETL_ASSERT(!has_value(), ETL_ERROR(etl::typed_storage_error));
+      pointer p = ::new (&storage.value) value_type(t1);
+      valid = true;
+      return *p;
     }
 
     //***************************************************************************
@@ -490,17 +476,10 @@ namespace etl
     template <typename T1, typename T2>
     reference create(const T1& t1, const T2& t2)
     {
-      if (has_value())
-      {
-        storage.value = T(t1, t2);
-      }
-      else
-      {
-        valid = true;
-        ::new (&storage.value) value_type(t1, t2);
-      }
-
-      return storage.value;
+      ETL_ASSERT(!has_value(), ETL_ERROR(etl::typed_storage_error));
+      pointer p = ::new (&storage.value) value_type(t1, t2);
+      valid = true;
+      return *p;
     }
 
     //***************************************************************************
@@ -510,17 +489,10 @@ namespace etl
     template <typename T1, typename T2, typename T3>
     reference create(const T1& t1, const T2& t2, const T3& t3)
     {
-      if (has_value())
-      {
-        storage.value = T(t1, t2, t3);
-      }
-      else
-      {
-        valid = true;
-        ::new (&storage.value) value_type(t1, t2, t3);
-      }
-
-      return storage.value;
+      ETL_ASSERT(!has_value(), ETL_ERROR(etl::typed_storage_error));
+      pointer p = ::new (&storage.value) value_type(t1, t2, t3);
+      valid = true;
+      return *p;
     }
 
     //***************************************************************************
@@ -530,17 +502,10 @@ namespace etl
     template <typename T1, typename T2, typename T3, typename T4>
     reference create(const T1& t1, const T2& t2, const T3& t3, const T4& t4)
     {
-      if (has_value())
-      {
-        storage.value = T(t1, t2, t3, t4);
-      }
-      else
-      {
-        valid = true;
-        ::new (&storage.value) value_type(t1, t2, t3, t4);
-      }
-
-      return storage.value;
+      ETL_ASSERT(!has_value(), ETL_ERROR(etl::typed_storage_error));
+      pointer p = ::new (&storage.value) value_type(t1, t2, t3, t4);
+      valid = true;
+      return *p;
     }
 #endif
 
@@ -684,6 +649,7 @@ namespace etl
       , valid(false)
     {
       ETL_ASSERT(etl::is_aligned(pbuffer_, etl::alignment_of<T>::value), ETL_ERROR(etl::alignment_error));
+      create(t1);
     }
 
     //***************************************************************************
@@ -744,62 +710,67 @@ namespace etl
 #if ETL_USING_CPP11
     //***************************************************************************
     /// Constructs the instance of T forwarding the given \p args to its constructor.
-    /// \returns the instance of T which has been constructed in the internal byte array.
+    /// \returns the instance of T which has been constructed in the external buffer.
     //***************************************************************************
     template <typename... TArgs>
     reference create(TArgs&&... args) ETL_NOEXCEPT_EXPR(ETL_NOT_USING_EXCEPTIONS)
     {
       ETL_ASSERT(!has_value(), ETL_ERROR(etl::typed_storage_error));
+      pointer p = ::new (pbuffer) value_type(etl::forward<TArgs>(args)...);
       valid = true;
-      return *::new (pbuffer) value_type(etl::forward<TArgs>(args)...);
+      return *p;
     }
 #else
     //***************************************************************************
     /// Constructs the instance of T with type T1
-    /// \returns the instance of T which has been constructed in the internal byte array.
+    /// \returns the instance of T which has been constructed in the external buffer.
     //***************************************************************************
     template <typename T1>
     reference create(const T1& t1)
     {
       ETL_ASSERT(!has_value(), ETL_ERROR(etl::typed_storage_error));
+      pointer p = ::new (pbuffer) value_type(t1);
       valid = true;
-      return *::new (pbuffer) value_type(t1);
+      return *p;
     }
 
     //***************************************************************************
     /// Constructs the instance of T with types T1, T2
-    /// \returns the instance of T which has been constructed in the internal byte array.
+    /// \returns the instance of T which has been constructed in the external buffer.
     //***************************************************************************
     template <typename T1, typename T2>
     reference create(const T1& t1, const T2& t2)
     {
       ETL_ASSERT(!has_value(), ETL_ERROR(etl::typed_storage_error));
+      pointer p = ::new (pbuffer) value_type(t1, t2);
       valid = true;
-      return *::new (pbuffer) value_type(t1, t2);
+      return *p;
     }
 
     //***************************************************************************
     /// Constructs the instance of T with types T1, T2, T3
-    /// \returns the instance of T which has been constructed in the internal byte array.
+    /// \returns the instance of T which has been constructed in the external buffer.
     //***************************************************************************
     template <typename T1, typename T2, typename T3>
     reference create(const T1& t1, const T2& t2, const T3& t3)
     {
       ETL_ASSERT(!has_value(), ETL_ERROR(etl::typed_storage_error));
+      pointer p = ::new (pbuffer) value_type(t1, t2, t3);
       valid = true;
-      return *::new (pbuffer) value_type(t1, t2, t3);
+      return *p;
     }
 
     //***************************************************************************
     /// Constructs the instance of T with types T1, T2, T3, T4
-    /// \returns the instance of T which has been constructed in the internal byte array.
+    /// \returns the instance of T which has been constructed in the external buffer.
     //***************************************************************************
     template <typename T1, typename T2, typename T3, typename T4>
     reference create(const T1& t1, const T2& t2, const T3& t3, const T4& t4)
     {
       ETL_ASSERT(!has_value(), ETL_ERROR(etl::typed_storage_error));
+      pointer p = ::new (pbuffer) value_type(t1, t2, t3, t4);
       valid = true;
-      return *::new (pbuffer) value_type(t1, t2, t3, t4);
+      return *p;
     }
 #endif