diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2019-08-20 22:23:35 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2019-08-20 22:23:35 +0000 |
| commit | 4f41779cca7d9a14fdf273d0dd3e056bbb0d1320 (patch) | |
| tree | 13778b9bbf01c903c463e82e59a4da96a254254b /libcxx/include/algorithm | |
| parent | 89463fcfc715ad3dab43a99b49565ffbae9457a1 (diff) | |
| download | bcm5719-llvm-4f41779cca7d9a14fdf273d0dd3e056bbb0d1320.tar.gz bcm5719-llvm-4f41779cca7d9a14fdf273d0dd3e056bbb0d1320.zip | |
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
Diffstat (limited to 'libcxx/include/algorithm')
| -rw-r--r-- | libcxx/include/algorithm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index b90f33c6c85..55ea5eb2cc0 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 |
