projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
89463fc
)
Add a missing _VSTD:: before a call to merge. Fixes PR43034. Checked the rest of...
author
Marshall Clow
<mclow.lists@gmail.com>
Tue, 20 Aug 2019 22:23:35 +0000
(22:23 +0000)
committer
Marshall Clow
<mclow.lists@gmail.com>
Tue, 20 Aug 2019 22:23:35 +0000
(22:23 +0000)
llvm-svn: 369463
libcxx/include/algorithm
patch
|
blob
|
history
diff --git
a/libcxx/include/algorithm
b/libcxx/include/algorithm
index
b90f33c
..
55ea5eb
100644
(file)
--- 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