aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/libs/apache/arrow/patches/optional.patch
blob: c3eb7b68a11fd87cae31a22ea3885ae6463ee51c (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
--- a/cpp/src/arrow/util/optional.h
+++ b/cpp/src/arrow/util/optional.h
@@ -17,19 +17,17 @@
 
 #pragma once
 
-#define optional_CONFIG_SELECT_OPTIONAL optional_OPTIONAL_NONSTD
-
-#include "arrow/vendored/optional.hpp"  // IWYU pragma: export
+#include <optional>
 
 namespace arrow {
 namespace util {
 
 template <typename T>
-using optional = nonstd::optional<T>;
+using optional = std::optional<T>;
 
-using nonstd::bad_optional_access;
-using nonstd::make_optional;
-using nonstd::nullopt;
+using std::bad_optional_access;
+using std::make_optional;
+using std::nullopt;
 
 }  // namespace util
 }  // namespace arrow