From 3090082cbefd8b1374f237bd4242b554490b2933 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 31 Jul 2019 20:08:56 +0100 Subject: [PATCH] Qualify call to prevent ADL * include/std/memory (make_obj_using_allocator): Qualify call to uses_allocator_construction_args. From-SVN: r273945 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/include/std/memory | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index edc551b..e213f17 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2019-07-31 Jonathan Wakely + * include/std/memory (make_obj_using_allocator): Qualify call to + uses_allocator_construction_args. + P0631R4 Math Constants * include/Makefile.am: Add new header. * include/Makefile.in: Regenerate. diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory index 3036802..0a483d2 100644 --- a/libstdc++-v3/include/std/memory +++ b/libstdc++-v3/include/std/memory @@ -375,8 +375,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 -- 2.7.4