Add a missing _VSTD:: before a call to merge. Fixes PR43034. Checked the rest of...
authorMarshall Clow <mclow.lists@gmail.com>
Tue, 20 Aug 2019 22:23:35 +0000 (22:23 +0000)
committerMarshall Clow <mclow.lists@gmail.com>
Tue, 20 Aug 2019 22:23:35 +0000 (22:23 +0000)
llvm-svn: 369463

libcxx/include/algorithm

index b90f33c..55ea5eb 100644 (file)
@@ -4382,7 +4382,7 @@ merge(_InputIterator1 __first1, _InputIterator1 __last1,
 {
     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