aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2019-07-16 04:54:47 -0400
committerJason Merrill <jason@gcc.gnu.org>2019-07-16 04:54:47 -0400
commite6c847fb8f90b1c119a677b81cfc294b13eb7772 (patch)
tree6787bdbc4ea95db4dbdf9c02c0b71c54a98e1101
parentfd860f7d441d1f414bb13f2b6e1be6c4addac11f (diff)
downloadgcc-e6c847fb8f90b1c119a677b81cfc294b13eb7772.zip
gcc-e6c847fb8f90b1c119a677b81cfc294b13eb7772.tar.gz
gcc-e6c847fb8f90b1c119a677b81cfc294b13eb7772.tar.bz2
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
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/std/memory2
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8e96a89..a88e738 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 3660f4d..3036802 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)...);