From 27c2f6e2f3b5929fbd322b0f0ca392eb02efd9f8 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 8 May 2019 14:20:43 -0700 Subject: Export of internal Abseil changes. -- 9fa04b5fb4b6aeb47226b9095b3bc36a53669c39 by Abseil Team : Release types/compare.h, which contains stand ins for three-way comparison result types from C++20. Use absl::weak_ordering for a three-way comparator in test-instance-tracker.h. PiperOrigin-RevId: 247290078 -- 70a762f4eb35ea1d5a5fcb3274a8086824a0b82c by Derek Mauro : Upgrade linux_clang-latest builds to LLVM r356814 and Bazel 0.25.0 PiperOrigin-RevId: 247250176 -- f305cd5c36561e4dbb69eb87568553ae5badcb15 by CJ Johnson : Remove argument deduction based on template template argument in InlinedVector/Storage PiperOrigin-RevId: 247232334 -- 2cab8e426838baceb7d08edb313416480d26aa5b by Eric Fiselier : Import of CCTZ from GitHub. PiperOrigin-RevId: 247140132 GitOrigin-RevId: 9fa04b5fb4b6aeb47226b9095b3bc36a53669c39 Change-Id: I373a7d9bc90befa2a9f06555cb8703610c0313b9 --- absl/container/BUILD.bazel | 1 + absl/container/CMakeLists.txt | 2 + absl/container/inlined_vector.h | 2 +- absl/container/internal/inlined_vector.h | 8 +- absl/container/internal/test_instance_tracker.h | 10 + .../internal/test_instance_tracker_test.cc | 2 + absl/copts/GENERATED_AbseilCopts.cmake | 2 + absl/copts/GENERATED_copts.bzl | 2 + absl/copts/copts.py | 2 + absl/hash/BUILD.bazel | 2 +- .../internal/cctz/include/cctz/civil_time_detail.h | 38 +- absl/time/internal/cctz/src/cctz_benchmark.cc | 50 ++ absl/types/BUILD.bazel | 24 + absl/types/CMakeLists.txt | 26 ++ absl/types/compare.h | 506 +++++++++++++++++++++ absl/types/compare_test.cc | 315 +++++++++++++ 16 files changed, 980 insertions(+), 12 deletions(-) create mode 100644 absl/types/compare.h create mode 100644 absl/types/compare_test.cc (limited to 'absl') diff --git a/absl/container/BUILD.bazel b/absl/container/BUILD.bazel index f25a9ff9..0488857e 100644 --- a/absl/container/BUILD.bazel +++ b/absl/container/BUILD.bazel @@ -213,6 +213,7 @@ cc_library( visibility = [ "//absl:__subpackages__", ], + deps = ["//absl/types:compare"], ) cc_test( diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt index 9531d7f9..1e203dbf 100644 --- a/absl/container/CMakeLists.txt +++ b/absl/container/CMakeLists.txt @@ -204,6 +204,8 @@ absl_cc_library( "internal/test_instance_tracker.cc" COPTS ${ABSL_DEFAULT_COPTS} + DEPS + absl::compare TESTONLY ) diff --git a/absl/container/inlined_vector.h b/absl/container/inlined_vector.h index 34e9aa0a..16865272 100644 --- a/absl/container/inlined_vector.h +++ b/absl/container/inlined_vector.h @@ -69,7 +69,7 @@ class InlinedVector { static_assert( N > 0, "InlinedVector cannot be instantiated with `0` inlined elements."); - using Storage = inlined_vector_internal::Storage; + using Storage = inlined_vector_internal::Storage; using AllocatorTraits = typename Storage::AllocatorTraits; template diff --git a/absl/container/internal/inlined_vector.h b/absl/container/internal/inlined_vector.h index b8b4f4ce..6a5a75be 100644 --- a/absl/container/internal/inlined_vector.h +++ b/absl/container/internal/inlined_vector.h @@ -31,12 +31,8 @@ using IsAtLeastForwardIterator = std::is_convertible< typename std::iterator_traits::iterator_category, std::forward_iterator_tag>; -template -class Storage; - -template