diff options
Diffstat (limited to 'absl/container/inlined_vector.h')
| -rw-r--r-- | absl/container/inlined_vector.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/absl/container/inlined_vector.h b/absl/container/inlined_vector.h index 493bd8eb..5c9e6d97 100644 --- a/absl/container/inlined_vector.h +++ b/absl/container/inlined_vector.h @@ -53,7 +53,6 @@ #include "absl/memory/memory.h" namespace absl { - // ----------------------------------------------------------------------------- // InlinedVector // ----------------------------------------------------------------------------- @@ -159,7 +158,7 @@ class InlinedVector { // Creates a copy of `other` using `other`'s allocator. InlinedVector(const InlinedVector& other) - : InlinedVector(other, other.get_allocator()) {} + : InlinedVector(other, other.allocator()) {} // Creates a copy of `other` but with a specified allocator. InlinedVector(const InlinedVector& other, const allocator_type& alloc) @@ -187,17 +186,19 @@ class InlinedVector { InlinedVector(InlinedVector&& other) noexcept( absl::allocator_is_nothrow<allocator_type>::value || std::is_nothrow_move_constructible<value_type>::value) - : allocator_and_tag_(other.allocator_and_tag_) { + : allocator_and_tag_(other.allocator()) { if (other.allocated()) { // We can just steal the underlying buffer from the source. // That leaves the source empty, so we clear its size. init_allocation(other.allocation()); + tag().set_allocated_size(other.size()); other.tag() = Tag(); } else { UninitializedCopy( std::make_move_iterator(other.inlined_space()), std::make_move_iterator(other.inlined_space() + other.size()), inlined_space()); + tag().set_inline_size(other.size()); } } |