diff options
| author |  Abseil Team <absl-team@google.com> | 2019-07-25 04:03:57 -0700 |
|---|---|---|
| committer |  Andy Getz <durandal@google.com> | 2019-07-25 18:02:32 -0400 |
| commit | 36d37ab992038f52276ca66b9da80c1cf0f57dc2 (patch) | |
| tree | 85b41d7f9cbe30df2e389130a94e0e5a54674b54 /absl/container/inlined_vector.h | |
| parent | ad1485c8986246b2ae9105e512738d0e97aec887 (diff) | |
Export of internal Abseil changes.
--
1224e58a45e4d016b18f5a6cf5762ba33027017a by CJ Johnson <johnsoncj@google.com>:
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 <lar@google.com>:
Cleanup header guards which do not reflect the correct style.
PiperOrigin-RevId: 259881520
--
8c7d0532ba9a9aabfd57f67552572b2b1bedda97 by Derek Mauro <dmauro@google.com>:
Move log_severity sources to the new log_severity target.
PiperOrigin-RevId: 259837015
GitOrigin-RevId: 1224e58a45e4d016b18f5a6cf5762ba33027017a
Change-Id: Id19506c3b8db71a0d4391ee917bfef3e802d550d
Diffstat (limited to 'absl/container/inlined_vector.h')
| -rw-r--r-- | absl/container/inlined_vector.h | 2 |
1 files changed, 1 insertions, 1 deletions
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<size_type>(N); + : storage_.GetInlinedCapacity(); } // `InlinedVector::data()` |