Re-apply: use Fortran::common::optional for CUDA build

Meinersbur · Meinersbur · commit c829f91cec57 · 2024-10-22T12:26:48.000+02:00
diff --git a/flang/include/flang/Common/fast-int-set.h b/flang/include/flang/Common/fast-int-set.h
@@ -24,7 +24,7 @@
 #ifndef FORTRAN_COMMON_FAST_INT_SET_H_
 #define FORTRAN_COMMON_FAST_INT_SET_H_
 
-#include <optional>
+#include "optional.h"
 
 namespace Fortran::common {
 
@@ -83,9 +83,9 @@ template <int N> class FastIntSet {
     }
   }
 
-  std::optional<int> PopValue() {
+  optional<int> PopValue() {
     if (IsEmpty()) {
-      return std::nullopt;
+      return nullopt;
     } else {
       return value_[--size_];
     }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`#ifndef FORTRAN_COMMON_FAST_INT_SET_H_`
`25`	`25`	`#define FORTRAN_COMMON_FAST_INT_SET_H_`
`26`	`26`
`27`		`-#include <optional>`
	`27`	`+#include "optional.h"`
`28`	`28`
`29`	`29`	`namespace Fortran::common {`
`30`	`30`
`@@ -83,9 +83,9 @@ template <int N> class FastIntSet {`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`- std::optional<int> PopValue() {`
	`86`	`+ optional<int> PopValue() {`
`87`	`87`	`if (IsEmpty()) {`
`88`		`- return std::nullopt;`
	`88`	`+ return nullopt;`
`89`	`89`	`} else {`
`90`	`90`	`return value_[--size_];`
`91`	`91`	`}`