From 36d37ab992038f52276ca66b9da80c1cf0f57dc2 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Thu, 25 Jul 2019 04:03:57 -0700 Subject: Export of internal Abseil changes. -- 1224e58a45e4d016b18f5a6cf5762ba33027017a by CJ Johnson : Unifies the growth factor of InlinedVector's mutating members to max(2 * capacity, req_capacity). In doing so, LegacyNextCapacityFrom(...) is removed thus removing a loop from several callsites. PiperOrigin-RevId: 259920301 -- 945fc0bf27b67ea77d39144dcb6a483dc879ceda by Laramie Leavitt : Cleanup header guards which do not reflect the correct style. PiperOrigin-RevId: 259881520 -- 8c7d0532ba9a9aabfd57f67552572b2b1bedda97 by Derek Mauro : Move log_severity sources to the new log_severity target. PiperOrigin-RevId: 259837015 GitOrigin-RevId: 1224e58a45e4d016b18f5a6cf5762ba33027017a Change-Id: Id19506c3b8db71a0d4391ee917bfef3e802d550d --- absl/container/inlined_vector.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'absl/container/inlined_vector.h') diff --git a/absl/container/inlined_vector.h b/absl/container/inlined_vector.h index 84ac67e..2381e65 100644 --- a/absl/container/inlined_vector.h +++ b/absl/container/inlined_vector.h @@ -279,7 +279,7 @@ class InlinedVector { // allocated heap. size_type capacity() const noexcept { return storage_.GetIsAllocated() ? storage_.GetAllocatedCapacity() - : static_cast(N); + : storage_.GetInlinedCapacity(); } // `InlinedVector::data()` -- cgit v1.2.3