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

Marshall Clow via libcxx-commits libcxx-commits at lists.llvm.org
Tue Aug 20 15:23:36 PDT 2019


Author: marshall
Date: Tue Aug 20 15:23:35 2019
New Revision: 369463

URL: http://llvm.org/viewvc/llvm-project?rev=369463&view=rev
Log:
Add a missing _VSTD:: before a call to merge. Fixes PR43034. Checked the rest of 'algorithm' looking for unqualified calls. Didn't find any.

Modified:
    libcxx/trunk/include/algorithm

Modified: libcxx/trunk/include/algorithm
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/algorithm?rev=369463&r1=369462&r2=369463&view=diff
==============================================================================
--- libcxx/trunk/include/algorithm (original)
+++ libcxx/trunk/include/algorithm Tue Aug 20 15:23:35 2019
@@ -4382,7 +4382,7 @@ merge(_InputIterator1 __first1, _InputIt
 {
     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




More information about the libcxx-commits mailing list