TartanLlama/optional
1
0
Fork 1
mirror of https://github.com/TartanLlama/optional.git synced 2025-07-30 01:47:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into cmake_love

Browse Source
This commit is contained in:
Simon Brand
2019-06-25 11:17:40 +01:00
parent 359499d904 d613d3422d
commit aef62df93e
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/tl/optional.hpp
View File

@ -1239,9 +1239,9 @@ public:
void
swap(optional &rhs) noexcept(std::is_nothrow_move_constructible<T>::value
&&detail::is_nothrow_swappable<T>::value) {
using std::swap;
if (has_value()) {
if (rhs.has_value()) {
using std::swap;
swap(**this, *rhs);
} else {
new (std::addressof(rhs.m_value)) T(std::move(this->m_value));
@ -1251,6 +1251,7 @@ public:
new (std::addressof(this->m_value)) T(std::move(rhs.m_value));
rhs.m_value.T::~T();
}
swap(this->m_has_value, rhs.m_has_value);
}
/// Returns a pointer to the stored value