optional.patch 622 B

123456789101112131415161718192021222324252627
  1. --- a/cpp/src/arrow/util/optional.h
  2. +++ b/cpp/src/arrow/util/optional.h
  3. @@ -17,19 +17,17 @@
  4. #pragma once
  5. -#define optional_CONFIG_SELECT_OPTIONAL optional_OPTIONAL_NONSTD
  6. -
  7. -#include "arrow/vendored/optional.hpp" // IWYU pragma: export
  8. +#include <optional>
  9. namespace arrow {
  10. namespace util {
  11. template <typename T>
  12. -using optional = nonstd::optional<T>;
  13. +using optional = std::optional<T>;
  14. -using nonstd::bad_optional_access;
  15. -using nonstd::make_optional;
  16. -using nonstd::nullopt;
  17. +using std::bad_optional_access;
  18. +using std::make_optional;
  19. +using std::nullopt;
  20. } // namespace util
  21. } // namespace arrow