Use optional_constexpr14 with value_or_eval() (#67)

martinmoene · martinmoene · commit 76914b732383 · 2021-11-07T14:18:35.000+01:00
diff --git a/include/nonstd/optional.hpp b/include/nonstd/optional.hpp
@@ -1497,7 +1497,7 @@ class optional
 #if  optional_HAVE( REF_QUALIFIER )
 
     template< typename F >
-    optional_constexpr value_type value_or_eval( F f ) const &
+    optional_constexpr14 value_type value_or_eval( F f ) const &
     {
         if ( has_value() )
         {
@@ -1510,7 +1510,7 @@ class optional
     }
 
     template< typename F >
-    value_type value_or_eval( F f ) &&
+    optional_constexpr14 value_type value_or_eval( F f ) &&
     {
         if ( has_value() )
         {
@@ -1525,7 +1525,7 @@ class optional
 #else
 
     template< typename F >
-    optional_constexpr value_type value_or_eval( F f ) const
+    optional_constexpr14 value_type value_or_eval( F f ) const
     {
         if ( has_value() )
         {

Original file line number	Diff line number	Diff line change
`@@ -1497,7 +1497,7 @@ class optional`
`1497`	`1497`	`#if optional_HAVE( REF_QUALIFIER )`
`1498`	`1498`
`1499`	`1499`	`template< typename F >`
`1500`		`- optional_constexpr value_type value_or_eval( F f ) const &`
	`1500`	`+ optional_constexpr14 value_type value_or_eval( F f ) const &`
`1501`	`1501`	`{`
`1502`	`1502`	`if ( has_value() )`
`1503`	`1503`	`{`
`@@ -1510,7 +1510,7 @@ class optional`
`1510`	`1510`	`}`
`1511`	`1511`
`1512`	`1512`	`template< typename F >`
`1513`		`- value_type value_or_eval( F f ) &&`
	`1513`	`+ optional_constexpr14 value_type value_or_eval( F f ) &&`
`1514`	`1514`	`{`
`1515`	`1515`	`if ( has_value() )`
`1516`	`1516`	`{`
`@@ -1525,7 +1525,7 @@ class optional`
`1525`	`1525`	`#else`
`1526`	`1526`
`1527`	`1527`	`template< typename F >`
`1528`		`- optional_constexpr value_type value_or_eval( F f ) const`
	`1528`	`+ optional_constexpr14 value_type value_or_eval( F f ) const`
`1529`	`1529`	`{`
`1530`	`1530`	`if ( has_value() )`
`1531`	`1531`	`{`