"Fix issue TartanLlama#126"

Signed-off-by: Pranjali Puranik <[email protected]>
pnpuranik · Dec 19, 2022 · a46fe74 · a46fe74
1 parent b74fecd
commit a46fe74
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/include/tl/expected.hpp b/include/tl/expected.hpp
@@ -370,10 +370,12 @@ struct is_nothrow_swappable
     : std::integral_constant<
           bool,
           is_swappable<T, U>::value &&
-              ((decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value &&
-                detail::swap_adl_tests::is_std_swap_noexcept<T>::value) ||
+              ((decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value
+                    &&detail::swap_adl_tests::is_std_swap_noexcept<T>::value) ||
                (!decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value &&
-                detail::swap_adl_tests::is_adl_swap_noexcept<T, U>::value))> {};
+                    detail::swap_adl_tests::is_adl_swap_noexcept<T,
+                                                                 U>::value))> {
+};
 #endif
 #endif
 
@@ -511,7 +513,6 @@ template <class T, class E> struct expected_storage_base<T, E, true, true> {
                                            Args &&...args)
       : m_unexpect(il, std::forward<Args>(args)...), m_has_val(false) {}
 
-  ~expected_storage_base() = default;
   union {
     T m_val;
     unexpected<E> m_unexpect;
@@ -612,13 +613,13 @@ template <class T, class E> struct expected_storage_base<T, E, false, true> {
 
 // `T` is `void`, `E` is trivially-destructible
 template <class E> struct expected_storage_base<void, E, false, true> {
-  #if __GNUC__ <= 5
-  //no constexpr for GCC 4/5 bug
-  #else
+#if __GNUC__ <= 5
+// no constexpr for GCC 4/5 bug
+#else
   TL_EXPECTED_MSVC2015_CONSTEXPR
-  #endif 
+#endif
   expected_storage_base() : m_has_val(true) {}
-     
+
   constexpr expected_storage_base(no_init_t) : m_val(), m_has_val(false) {}
 
   constexpr expected_storage_base(in_place_t) : m_has_val(true) {}