diff options
Diffstat (limited to 'absl/container/internal')
-rw-r--r-- | absl/container/internal/inlined_vector.h | 8 | ||||
-rw-r--r-- | absl/container/internal/test_instance_tracker.h | 10 | ||||
-rw-r--r-- | absl/container/internal/test_instance_tracker_test.cc | 2 |
3 files changed, 14 insertions, 6 deletions
diff --git a/absl/container/internal/inlined_vector.h b/absl/container/internal/inlined_vector.h index b8b4f4ce3b39..6a5a75be1f20 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>::iterator_category, std::forward_iterator_tag>; -template <typename InlinedVector> -class Storage; - -template <template <typename, size_t, typename> class InlinedVector, typename T, - size_t N, typename A> -class Storage<InlinedVector<T, N, A>> { +template <typename T, size_t N, typename A> +class Storage { public: using allocator_type = A; using value_type = typename allocator_type::value_type; diff --git a/absl/container/internal/test_instance_tracker.h b/absl/container/internal/test_instance_tracker.h index 032d16d33ffa..3d4b2980ea8b 100644 --- a/absl/container/internal/test_instance_tracker.h +++ b/absl/container/internal/test_instance_tracker.h @@ -18,6 +18,8 @@ #include <cstdlib> #include <ostream> +#include "absl/types/compare.h" + namespace absl { namespace test_internal { @@ -96,6 +98,14 @@ class BaseCountedInstance { return value_ >= x.value_; } + absl::weak_ordering compare(const BaseCountedInstance& x) const { + ++num_comparisons_; + return value_ < x.value_ + ? absl::weak_ordering::less + : value_ == x.value_ ? absl::weak_ordering::equivalent + : absl::weak_ordering::greater; + } + int value() const { if (!is_live_) std::abort(); return value_; diff --git a/absl/container/internal/test_instance_tracker_test.cc b/absl/container/internal/test_instance_tracker_test.cc index 091f428da409..1c6a4fa7150d 100644 --- a/absl/container/internal/test_instance_tracker_test.cc +++ b/absl/container/internal/test_instance_tracker_test.cc @@ -174,6 +174,8 @@ TEST(TestInstanceTracker, Comparisons) { EXPECT_EQ(5, tracker.comparisons()); EXPECT_FALSE(one >= two); EXPECT_EQ(6, tracker.comparisons()); + EXPECT_TRUE(one.compare(two) < 0); // NOLINT + EXPECT_EQ(7, tracker.comparisons()); tracker.ResetCopiesMovesSwaps(); EXPECT_EQ(0, tracker.comparisons()); |