Sync to 20.38.11

ETLCPP · Feb 24, 2024 · 7336bdd · 7336bdd
1 parent f3c6a31
commit 7336bdd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
-  "name": "Embedded Template Library - Arduino",
-  "version": "20.38.10",
+  "name": "Embedded Template Library ETL",
+  "version": "20.38.11",
   "authors": {
     "name": "John Wellbelove",
     "email": "[email protected]"

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
-name=Embedded Template Library - Arduino
-version=20.38.10
+name=Embedded Template Library ETL
+version=20.38.11
 author= John Wellbelove <[email protected]>
 maintainer=John Wellbelove <[email protected]>
 license=MIT

diff --git a/src/etl/optional.h b/src/etl/optional.h
@@ -768,7 +768,10 @@ namespace etl
     {
       if (this != &other)
       {
-        storage.value = other.storage.value;
+        if (other.valid)
+        {
+          storage.value = other.storage.value;
+        }
         valid = other.valid;
       }
 
@@ -783,7 +786,10 @@ namespace etl
     {
       if (this != &other)
       {
-        storage.value = etl::move(other.storage.value);
+        if (other.valid)
+        {
+          storage.value = etl::move(other.storage.value);
+        }
         valid = other.valid;
       }
 

diff --git a/src/etl/version.h b/src/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)