optional::operator=(nullopt_t) sets valid to false (#715)

* optional::operator=(nullopt_t) sets valid to false Fixes #714 * Add test case for #714
ETLCPP · Jun 17, 2023 · 96092d8 · 96092d8
1 parent f55fb92
commit 96092d8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/include/etl/optional.h b/include/etl/optional.h
@@ -720,6 +720,7 @@ namespace etl
     //***************************************************************************
     ETL_CONSTEXPR14 optional& operator =(etl::nullopt_t)
     {
+      valid = false;
       return *this;
     }
 

diff --git a/test/test_optional.cpp b/test/test_optional.cpp
@@ -493,6 +493,15 @@ namespace
       CHECK_TRUE(result.has_value());
       CHECK_EQUAL(2, result.value());
     }
+
+    //*************************************************************************
+    TEST(test_optional_pod_assign_bug_714)
+    {
+      etl::optional<int> o = 42;
+      o = etl::nullopt;
+
+      CHECK_EQUAL(false, o.has_value());
+    }
   };
 }