cut guards for std::optional in folly::Optional

Summary: We may always assume C++17, and therefore `<optional>` and `std::optional`, to be available. Differential Revision: D55202536 fbshipit-source-id: 3b9f98583b13d9e86ff05f608ca1abd39161fe70
facebook · Mar 30, 2024 · 8203c08 · 8203c08
1 parent cbdc201
commit 8203c08
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/folly/Optional.h b/folly/Optional.h
@@ -62,13 +62,10 @@
 #include <cstddef>
 #include <functional>
 #include <new>
+#include <optional>
 #include <stdexcept>
 #include <type_traits>
 #include <utility>
-#if __cplusplus >= 201703L && __has_include(<optional>)
-#define FOLLY_HAS_STD_OPTIONAL
-#include <optional>
-#endif
 
 #include <folly/Portability.h>
 #include <folly/Traits.h>
@@ -182,8 +179,8 @@ class Optional {
     p.promise_->value_ = this;
   }
 
-// Conversions to ease migration to std::optional
-#ifdef FOLLY_HAS_STD_OPTIONAL
+  // Conversions to ease migration to std::optional
+
   /// Allow construction of Optional from std::optional.
   template <
       typename U,
@@ -219,7 +216,6 @@ class Optional {
     return storage_.hasValue ? std::optional<Value>(storage_.value)
                              : std::nullopt;
   }
-#endif
 
   /// Set the Optional
   /// @methodset Modifiers

diff --git a/folly/test/OptionalTest.cpp b/folly/test/OptionalTest.cpp
@@ -836,7 +836,6 @@ TEST(Optional, NoneMatchesNullopt) {
   EXPECT_FALSE(op.has_value());
 }
 
-#if __cplusplus >= 201703L && __has_include(<optional>)
 TEST(Optional, StdOptionalConversions) {
   folly::Optional<int> f = 42;
   std::optional<int> s = static_cast<std::optional<int>>(f);
@@ -858,7 +857,6 @@ TEST(Optional, StdOptionalConversions) {
   EXPECT_EQ(**fp, 42);
   EXPECT_FALSE(sp);
 }
-#endif
 
 TEST(Optional, MovedFromOptionalIsEmpty) {
   // moved-from folly::Optional is empty, unlike std::optional!