diff options
| -rw-r--r-- | libcxx/include/algorithm | 2 | ||||
| -rw-r--r-- | libcxx/test/support/test_iterators.h | 18 |
2 files changed, 14 insertions, 6 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; diff --git a/libcxx/test/support/test_iterators.h b/libcxx/test/support/test_iterators.h index 71509083e13..b91653dc9ff 100644 --- a/libcxx/test/support/test_iterators.h +++ b/libcxx/test/support/test_iterators.h @@ -13,6 +13,12 @@ #include <iterator> #include <cassert> +#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS +#define DELETE_FUNCTION = delete +#else +#define DELETE_FUNCTION +#endif + template <class It> class output_iterator { @@ -40,7 +46,7 @@ public: {output_iterator tmp(*this); ++(*this); return tmp;} template <class T> - void operator,(T const &); + void operator,(T const &) DELETE_FUNCTION; }; template <class It> @@ -76,7 +82,7 @@ public: {return !(x == y);} template <class T> - void operator,(T const &); + void operator,(T const &) DELETE_FUNCTION; }; template <class T, class U> @@ -128,7 +134,7 @@ public: {return !(x == y);} template <class T> - void operator,(T const &); + void operator,(T const &) DELETE_FUNCTION; }; template <class T, class U> @@ -179,7 +185,7 @@ public: {bidirectional_iterator tmp(*this); --(*this); return tmp;} template <class T> - void operator,(T const &); + void operator,(T const &) DELETE_FUNCTION; }; template <class T, class U> @@ -241,7 +247,7 @@ public: reference operator[](difference_type n) const {return it_[n];} template <class T> - void operator,(T const &); + void operator,(T const &) DELETE_FUNCTION; }; template <class T, class U> @@ -423,4 +429,6 @@ inline Iter base(comma_iterator<Iter> i) { return i.base(); } template <class Iter> // everything else inline Iter base(Iter i) { return i; } +#undef DELETE_FUNCTION + #endif // ITERATORS_H |
