From a1ee6deec594ee3a071bce3bd75de4bdd5b12b8a Mon Sep 17 00:00:00 2001
From: John Wellbelove <jwellbelove@users.noreply.github.com>
Date: Mon, 24 Oct 2022 17:15:25 +0100
Subject: [PATCH] Work-In-Progress

---
 include/etl/expected.h          | 12 +++++++++++-
 test/vs2019/etl.vcxproj         |  1 +
 test/vs2019/etl.vcxproj.filters |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/include/etl/expected.h b/include/etl/expected.h
index 991625b7..252008f2 100644
--- a/include/etl/expected.h
+++ b/include/etl/expected.h
@@ -95,6 +95,7 @@ namespace etl
       : error_value(etl::forward<Args>(args)...)
     {
     }
+#endif
 
 #if ETL_HAS_INITIALIZER_LIST
     //*******************************************
@@ -171,12 +172,14 @@ namespace etl
   //*****************************************************************************
   struct unexpect_t 
   {
-    explicit unexpect_t()
+    ETL_CONSTEXPR14 explicit unexpect_t()
     {
     }
   };
 
+#if ETL_CPP14_SUPPORTED
   inline ETL_CONSTEXPR14 unexpect_t unexpect{};
+#endif
 
   //*****************************************************************************
   /// Expected type.
@@ -471,7 +474,14 @@ namespace etl
   template<typename TError>
   class expected<void, TError>
   {
+  public:
 
+
+
+  private:
+
+    TError error;
+  };
 }
 
 
diff --git a/test/vs2019/etl.vcxproj b/test/vs2019/etl.vcxproj
index 63d366d5..c855b06b 100644
--- a/test/vs2019/etl.vcxproj
+++ b/test/vs2019/etl.vcxproj
@@ -2439,6 +2439,7 @@
     <ClInclude Include="..\..\include\etl\crc8_maxim.h" />
     <ClInclude Include="..\..\include\etl\crc8_rohc.h" />
     <ClInclude Include="..\..\include\etl\crc8_wcdma.h" />
+    <ClInclude Include="..\..\include\etl\expected.h" />
     <ClInclude Include="..\..\include\etl\message_broker.h" />
     <ClInclude Include="..\..\include\etl\poly_span.h" />
     <ClInclude Include="..\..\include\etl\private\bitset_legacy.h" />
diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters
index bb5c004e..fffd334e 100644
--- a/test/vs2019/etl.vcxproj.filters
+++ b/test/vs2019/etl.vcxproj.filters
@@ -1341,6 +1341,9 @@
     <ClInclude Include="..\..\include\etl\to_arithmetic.h">
       <Filter>ETL\Strings</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\etl\expected.h">
+      <Filter>ETL\Utilities</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\test_string_char.cpp">