aboutsummaryrefslogtreecommitdiffhomepage
path: root/absl/container
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2019-01-30 20:33:55 -0800
committerGravatar Ashley Hedberg <ahedberg@google.com>2019-01-31 13:00:01 -0500
commitd78310fe5a82f2e0e6e16509ef8079c8d7e4674e (patch)
treecd4743565e27fb6c9c244d53d5ac54e29e784ce9 /absl/container
parenta4cb1c8ba61531a63f9d309eea01ac1d43d8371d (diff)
Export of internal Abseil changes.
-- 2c12ae8d6cbb8cbeb3ff446393578dd0d6d0cf8c by Andy Getzendanner <durandal@google.com>: Fix printf POSIX reference link to point at printf(3) (the C API) instead of printf(1) (the shell utility). PiperOrigin-RevId: 231719473 -- a36b3a0e539b5ca2033bb25438aa325ac84a285a by CJ Johnson <johnsoncj@google.com>: Fixes "correct" but poor semantics `allocator_and_tag_` initializations in InlinedVector to the proper version that gets a reference/const reference to allocator_type PiperOrigin-RevId: 231691608 -- de5eca5c7146a1e4692a201804817d98354d20ec by CJ Johnson <johnsoncj@google.com>: Removes pathologically deleted move constructor and assignment operator from benchmark test type PiperOrigin-RevId: 231680297 -- b2b52859e5f0e14a25047e528c8163b12ea9ca32 by Matt Armstrong <marmstrong@google.com>: Assert on elapsed time, not absolute time. This is a cosmetic change that aims to make test failures clearer. Human readers no longer need to do as much mental math to deduce the magnitude of the failure. It does not change the semantics of the test assertions. PiperOrigin-RevId: 231644805 GitOrigin-RevId: 2c12ae8d6cbb8cbeb3ff446393578dd0d6d0cf8c Change-Id: Ic121a26a7a6bb7441da6a8c1d7797bee4f705fdc
Diffstat (limited to 'absl/container')
-rw-r--r--absl/container/inlined_vector.h7
-rw-r--r--absl/container/inlined_vector_benchmark.cc3
2 files changed, 5 insertions, 5 deletions
diff --git a/absl/container/inlined_vector.h b/absl/container/inlined_vector.h
index 493bd8e..5c9e6d9 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());
}
}
diff --git a/absl/container/inlined_vector_benchmark.cc b/absl/container/inlined_vector_benchmark.cc
index a3ad0f8..9ca93b2 100644
--- a/absl/container/inlined_vector_benchmark.cc
+++ b/absl/container/inlined_vector_benchmark.cc
@@ -159,15 +159,14 @@ struct LargeCopyableOnly {
struct LargeCopyableSwappable {
LargeCopyableSwappable() : d(1024, 17) {}
+
LargeCopyableSwappable(const LargeCopyableSwappable& o) = default;
- LargeCopyableSwappable(LargeCopyableSwappable&& o) = delete;
LargeCopyableSwappable& operator=(LargeCopyableSwappable o) {
using std::swap;
swap(*this, o);
return *this;
}
- LargeCopyableSwappable& operator=(LargeCopyableSwappable&& o) = delete;
friend void swap(LargeCopyableSwappable& a, LargeCopyableSwappable& b) {
using std::swap;