commit 4dde9ccef57d50e50620408a0b7a902f0aba803e
author Marshall Clow <mclow.lists@gmail.com> Tue Aug 20 22:23:35 2019 +0000
committer Marshall Clow <mclow.lists@gmail.com> Tue Aug 20 22:23:35 2019 +0000
tree cd73cc73606bbdf2689f5008f3b2d78d01758eed
parent b9f7426583052cd164e8f6e9a907d331f0d421a5

Add a missing _VSTD:: before a call to merge. Fixes PR43034. Checked the rest of 'algorithm' looking for unqualified calls. Didn't find any.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@369463 91177308-0d34-0410-b5e6-96231b3b80d8

include/algorithm

diff --git a/include/algorithm b/include/algorithm
index b90f33c..55ea5eb 100644
--- a/include/algorithm
+++ b/include/algorithm
@@ -4382,7 +4382,7 @@
 {
     typedef typename iterator_traits<_InputIterator1>::value_type __v1;
     typedef typename iterator_traits<_InputIterator2>::value_type __v2;
-    return merge(__first1, __last1, __first2, __last2, __result, __less<__v1, __v2>());
+    return _VSTD::merge(__first1, __last1, __first2, __last2, __result, __less<__v1, __v2>());
 }
 
 // inplace_merge