From 5d99059bf94490dba41435166dff06c8b25cf381 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Mon, 11 Oct 2021 22:54:33 -0700 Subject: [PATCH] [wpiutil] Remove optional.h (#3627) This has been replaced fully by std::optional and deprecated for a year. --- .../src/main/native/include/wpi/optional.h | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 wpiutil/src/main/native/include/wpi/optional.h diff --git a/wpiutil/src/main/native/include/wpi/optional.h b/wpiutil/src/main/native/include/wpi/optional.h deleted file mode 100644 index 52b190da16..0000000000 --- a/wpiutil/src/main/native/include/wpi/optional.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) FIRST and other WPILib contributors. -// Open Source Software; you can modify and/or share it under the terms of -// the WPILib BSD license file in the root directory of this project. - -#ifndef WPIUTIL_WPI_OPTIONAL_H_ -#define WPIUTIL_WPI_OPTIONAL_H_ - -// clang-format off - -#ifdef _MSC_VER -#pragma message("warning: wpi/optional.h is deprecated; include instead") -#else -#warning "wpi/optional.h is deprecated; include instead" -#endif - -#include - -namespace wpi { - -template -using optional [[deprecated("use std::optional")]] = std::optional; - -using nullopt_t [[deprecated("use std::nullopt_t")]] = std::nullopt_t; - -[[deprecated("use std::nullopt")]] inline constexpr std::nullopt_t nullopt = - std::nullopt; - -} // namespace wpi - -// clang-format on - -#endif // WPIUTIL_WPI_OPTIONAL_H_