luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update optional implementation

Browse Source
This commit is contained in:
Jeremy 2023-09-11 10:31:41 -04:00
parent dd7b8eba9c
commit 55e4aaceb0
No known key found for this signature in database
GPG Key ID: 3E11861CB34E158C
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/platform/common.hpp
View File

@ -285,9 +285,9 @@ class optional {
}; };
public: public:
optional() {} optional() noexcept {}
optional(nullopt_t) {} optional(nullopt_t) noexcept {}
~optional() { ~optional() {
reset(); reset();
@ -299,7 +299,7 @@ public:
} }
} }
optional(optional&& other) : holds_value(other.holds_value) { optional(optional&& other) noexcept(std::is_nothrow_move_constructible<T>::value) : holds_value(other.holds_value) {
if(holds_value) { if(holds_value) {
new (static_cast<void*>(std::addressof(uvalue))) T(std::move(other.uvalue)); new (static_cast<void*>(std::addressof(uvalue))) T(std::move(other.uvalue));
} }
@ -311,7 +311,9 @@ public:
return *this; return *this;
} }
optional& operator=(optional&& other) { optional& operator=(optional&& other) noexcept(
std::is_nothrow_move_assignable<T>::value && std::is_nothrow_move_constructible<T>::value
) {
reset(); reset();
if(other.holds_value) { if(other.holds_value) {
new (static_cast<void*>(std::addressof(uvalue))) T(std::move(other.uvalue)); new (static_cast<void*>(std::addressof(uvalue))) T(std::move(other.uvalue));
@ -320,12 +322,18 @@ public:
return *this; return *this;
} }
template<class U = T, typename std::enable_if<!std::is_same<typename std::decay<U>::type, optional<T>>::value, int>::type = 0> template<
typename U = T,
typename std::enable_if<!std::is_same<typename std::decay<U>::type, optional<T>>::value, int>::type = 0
>
optional(U&& value) : holds_value(true) { optional(U&& value) : holds_value(true) {
new (static_cast<void*>(std::addressof(uvalue))) T(std::forward<U>(value)); new (static_cast<void*>(std::addressof(uvalue))) T(std::forward<U>(value));
} }
template<typename U = T, typename std::enable_if<!std::is_same<typename std::decay<U>::type, optional<T>>::value, int>::type = 0> template<
typename U = T,
typename std::enable_if<!std::is_same<typename std::decay<U>::type, optional<T>>::value, int>::type = 0
>
optional& operator=(U&& value) { optional& operator=(U&& value) {
if(holds_value) { if(holds_value) {
uvalue = std::forward<U>(value); uvalue = std::forward<U>(value);
@ -336,6 +344,11 @@ public:
return *this; return *this;
} }
optional& operator=(nullopt_t) noexcept {
reset();
return *this;
}
void swap(optional& other) { void swap(optional& other) {
if(holds_value && other.holds_value) { if(holds_value && other.holds_value) {
std::swap(uvalue, other.uvalue); std::swap(uvalue, other.uvalue);