From 3837bd9aaeeb31aa397eef5fd2784b6674fba207 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Mon, 19 Mar 2018 11:06:56 -0700 Subject: [PATCH] Changes imported from Abseil "staging" branch: - 7349efb2d18db3a019034f66502b67f7461c15ae Reword the noexcept specification for InlinedVector's def... by Jon Cohen - f3576b18d039a0c8b533f05ac496fa8d7ff3b207 Remove an unneeded comment in call_once.h by Jon Cohen GitOrigin-RevId: 7349efb2d18db3a019034f66502b67f7461c15ae Change-Id: I398888e6a82ccd69e23ffc0af9eb198d25e57e02 --- absl/base/call_once.h | 1 - absl/container/inlined_vector.h | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/absl/base/call_once.h b/absl/base/call_once.h index 25c783e5..b5fbeae5 100644 --- a/absl/base/call_once.h +++ b/absl/base/call_once.h @@ -43,7 +43,6 @@ namespace absl { class once_flag; namespace base_internal { -// Implementation detail. std::atomic* ControlWord(absl::once_flag* flag); } // namespace base_internal diff --git a/absl/container/inlined_vector.h b/absl/container/inlined_vector.h index feba87b5..cb36dc75 100644 --- a/absl/container/inlined_vector.h +++ b/absl/container/inlined_vector.h @@ -82,8 +82,7 @@ class InlinedVector { using reverse_iterator = std::reverse_iterator; using const_reverse_iterator = std::reverse_iterator; - InlinedVector() noexcept( - std::is_nothrow_default_constructible::value) + InlinedVector() noexcept(noexcept(allocator_type())) : allocator_and_tag_(allocator_type()) {} explicit InlinedVector(const allocator_type& alloc) noexcept