[llvm] b5f8d42 - [ADT] Deprecate Optional::{hasValue,getValue} (NFC)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Sun Aug 7 11:31:04 PDT 2022
Author: Kazu Hirata
Date: 2022-08-07T11:30:58-07:00
New Revision: b5f8d42efe3e246d582d4a1a328fac915e4ce8dc
URL: https://github.com/llvm/llvm-project/commit/b5f8d42efe3e246d582d4a1a328fac915e4ce8dc
DIFF: https://github.com/llvm/llvm-project/commit/b5f8d42efe3e246d582d4a1a328fac915e4ce8dc.diff
LOG: [ADT] Deprecate Optional::{hasValue,getValue} (NFC)
Differential Revision: https://reviews.llvm.org/D131349
Added:
Modified:
llvm/include/llvm/ADT/Optional.h
Removed:
################################################################################
diff --git a/llvm/include/llvm/ADT/Optional.h b/llvm/include/llvm/ADT/Optional.h
index e164dc01c8401..4f9e09837f2fe 100644
--- a/llvm/include/llvm/ADT/Optional.h
+++ b/llvm/include/llvm/ADT/Optional.h
@@ -92,13 +92,16 @@ class OptionalStorage {
}
constexpr bool has_value() const noexcept { return hasVal; }
- constexpr bool hasValue() const noexcept { return hasVal; }
+ [[deprecated("Use has_value instead.")]] constexpr bool
+ hasValue() const noexcept {
+ return hasVal;
+ }
T &value() &noexcept {
assert(hasVal);
return val;
}
- T &getValue() &noexcept {
+ [[deprecated("Use value instead.")]] T &getValue() &noexcept {
assert(hasVal);
return val;
}
@@ -106,7 +109,8 @@ class OptionalStorage {
assert(hasVal);
return val;
}
- constexpr T const &getValue() const &noexcept {
+ [[deprecated("Use value instead.")]] constexpr T const &
+ getValue() const &noexcept {
assert(hasVal);
return val;
}
@@ -114,7 +118,7 @@ class OptionalStorage {
assert(hasVal);
return std::move(val);
}
- T &&getValue() &&noexcept {
+ [[deprecated("Use value instead.")]] T &&getValue() &&noexcept {
assert(hasVal);
return std::move(val);
}
@@ -203,13 +207,16 @@ template <typename T> class OptionalStorage<T, true> {
}
constexpr bool has_value() const noexcept { return hasVal; }
- constexpr bool hasValue() const noexcept { return hasVal; }
+ [[deprecated("Use has_value instead.")]] constexpr bool
+ hasValue() const noexcept {
+ return hasVal;
+ }
T &value() &noexcept {
assert(hasVal);
return val;
}
- T &getValue() &noexcept {
+ [[deprecated("Use value instead.")]] T &getValue() &noexcept {
assert(hasVal);
return val;
}
@@ -217,7 +224,8 @@ template <typename T> class OptionalStorage<T, true> {
assert(hasVal);
return val;
}
- constexpr T const &getValue() const &noexcept {
+ [[deprecated("Use value instead.")]] constexpr T const &
+ getValue() const &noexcept {
assert(hasVal);
return val;
}
@@ -225,7 +233,7 @@ template <typename T> class OptionalStorage<T, true> {
assert(hasVal);
return std::move(val);
}
- T &&getValue() &&noexcept {
+ [[deprecated("Use value instead.")]] T &&getValue() &&noexcept {
assert(hasVal);
return std::move(val);
}
@@ -303,13 +311,19 @@ template <typename T> class Optional {
constexpr const T *getPointer() const { return &Storage.value(); }
T *getPointer() { return &Storage.value(); }
constexpr const T &value() const & { return Storage.value(); }
- constexpr const T &getValue() const & { return Storage.value(); }
+ [[deprecated("Use value instead.")]] constexpr const T &getValue() const & {
+ return Storage.value();
+ }
T &value() & { return Storage.value(); }
- T &getValue() & { return Storage.value(); }
+ [[deprecated("Use value instead.")]] T &getValue() & {
+ return Storage.value();
+ }
constexpr explicit operator bool() const { return has_value(); }
constexpr bool has_value() const { return Storage.has_value(); }
- constexpr bool hasValue() const { return Storage.has_value(); }
+ [[deprecated("Use has_value instead.")]] constexpr bool hasValue() const {
+ return Storage.has_value();
+ }
constexpr const T *operator->() const { return getPointer(); }
T *operator->() { return getPointer(); }
constexpr const T &operator*() const & { return value(); }
@@ -333,7 +347,9 @@ template <typename T> class Optional {
}
T &&value() && { return std::move(Storage.value()); }
- T &&getValue() && { return std::move(Storage.value()); }
+ [[deprecated("Use value instead.")]] T &&getValue() && {
+ return std::move(Storage.value());
+ }
T &&operator*() && { return std::move(Storage.value()); }
template <typename U> T value_or(U &&alt) && {
More information about the llvm-commits
mailing list