[gcc/devel/omp/gcc-9] Qualify call to prevent ADL
Tobias Burnus
burnus@gcc.gnu.org
Thu Mar 5 14:13:00 GMT 2020
https://gcc.gnu.org/g:061151b45bcd00de6d0225c5ec0a59606b524d25
commit 061151b45bcd00de6d0225c5ec0a59606b524d25
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Wed Jul 31 20:56:12 2019 +0100
Qualify call to prevent ADL
Backport from mainline
2019-07-31 Jonathan Wakely <jwakely@redhat.com>
* include/std/memory (make_obj_using_allocator): Qualify call to
uses_allocator_construction_args.
From-SVN: r273948
Diff:
---
libstdc++-v3/ChangeLog | 8 ++++++++
libstdc++-v3/include/std/memory | 5 +++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 02db697..78504c9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -3,6 +3,14 @@
Backport from mainline
2019-07-31 Jonathan Wakely <jwakely@redhat.com>
+ * include/std/memory (make_obj_using_allocator): Qualify call to
+ uses_allocator_construction_args.
+
+2019-07-31 Jonathan Wakely <jwakely@redhat.com>
+
+ Backport from mainline
+ 2019-07-31 Jonathan Wakely <jwakely@redhat.com>
+
PR libstdc++/91308
* include/bits/unique_ptr.h (unique_ptr::__safe_conversion_up): Remove
constraints on deleter that should only apply to the constructor.
diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory
index 8614abe..b6950c7 100644
--- a/libstdc++-v3/include/std/memory
+++ b/libstdc++-v3/include/std/memory
@@ -345,8 +345,9 @@ get_pointer_safety() noexcept { return pointer_safety::relaxed; }
inline _Tp
make_obj_using_allocator(const _Alloc& __a, _Args&&... __args)
{
- return std::make_from_tuple<_Tp>(uses_allocator_construction_args<_Tp>(
- __a, std::forward<_Args>(__args)...));
+ return std::make_from_tuple<_Tp>(
+ std::uses_allocator_construction_args<_Tp>(__a,
+ std::forward<_Args>(__args)...));
}
template<typename _Tp, typename _Alloc, typename... _Args>
More information about the Libstdc++-cvs
mailing list