From 5202173ca7671ebe241cb4d9447dc4b1f2d3ec10 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 1 Feb 2022 13:52:49 -0800 Subject: Export of internal Abseil changes -- 121db1a08321eaa3006726cc32b459cf17880e35 by Derek Mauro : Internal change PiperOrigin-RevId: 425707805 -- 0dec484389bbb75aae0a412146e3564bf833a739 by Derek Mauro : macOS CI: Avoid depending on external sites like GitHub by prepopulating dependencies and setting --distdir Our Linux CI does this, but for some reason was never enabled on macOS PiperOrigin-RevId: 425668638 GitOrigin-RevId: 121db1a08321eaa3006726cc32b459cf17880e35 Change-Id: Id51645df90b6a0808dd5b18eb636a10f798e24ea --- absl/container/internal/inlined_vector.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'absl/container/internal/inlined_vector.h') diff --git a/absl/container/internal/inlined_vector.h b/absl/container/internal/inlined_vector.h index cd34a413..2baf26f3 100644 --- a/absl/container/internal/inlined_vector.h +++ b/absl/container/internal/inlined_vector.h @@ -925,8 +925,8 @@ auto Storage::Swap(Storage* other_storage_ptr) -> void { inlined_ptr->GetSize()); } ABSL_INTERNAL_CATCH_ANY { - allocated_ptr->SetAllocation( - {allocated_storage_view.data, allocated_storage_view.capacity}); + allocated_ptr->SetAllocation(Allocation{ + allocated_storage_view.data, allocated_storage_view.capacity}); ABSL_INTERNAL_RETHROW; } @@ -934,8 +934,8 @@ auto Storage::Swap(Storage* other_storage_ptr) -> void { inlined_ptr->GetInlinedData(), inlined_ptr->GetSize()); - inlined_ptr->SetAllocation( - {allocated_storage_view.data, allocated_storage_view.capacity}); + inlined_ptr->SetAllocation(Allocation{allocated_storage_view.data, + allocated_storage_view.capacity}); } swap(GetSizeAndIsAllocated(), other_storage_ptr->GetSizeAndIsAllocated()); -- cgit v1.2.3