From: Marshall Clow <mclow.lists@gmail.com>
Date: Tue, 20 Aug 2019 22:23:35 +0000 (+0000)
Subject: Add a missing _VSTD:: before a call to merge. Fixes PR43034. Checked the rest of... 
X-Git-Tag: llvmorg-11-init~11303
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f41779cca7d9a14fdf273d0dd3e056bbb0d1320;p=platform%2Fupstream%2Fllvm.git

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

llvm-svn: 369463
---

diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm
index b90f33c..55ea5eb 100644
--- a/libcxx/include/algorithm
+++ b/libcxx/include/algorithm
@@ -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