feedc0de/optional
1
0
Fork 0
forked from TartanLlama/optional
Code Pull Requests Activity

More constexpr

Browse Source
This commit is contained in:
Simon Brand
2017-10-01 22:11:31 +01:00
parent 60e9b2867b
commit c82c8abde2
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
optional.hpp
View File

@@ -284,9 +284,9 @@ namespace tl {
constexpr optional_storage_base() noexcept constexpr optional_storage_base() noexcept
: m_dummy(), m_has_value(false) {} : m_dummy(), m_has_value(false) {}
template <class U> template <class... U>
constexpr optional_storage_base(in_place_t, U&& u) noexcept constexpr optional_storage_base(in_place_t, U&&... u) noexcept
: m_value(std::forward<U>(u)), m_has_value(true) {} : m_value(std::forward<U>(u)...), m_has_value(true) {}
~optional_storage_base() { ~optional_storage_base() {
if (m_has_value) { if (m_has_value) {
@@ -310,9 +310,9 @@ namespace tl {
: m_dummy(), m_has_value(false) {} : m_dummy(), m_has_value(false) {}
template <class U> template <class... U>
constexpr optional_storage_base(in_place_t, U&& u) noexcept constexpr optional_storage_base(in_place_t, U&&... u) noexcept
: m_value(std::forward<U>(u)), m_has_value(true) {} : m_value(std::forward<U>(u)...), m_has_value(true) {}
~optional_storage_base() = default; ~optional_storage_base() = default;
@@ -351,10 +351,8 @@ namespace tl {
} }
template <class... Args> template <class... Args>
constexpr explicit optional(enable_if_t<std::is_constructible<T, Args...>::value, in_place_t>, constexpr explicit optional(enable_if_t<std::is_constructible<T, Args...>::value, in_place_t>,
Args&&... args) { Args&&... args)
this->m_has_value = true; : base(in_place, std::forward<Args>(args)...) {}
new (std::addressof(this->m_value)) T (std::forward<Args>(args)...);
}
template <class U, class... Args> template <class U, class... Args>
constexpr explicit optional( constexpr explicit optional(
enable_if_t<std::is_constructible<T, std::initializer_list<U>&, Args&&...>::value, in_place_t>, enable_if_t<std::is_constructible<T, std::initializer_list<U>&, Args&&...>::value, in_place_t>,