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)...) { } +#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 class expected { + 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 @@ + 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 @@ ETL\Strings + + ETL\Utilities +