From: Jason Merrill <jason@redhat.com>
Date: Tue, 16 Jul 2019 08:54:47 +0000 (-0400)
Subject: Add parens around constraint in <memory>.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e6c847fb8f90b1c119a677b81cfc294b13eb7772;p=gcc.git

Add parens around constraint in <memory>.

C++20 concepts require parens around atomic constraints that are not
primary-expressions.

	* include/std/memory (uses_allocator_construction_args): Add parens
	around constraint.

From-SVN: r273515
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8e96a898483..a88e73836b2 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-16  Jason Merrill  <jason@redhat.com>
+
+	* include/std/memory (uses_allocator_construction_args): Add parens
+	around constraint.
+
 2019-07-12  Jonathan Wakely  <jwakely@redhat.com>
 
 	* testsuite/29_atomics/atomic_float/1.cc: Fix comment.
diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory
index 3660f4d86de..3036802f8c3 100644
--- a/libstdc++-v3/include/std/memory
+++ b/libstdc++-v3/include/std/memory
@@ -261,7 +261,7 @@ get_pointer_safety() noexcept { return pointer_safety::relaxed; }
     uses_allocator_construction_args(const _Alloc& __a,
 				     _Args&&... __args) noexcept
 #if __cpp_concepts
-    requires ! _Std_pair<_Tp>
+    requires (! _Std_pair<_Tp>)
 #endif
     {
       return std::__uses_alloc_args<_Tp>(__a, std::forward<_Args>(__args)...);