From 2f1b34f9ffcbb94ac0ca60c79dabc5c20fc6fc11 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 26 Jul 2019 14:36:39 +0100 Subject: [PATCH] Add parens around constraint in . C++20 concepts require parens around atomic constraints that are not primary-expressions. Backport from mainline 2019-07-16 Jason Merrill * include/std/memory (uses_allocator_construction_args): Add parens around constraint. From-SVN: r273833 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/include/std/memory | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d60df1790cdc..e68a43ccc6c4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2019-07-26 Jonathan Wakely + + Backport from mainline + 2019-07-16 Jason Merrill + + * include/std/memory (uses_allocator_construction_args): Add parens + around constraint. + 2019-07-26 Jonathan Wakely Backport from mainline diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory index 81e9ea3518b7..8614abe1d3ac 100644 --- a/libstdc++-v3/include/std/memory +++ b/libstdc++-v3/include/std/memory @@ -231,7 +231,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)...); -- 2.47.2