coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-05-01 03:19:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	include/etl/optional.h
This commit is contained in:
John Wellbelove 2024-01-28 20:38:08 +00:00
commit 19eff9d69e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/etl/optional.h
View File

@ -768,7 +768,11 @@ namespace etl
{
if (this != &other)
{
storage.value = other.storage.value;
if (other.valid)
{
storage.value = other.storage.value;
}
valid = other.valid;
}
@ -783,7 +787,7 @@ namespace etl
{
if (this != &other)
{
if (other.has_value())
if (other.valid)
{
storage.value = etl::move(other.storage.value);
}