From adfdcde7cd7097343c5e170e81e543631aaac3b5 Mon Sep 17 00:00:00 2001
From: Simon Brand <simon@codeplay.com>
Date: Thu, 30 Aug 2018 08:55:45 +0100
Subject: [PATCH] Fix VS2015 constexpr error

---
 tl/expected.hpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tl/expected.hpp b/tl/expected.hpp
index ce42c4d..c48cb38 100644
--- a/tl/expected.hpp
+++ b/tl/expected.hpp
@@ -557,10 +557,10 @@ template <class E> struct expected_storage_base<void, E, false, true> {
 
 // `T` is `void`, `E` is not trivially-destructible
 template <class E> struct expected_storage_base<void, E, false, false> {
-  constexpr expected_storage_base() : m_val(), m_has_val(true) {}
-  constexpr expected_storage_base(no_init_t) : m_no_init(), m_has_val(false) {}
+  constexpr expected_storage_base() : m_dummy(), m_has_val(true) {}
+  constexpr expected_storage_base(no_init_t) : m_dummy(), m_has_val(false) {}
 
-  constexpr expected_storage_base(in_place_t) : m_val(), m_has_val(true) {}
+  constexpr expected_storage_base(in_place_t) : m_dummy(), m_has_val(true) {}
 
   template <class... Args,
             detail::enable_if_t<std::is_constructible<E, Args &&...>::value> * =
@@ -582,10 +582,8 @@ template <class E> struct expected_storage_base<void, E, false, false> {
     }
   }
 
-  struct dummy {};
   union {
-    char m_no_init;
-    dummy m_val;
+    char m_dummy;
     unexpected<E> m_unexpect;
   };
   bool m_has_val;