From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 31 Jul 2019 19:08:56 +0000 (+0100)
Subject: Qualify call to prevent ADL
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3090082cbefd8b1374f237bd4242b554490b2933;p=gcc.git

Qualify call to prevent ADL

	* include/std/memory (make_obj_using_allocator): Qualify call to
	uses_allocator_construction_args.

From-SVN: r273945
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index edc551bbee0..e213f1796c4 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 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.
diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory
index 3036802f8c3..0a483d2d8d1 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<typename _Tp, typename _Alloc, typename... _Args>