Target all versions of value() for suppression of MSVC warning C4702 (#81, thanks @rconde01)

martinmoene · martinmoene · commit f17940fabae0 · 2025-06-04T13:40:30.000+02:00
diff --git a/include/nonstd/expected.hpp b/include/nonstd/expected.hpp
@@ -2293,7 +2293,6 @@ class nsel_NODISCARD expected
             ? ( contained.value() )
             : ( error_traits<error_type>::rethrow( contained.error() ), contained.value() );
     }
-    nsel_RESTORE_MSVC_WARNINGS()
 
 #if !nsel_COMPILER_GNUC_VERSION || nsel_COMPILER_GNUC_VERSION >= 490
 
@@ -2312,6 +2311,7 @@ class nsel_NODISCARD expected
     }
 
 #endif
+    nsel_RESTORE_MSVC_WARNINGS()
 
     constexpr error_type const & error() const &
     {

Original file line number	Diff line number	Diff line change
`@@ -2293,7 +2293,6 @@ class nsel_NODISCARD expected`
`2293`	`2293`	`? ( contained.value() )`
`2294`	`2294`	`: ( error_traits<error_type>::rethrow( contained.error() ), contained.value() );`
`2295`	`2295`	`}`
`2296`		`- nsel_RESTORE_MSVC_WARNINGS()`
`2297`	`2296`
`2298`	`2297`	`#if !nsel_COMPILER_GNUC_VERSION \|\| nsel_COMPILER_GNUC_VERSION >= 490`
`2299`	`2298`
`@@ -2312,6 +2311,7 @@ class nsel_NODISCARD expected`
`2312`	`2311`	`}`
`2313`	`2312`
`2314`	`2313`	`#endif`
	`2314`	`+ nsel_RESTORE_MSVC_WARNINGS()`
`2315`	`2315`
`2316`	`2316`	`constexpr error_type const & error() const &`
`2317`	`2317`	`{`