about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2018-03-19T18·06-0700
committerkatzdm <katzdm@google.com>2018-03-19T19·38-0400
commit3837bd9aaeeb31aa397eef5fd2784b6674fba207 (patch)
treeea3938f5e8a24a594291f749df57f6cdfc07ce33
parenteed36bfba04dbe8a08ec72e631c3b337e4f2db11 (diff)
Changes imported from Abseil "staging" branch:
  - 7349efb2d18db3a019034f66502b67f7461c15ae Reword the noexcept specification for InlinedVector's def... by Jon Cohen <cohenjon@google.com>
  - f3576b18d039a0c8b533f05ac496fa8d7ff3b207 Remove an unneeded comment in call_once.h by Jon Cohen <cohenjon@google.com>

GitOrigin-RevId: 7349efb2d18db3a019034f66502b67f7461c15ae
Change-Id: I398888e6a82ccd69e23ffc0af9eb198d25e57e02
-rw-r--r--absl/base/call_once.h1
-rw-r--r--absl/container/inlined_vector.h3
2 files changed, 1 insertions, 3 deletions
diff --git a/absl/base/call_once.h b/absl/base/call_once.h
index 25c783e5f3e0..b5fbeae5858c 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<uint32_t>* ControlWord(absl::once_flag* flag);
 }  // namespace base_internal
 
diff --git a/absl/container/inlined_vector.h b/absl/container/inlined_vector.h
index feba87b58217..cb36dc756dfb 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<iterator>;
   using const_reverse_iterator = std::reverse_iterator<const_iterator>;
 
-  InlinedVector() noexcept(
-      std::is_nothrow_default_constructible<allocator_type>::value)
+  InlinedVector() noexcept(noexcept(allocator_type()))
       : allocator_and_tag_(allocator_type()) {}
 
   explicit InlinedVector(const allocator_type& alloc) noexcept