diff options
| author | Eric Fiselier <eric@efcs.ca> | 2014-10-27 20:26:25 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2014-10-27 20:26:25 +0000 |
| commit | 847ee13171e34a7cebf3cf9f7498a60f0cac8a4d (patch) | |
| tree | 187edd70ff03d85a746c386b123921c2891818cf /libcxx/include/algorithm | |
| parent | 8ef921a48b2cf8a4e4923a6210d2e96060ebce1d (diff) | |
| download | bcm5719-llvm-847ee13171e34a7cebf3cf9f7498a60f0cac8a4d.tar.gz bcm5719-llvm-847ee13171e34a7cebf3cf9f7498a60f0cac8a4d.zip | |
Fix use of operator comma in is_permutation and delete comma operator for test iterators.
The comma operators in the test iterators give better error messages when they
are deleted as opposed to not defined. Delete these functions when possible.
llvm-svn: 220715
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 e003a59e3f0..02cbc816f61 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -1327,7 +1327,7 @@ __is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1, forward_iterator_tag, forward_iterator_tag ) { // shorten sequences as much as possible by lopping of any equal parts - for (; __first1 != __last1 && __first2 != __last2; ++__first1, ++__first2) + for (; __first1 != __last1 && __first2 != __last2; ++__first1, (void) ++__first2) if (!__pred(*__first1, *__first2)) goto __not_done; return __first1 == __last1 && __first2 == __last2; |
