From b71e8fd5cd80be1e3e1e679693e98f5b690a68f4 Mon Sep 17 00:00:00 2001 From: "s.kolesnik" <7fosGbc9S> Date: Mon, 29 Mar 2021 15:51:01 +0500 Subject: [PATCH] added explicit initialization in the copy constructor due to occurring warning. reversed autoformatting --- include/tl/optional.hpp | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/include/tl/optional.hpp b/include/tl/optional.hpp index e53f98d..1a78a41 100644 --- a/include/tl/optional.hpp +++ b/include/tl/optional.hpp @@ -448,30 +448,22 @@ struct optional_copy_base : optional_operations_base { // This specialization is for when T is not trivially copy constructible template -struct optional_copy_base : optional_operations_base -{ - using optional_operations_base::optional_operations_base; +struct optional_copy_base : optional_operations_base { + using optional_operations_base::optional_operations_base; - optional_copy_base() = default; - - optional_copy_base(const optional_copy_base &rhs) - : optional_copy_base() - { - if (rhs.has_value()) - { - this->construct(rhs.get()); - } - else - { - this->m_has_value = false; - } + optional_copy_base() = default; + optional_copy_base(const optional_copy_base &rhs) + : optional_copy_base() { + if (rhs.has_value()) { + this->construct(rhs.get()); + } else { + this->m_has_value = false; } + } - optional_copy_base(optional_copy_base &&rhs) = default; - - optional_copy_base &operator=(const optional_copy_base &rhs) = default; - - optional_copy_base &operator=(optional_copy_base &&rhs) = default; + optional_copy_base(optional_copy_base &&rhs) = default; + optional_copy_base &operator=(const optional_copy_base &rhs) = default; + optional_copy_base &operator=(optional_copy_base &&rhs) = default; }; // This class manages conditionally having a trivial move constructor