diff options
Diffstat (limited to 'absl/types')
| -rw-r--r-- | absl/types/internal/optional.h | 4 | ||||
| -rw-r--r-- | absl/types/optional_test.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/absl/types/internal/optional.h b/absl/types/internal/optional.h index 8acbda2..d41ccc7 100644 --- a/absl/types/internal/optional.h +++ b/absl/types/internal/optional.h @@ -84,8 +84,8 @@ class optional_data_dtor_base { bool engaged_; // Data storage union { - dummy_type dummy_; T data_; + dummy_type dummy_; }; void destruct() noexcept { @@ -119,8 +119,8 @@ class optional_data_dtor_base<T, true> { bool engaged_; // Data storage union { - dummy_type dummy_; T data_; + dummy_type dummy_; }; void destruct() noexcept { engaged_ = false; } diff --git a/absl/types/optional_test.cc b/absl/types/optional_test.cc index e005aff..35efa86 100644 --- a/absl/types/optional_test.cc +++ b/absl/types/optional_test.cc @@ -944,7 +944,7 @@ TEST(optionalTest, Swap) { template <int v> struct DeletedOpAddr { - constexpr static const int value = v; + int value = v; constexpr DeletedOpAddr() = default; constexpr const DeletedOpAddr<v>* operator&() const = delete; // NOLINT DeletedOpAddr<v>* operator&() = delete; // NOLINT @@ -954,9 +954,9 @@ struct DeletedOpAddr { // to document the fact that the current implementation of absl::optional<T> // expects such usecases to be malformed and not compile. TEST(optionalTest, OperatorAddr) { - constexpr const int v = -1; + constexpr int v = -1; { // constexpr - constexpr const absl::optional<DeletedOpAddr<v>> opt(absl::in_place_t{}); + constexpr absl::optional<DeletedOpAddr<v>> opt(absl::in_place_t{}); static_assert(opt.has_value(), ""); // static_assert(opt->value == v, ""); static_assert((*opt).value == v, ""); |