Qualify call to prevent ADL

* include/std/memory (make_obj_using_allocator): Qualify call to uses_allocator_construction_args. From-SVN: r273945

Qualify call to prevent ADL
* include/std/memory (make_obj_using_allocator): Qualify call to uses_allocator_construction_args. From-SVN: r273945
3090082c · Jonathan Wakely · Jonathan Wakely · 10acaf4d · 3090082c · 3090082c
Commit 3090082c authored Jul 31, 2019 by Jonathan Wakely Committed by Jonathan Wakely Jul 31, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

libstdc++-v3/ChangeLog
+3 -0

libstdc++-v3/include/std/memory
+3 -2

No files found.
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
 2019-07-31  Jonathan Wakely  <jwakely@redhat.com>
+	* 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.

--- 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>(
+      return std::make_from_tuple<_Tp>(
-	    __a, std::forward<_Args>(__args)...));
+	  std::uses_allocator_construction_args<_Tp>(__a,
+	    std::forward<_Args>(__args)...));
    }
  template<typename _Tp, typename _Alloc, typename... _Args>