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 --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 02db69786221b6178277d95c9d43967103a450aa..78504c9d1023699bd8bce99a2ecb2709e8b7621d 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2019-07-31  Jonathan Wakely  <jwakely@redhat.com>
+
+       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

diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory
index 8614abe1d3acc2f443d331e1437c9584bf6844ad..b6950c76089a3a11ef9d38575906de48a72670ea 100644 (file)
--- 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>