This commit is contained in:
Simon Brand committed 2018-06-08 12:35:38 +01:00
1 parent 72e23a137e
commit 414c1dafa1
2 files changed
+16

No files matched your search

+8
View File
@@ -1487,8 +1487,10 @@ public:
: ctor_base(detail::default_constructor_tag{}) {
if (rhs.has_value()) {
::new (valptr()) T(*rhs);
this->m_has_val = true;
} else {
::new (errptr()) unexpected_type(unexpected<E>(rhs.error()));
this->m_has_val = false;
}
}
@@ -1503,8 +1505,10 @@ public:
: ctor_base(detail::default_constructor_tag{}) {
if (rhs.has_value()) {
::new (valptr()) T(*rhs);
this->m_has_val = true;
} else {
::new (errptr()) unexpected_type(unexpected<E>(rhs.error()));
this->m_has_val = false;
}
}
@@ -1517,8 +1521,10 @@ public:
: ctor_base(detail::default_constructor_tag{}) {
if (rhs.has_value()) {
::new (valptr()) T(std::move(*rhs));
this->m_has_val = true;
} else {
::new (errptr()) unexpected_type(unexpected<E>(std::move(rhs.error())));
this->m_has_val = false;
}
}
@@ -1532,8 +1538,10 @@ public:
: ctor_base(detail::default_constructor_tag{}) {
if (rhs.has_value()) {
::new (valptr()) T(std::move(*rhs));
this->m_has_val = true;
} else {
::new (errptr()) unexpected_type(unexpected<E>(std::move(rhs.error())));
this->m_has_val = false;
}
}