diff options
author | 2018-12-12 08:20:32 -0800 | |
---|---|---|
committer | 2018-12-12 11:52:06 -0500 | |
commit | 8fbcdb90952c57828c4a9c2f6d79fcd7cae9088f (patch) | |
tree | 85496d006c69fdb8d8626b9d51cec611d2363abd /absl/container/inlined_vector.h | |
parent | 455dc17ba1af9635f0b60155bc565bc572a1e722 (diff) |
Export of internal Abseil changes.
--
e7f892a0b9b313b434c5f9e9a2365b377204b60e by Abseil Team <absl-team@google.com>:
Remove internal CaseEqual helper now that we have the equivalent absl::EqualsIgnoreCase.
PiperOrigin-RevId: 225189084
--
722af2c74766d2fe3cee13c8dc886d39aedda597 by Abseil Team <absl-team@google.com>:
Add -Wno-extra-semi-stmt to silence that warning.
The [-Wno-extra-semi] is already disabled in the build. This
change will allow the build to remain consistent across newer
versions of clang which are now issuing a new similiar warning
[-Wextra-semi-stmt]:
https://clang.llvm.org/docs/ReleaseNotes.html#major-new-features
https://clang.llvm.org/docs/DiagnosticsReference.html#wextra-semi-stmt
PiperOrigin-RevId: 225185101
--
f7fd6244b4efcf0331631a54b7b0cf5f1f691a89 by CJ Johnson <johnsoncj@google.com>:
Move using directive in swap implementation
PiperOrigin-RevId: 225017825
--
3005841725df5b9cdb35c8a5319bb4c78b5dc2b7 by Abseil Team <absl-team@google.com>:
Update absl/strings/CMakeLists.txt to use new functions
i.e. absl_cc_(library|test)
PiperOrigin-RevId: 224860689
--
eeaf7099924b182472bfea3636ef6d9a39adfc50 by CJ Johnson <johnsoncj@google.com>:
Prefer public method over private for InlinedVector allocator access
PiperOrigin-RevId: 224825775
--
db9d218e3ca7ab400eef97778b720cb082a03281 by Eric Fiselier <ericwf@google.com>:
Take advantage of secret libc++ resize uninitialized function in string.
PiperOrigin-RevId: 224817877
GitOrigin-RevId: e7f892a0b9b313b434c5f9e9a2365b377204b60e
Change-Id: I051beee37ee03f0570bd2e068355ad75c8bdfcf8
Diffstat (limited to 'absl/container/inlined_vector.h')
-rw-r--r-- | absl/container/inlined_vector.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/absl/container/inlined_vector.h b/absl/container/inlined_vector.h index 0f100360..fe228001 100644 --- a/absl/container/inlined_vector.h +++ b/absl/container/inlined_vector.h @@ -149,7 +149,7 @@ class InlinedVector { // Creates a copy of `other` using `other`'s allocator. InlinedVector(const InlinedVector& other) - : InlinedVector(other, other.allocator()) {} + : InlinedVector(other, other.get_allocator()) {} // Creates a copy of `other` but with a specified allocator. InlinedVector(const InlinedVector& other, const allocator_type& alloc) @@ -793,9 +793,9 @@ class InlinedVector { // // Swaps the contents of this inlined vector with the contents of `other`. void swap(InlinedVector& other) { - using std::swap; // Augment ADL with `std::swap`. if (ABSL_PREDICT_FALSE(this == &other)) return; + using std::swap; // Augment ADL with `std::swap`. if (allocated() && other.allocated()) { // Both out of line, so just swap the tag, allocation, and allocator. swap(tag(), other.tag()); |