diff options
| author |  Abseil Team <absl-team@google.com> | 2019-08-20 15:53:09 -0700 |
|---|---|---|
| committer |  Xiaoyi Zhang <zhangxy@google.com> | 2019-08-21 16:54:41 -0400 |
| commit | 262d74ba81b1fc4d71f459555cde8ecb39786d68 (patch) | |
| tree | a44b784bdc09e88c3e75ca9939eec064ead19c06 /absl | |
| parent | f0afae0d49af3e15a7169e019634d7719143d94d (diff) | |
Export of internal Abseil changes
--
1639d4832e961761060e61196e45948e25dc2676 by Derek Mauro <dmauro@google.com>:
Delete GCC 4.8 test script. GCC 4.8 is no longer supported.
PiperOrigin-RevId: 264485899
--
2a9b2182646b6c6675dce614dcce2c18174303d3 by Derek Mauro <dmauro@google.com>:
Make btree_test work with exceptions both enabled and disabled
PiperOrigin-RevId: 264473656
GitOrigin-RevId: 1639d4832e961761060e61196e45948e25dc2676
Change-Id: Ica58a2328fa261ecc4c4be410f68f97942074025
Diffstat (limited to 'absl')
| -rw-r--r-- | absl/container/BUILD.bazel | 1 | ||||
| -rw-r--r-- | absl/container/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | absl/container/btree_test.cc | 12 |
3 files changed, 8 insertions, 6 deletions
diff --git a/absl/container/BUILD.bazel b/absl/container/BUILD.bazel index ec890190..19c538bc 100644 --- a/absl/container/BUILD.bazel +++ b/absl/container/BUILD.bazel @@ -887,6 +887,7 @@ cc_test( ":btree_test_common", ":counting_allocator", ":test_instance_tracker", + "//absl/base:core_headers", "//absl/base:raw_logging_internal", "//absl/flags:flag", "//absl/hash:hash_testing", diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt index 638c2759..a6912220 100644 --- a/absl/container/CMakeLists.txt +++ b/absl/container/CMakeLists.txt @@ -75,6 +75,7 @@ absl_cc_test( absl::btree absl::btree_test_common absl::compare + absl::core_headers absl::counting_allocator absl::flags absl::hash_testing diff --git a/absl/container/btree_test.cc b/absl/container/btree_test.cc index 3ac97f89..d213ee61 100644 --- a/absl/container/btree_test.cc +++ b/absl/container/btree_test.cc @@ -25,6 +25,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" #include "absl/base/internal/raw_logging.h" +#include "absl/base/macros.h" #include "absl/container/btree_map.h" #include "absl/container/btree_set.h" #include "absl/container/internal/counting_allocator.h" @@ -1537,12 +1538,11 @@ TEST(Btree, MapAt) { const absl::btree_map<int, int> &const_map = map; EXPECT_EQ(const_map.at(1), 2); EXPECT_EQ(const_map.at(2), 8); - try { - map.at(3); - FAIL() << "Exception not thrown"; - } catch (const std::out_of_range& e) { - EXPECT_STREQ(e.what(), "absl::btree_map::at"); - } +#ifdef ABSL_HAVE_EXCEPTIONS + EXPECT_THROW(map.at(3), std::out_of_range); +#else + EXPECT_DEATH(map.at(3), "absl::btree_map::at"); +#endif } TEST(Btree, BtreeMultisetEmplace) { |