From 061151b45bcd00de6d0225c5ec0a59606b524d25 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 31 Jul 2019 20:56:12 +0100 Subject: [PATCH] Qualify call to prevent ADL Backport from mainline 2019-07-31 Jonathan Wakely * include/std/memory (make_obj_using_allocator): Qualify call to uses_allocator_construction_args. From-SVN: r273948 --- 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 02db69786221..78504c9d1023 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2019-07-31 Jonathan Wakely + + Backport from mainline + 2019-07-31 Jonathan Wakely + + * include/std/memory (make_obj_using_allocator): Qualify call to + uses_allocator_construction_args. + 2019-07-31 Jonathan Wakely Backport from mainline diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory index 8614abe1d3ac..b6950c76089a 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 -- 2.47.2