Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-24 01:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace wpi::optional with C++17 std::optional (#1732)

Browse Source 
Keep wpi/optional.h as a shim with deprecated warnings.
This commit is contained in:
Peter Johnson
2019-06-29 11:20:22 -07:00
committed by GitHub
parent 0fbb0d989e
commit 4b1b92bb74
11 changed files with 52 additions and 2490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wpiutil/src/main/native/include/wpi/VersionTuple.h
View File

@@ -16,8 +16,8 @@
#define WPIUTIL_WPI_VERSIONTUPLE_H
#include "wpi/StringRef.h"
#include "wpi/optional.h"
#include "wpi/raw_ostream.h"
#include <optional>
#include <string>
#include <tuple>
@@ -68,23 +68,23 @@ public:
unsigned getMajor() const { return Major; }
/// Retrieve the minor version number, if provided.
optional<unsigned> getMinor() const {
std::optional<unsigned> getMinor() const {
if (!HasMinor)
return nullopt;
return std::nullopt;
return Minor;
}
/// Retrieve the subminor version number, if provided.
optional<unsigned> getSubminor() const {
std::optional<unsigned> getSubminor() const {
if (!HasSubminor)
return nullopt;
return std::nullopt;
return Subminor;
}
/// Retrieve the build version number, if provided.
optional<unsigned> getBuild() const {
std::optional<unsigned> getBuild() const {
if (!HasBuild)
return nullopt;
return std::nullopt;
return Build;
}