diff options
| author |  Benjamin Barenblat <bbaren@google.com> | 2020-09-25 17:10:06 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2020-09-25 17:10:06 -0400 |
| commit | 4e1c98fe594d99494ce26e94a77f0358705f227c (patch) | |
| tree | a07e9daefa3b5acf716ce89fa1a1c9b500fde795 /absl/types/optional_test.cc | |
| parent | 7a1e14d0d29736ba9c2884d0ce81fc0af92f6ab3 (diff) | |
| parent | b56cbdd23834a65682c0b46f367f8679e83bc894 (diff) | |
Merge new upstream LTS 20200923
Diffstat (limited to 'absl/types/optional_test.cc')
| -rw-r--r-- | absl/types/optional_test.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/absl/types/optional_test.cc b/absl/types/optional_test.cc index 47d5c8a2..7ef142cb 100644 --- a/absl/types/optional_test.cc +++ b/absl/types/optional_test.cc @@ -1051,14 +1051,13 @@ TEST(optionalTest, Value) { #ifdef ABSL_HAVE_EXCEPTIONS EXPECT_THROW((void)empty.value(), absl::bad_optional_access); #else - EXPECT_DEATH((void)empty.value(), "Bad optional access"); + EXPECT_DEATH_IF_SUPPORTED((void)empty.value(), "Bad optional access"); #endif // test constexpr value() constexpr absl::optional<int> o1(1); static_assert(1 == o1.value(), ""); // const & -#if !defined(ABSL_SKIP_OVERLOAD_TEST_DUE_TO_MSVC_BUG) && \ - !defined(ABSL_SKIP_OVERLOAD_TEST_DUE_TO_GCC_BUG) +#if !defined(_MSC_VER) && !defined(ABSL_SKIP_OVERLOAD_TEST_DUE_TO_GCC_BUG) using COI = const absl::optional<int>; static_assert(2 == COI(2).value(), ""); // const && #endif @@ -1098,8 +1097,7 @@ TEST(optionalTest, DerefOperator) { constexpr absl::optional<int> opt1(1); static_assert(*opt1 == 1, ""); -#if !defined(ABSL_SKIP_OVERLOAD_TEST_DUE_TO_MSVC_BUG) && \ - !defined(ABSL_SKIP_OVERLOAD_TEST_DUE_TO_GCC_BUG) +#if !defined(_MSC_VER) && !defined(ABSL_SKIP_OVERLOAD_TEST_DUE_TO_GCC_BUG) using COI = const absl::optional<int>; static_assert(*COI(2) == 2, ""); #endif |