--- 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 namespace arrow { namespace util { template -using optional = nonstd::optional; +using optional = std::optional; -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