commit bd7c7b55511a4b4b50b77559a44eff6d350224c4
author Marshall Clow <mclow.lists@gmail.com> Tue Sep 16 20:40:05 2014
committer Marshall Clow <mclow.lists@gmail.com> Tue Sep 16 20:40:05 2014
tree 323a695547c181abd6e84f3787a60275399b7384
parent f1e473bad91ade08503be6549c2cb4f229835327

Fix for mismatch to handle evil iterators which overload operator comma

llvm-svn: 217903

libcxx/include/algorithm

diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm
index 3ba104b..dbe888f 100644
--- a/libcxx/include/algorithm
+++ b/libcxx/include/algorithm
@@ -1140,7 +1140,7 @@
 mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
          _InputIterator2 __first2, _BinaryPredicate __pred)
 {
-    for (; __first1 != __last1; ++__first1, ++__first2)
+    for (; __first1 != __last1; ++__first1, (void) ++__first2)
         if (!__pred(*__first1, *__first2))
             break;
     return pair<_InputIterator1, _InputIterator2>(__first1, __first2);
@@ -1164,7 +1164,7 @@
          _InputIterator2 __first2, _InputIterator2 __last2,
          _BinaryPredicate __pred)
 {
-    for (; __first1 != __last1 && __first2 != __last2; ++__first1, ++__first2)
+    for (; __first1 != __last1 && __first2 != __last2; ++__first1, (void) ++__first2)
         if (!__pred(*__first1, *__first2))
             break;
     return pair<_InputIterator1, _InputIterator2>(__first1, __first2);