diff options
author | Abseil Team <absl-team@google.com> | 2018-10-22 11:04:58 -0700 |
---|---|---|
committer | Ashley Hedberg <ahedberg@google.com> | 2018-10-22 15:01:16 -0400 |
commit | c16d5557cd05119b5b7b1318ef778ebe3195b4a1 (patch) | |
tree | 35963478ea62b7d35bd1f72eb8cd81ca35677106 /absl/types | |
parent | 45221ccc4ed643e4209b0cc5798e97203f108fa8 (diff) |
Export of internal Abseil changes.
--
4e043a11b4c10a24e84046827ee16f47e11e35cc by Abseil Team <absl-team@google.com>:
Merge of https://github.com/abseil/abseil-cpp/pull/136
PiperOrigin-RevId: 218197648
--
e61f06e1e601061a443feaa8c5207c52437bd641 by Abseil Team <absl-team@google.com>:
Don't include <iostream> into int128, it's wasteful
Including iostream emits a global constructor for initializing std::cout and
friends, which isn't actually used by this file.
PiperOrigin-RevId: 218156386
--
8a6c82396e4c956be7f285328aec131cb4965f16 by Xiaoyi Zhang <zhangxy@google.com>:
Fix MSVC compiler warnings on discarding return values of functions with 'nodiscard'
attribute.
PiperOrigin-RevId: 217883401
--
abf3e3a0f22bc4070df9dbc9a4ef4d883ed686bf by Tom Manshreck <shreck@google.com>:
Update public README to add new libraries
PiperOrigin-RevId: 217879399
--
43b3b420a4e861711abbfbd497b8f2b3de17ec8c by Abseil Team <absl-team@google.com>:
Import of CCTZ from GitHub.
PiperOrigin-RevId: 217780963
--
1c8831947ca6a65a63842e6bd5f37a7c102a4e1b by Abseil Team <absl-team@google.com>:
Fix typo in a comment (missing comma in usage example).
PiperOrigin-RevId: 217776645
GitOrigin-RevId: 4e043a11b4c10a24e84046827ee16f47e11e35cc
Change-Id: I8999ae928da7a0030b4ecfd8d13da8522fdd013a
Diffstat (limited to 'absl/types')
-rw-r--r-- | absl/types/CMakeLists.txt | 10 | ||||
-rw-r--r-- | absl/types/optional_test.cc | 4 | ||||
-rw-r--r-- | absl/types/variant_test.cc | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/absl/types/CMakeLists.txt b/absl/types/CMakeLists.txt index 2f2e3a77..bc6c39e9 100644 --- a/absl/types/CMakeLists.txt +++ b/absl/types/CMakeLists.txt @@ -123,7 +123,7 @@ absl_library( # test any_test set(ANY_TEST_SRC "any_test.cc") -set(ANY_TEST_PUBLIC_LIBRARIES absl::base absl::throw_delegate absl::any absl::bad_any_cast test_instance_tracker_lib) +set(ANY_TEST_PUBLIC_LIBRARIES absl::base absl_internal_throw_delegate absl::any absl::bad_any_cast test_instance_tracker_lib) absl_test( TARGET @@ -152,7 +152,7 @@ set(ANY_EXCEPTION_SAFETY_TEST_SRC "any_exception_safety_test.cc") set(ANY_EXCEPTION_SAFETY_TEST_PUBLIC_LIBRARIES absl::any absl::base - absl_base_internal_exception_safety_testing + absl_internal_exception_safety_testing ) absl_test( @@ -169,7 +169,7 @@ absl_test( # test span_test set(SPAN_TEST_SRC "span_test.cc") -set(SPAN_TEST_PUBLIC_LIBRARIES absl::base absl::strings absl::throw_delegate absl::span test_instance_tracker_lib) +set(SPAN_TEST_PUBLIC_LIBRARIES absl::base absl::strings absl_internal_throw_delegate absl::span test_instance_tracker_lib) absl_test( TARGET @@ -197,7 +197,7 @@ absl_test( # test optional_test set(OPTIONAL_TEST_SRC "optional_test.cc") -set(OPTIONAL_TEST_PUBLIC_LIBRARIES absl::base absl::throw_delegate absl::optional absl_bad_optional_access) +set(OPTIONAL_TEST_PUBLIC_LIBRARIES absl::base absl_internal_throw_delegate absl::optional absl_bad_optional_access) absl_test( TARGET @@ -213,7 +213,7 @@ absl_test( set(OPTIONAL_EXCEPTION_SAFETY_TEST_SRC "optional_exception_safety_test.cc") set(OPTIONAL_EXCEPTION_SAFETY_TEST_PUBLIC_LIBRARIES absl::optional - absl_base_internal_exception_safety_testing + absl_internal_exception_safety_testing ) absl_test( diff --git a/absl/types/optional_test.cc b/absl/types/optional_test.cc index d90db9f8..fc4f00a4 100644 --- a/absl/types/optional_test.cc +++ b/absl/types/optional_test.cc @@ -1042,9 +1042,9 @@ TEST(optionalTest, Value) { // test exception throw on value() absl::optional<int> empty; #ifdef ABSL_HAVE_EXCEPTIONS - EXPECT_THROW(empty.value(), absl::bad_optional_access); + EXPECT_THROW((void)empty.value(), absl::bad_optional_access); #else - EXPECT_DEATH(empty.value(), "Bad optional access"); + EXPECT_DEATH((void)empty.value(), "Bad optional access"); #endif // test constexpr value() diff --git a/absl/types/variant_test.cc b/absl/types/variant_test.cc index bfb8bd7a..626d5e61 100644 --- a/absl/types/variant_test.cc +++ b/absl/types/variant_test.cc @@ -52,7 +52,7 @@ #endif // ABSL_HAVE_EXCEPTIONS #define ABSL_VARIANT_TEST_EXPECT_BAD_VARIANT_ACCESS(...) \ - ABSL_VARIANT_TEST_EXPECT_FAIL((__VA_ARGS__), absl::bad_variant_access, \ + ABSL_VARIANT_TEST_EXPECT_FAIL((void)(__VA_ARGS__), absl::bad_variant_access, \ "Bad variant access") struct Hashable {}; |