diff options
author | Abseil Team <absl-team@google.com> | 2020-07-07 08:27:11 -0700 |
---|---|---|
committer | Gennadiy Rozental <rogeeff@google.com> | 2020-07-07 11:37:48 -0400 |
commit | bf655de09b67fd8b924814cbb369cb65ddd0bd24 (patch) | |
tree | fe73ac9c036d82843b99b3b364686f2eb57c0e24 /absl/container/btree_test.cc | |
parent | 38db52adb2eabc0969195b33b30763e0a1285ef9 (diff) |
Export of internal Abseil changes
--
13b7cb0eff8fda5127193e11dbe0b8655415b512 by Gennadiy Rozental <rogeeff@google.com>:
Change the preprocessor guards to properly exclude tests which does not build on older
version on libstdc++.
Fixes #731
PiperOrigin-RevId: 319987618
--
ab2155855b4dd1259a3dd9f48fbb5e6e8c2ccd3f by Derek Mauro <dmauro@google.com>:
Update clang-latest container to LLVM 052e1e0cfd9, Bazel 3.3.1, and CMake 3.17.3
PiperOrigin-RevId: 319835484
--
7554283733c309649a05b7f1891b2593e50f07b7 by Abseil Team <absl-team@google.com>:
Implement support for LOAD segments that don't start at p_vaddr==0.
PiperOrigin-RevId: 319694669
GitOrigin-RevId: 13b7cb0eff8fda5127193e11dbe0b8655415b512
Change-Id: I220c2af4169cf8e4dad20cb372589ec7def0e018
Diffstat (limited to 'absl/container/btree_test.cc')
-rw-r--r-- | absl/container/btree_test.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/absl/container/btree_test.cc b/absl/container/btree_test.cc index 1738d291..c5808074 100644 --- a/absl/container/btree_test.cc +++ b/absl/container/btree_test.cc @@ -2463,9 +2463,12 @@ TEST(Btree, EXPECT_THAT(s2, ElementsAre(IsEmpty(), ElementsAre(IsNull()))); } -// GCC 4.9 has a bug in the std::pair constructors that prevents explicit -// conversions between pair types. -#if defined(__clang__) || !defined(__GNUC__) || __GNUC__ >= 5 +// libstdc++ included with GCC 4.9 has a bug in the std::pair constructors that +// prevents explicit conversions between pair types. +// We only run this test for the libstdc++ from GCC 7 or newer because we can't +// reliably check the libstdc++ version prior to that release. +#if !defined(__GLIBCXX__) || \ + (defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE >= 7) TEST(Btree, MapRangeConstructorAndInsertSupportExplicitConversionComparable) { const std::pair<absl::string_view, int> names[] = {{"n1", 1}, {"n2", 2}}; |