replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Eric Fiselier 2014-10-27 20:26:25 +00:00
parent 8ef921a48b
commit 847ee13171
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcxx/include/algorithm
View File

@ -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;

18
libcxx/test/support/test_iterators.h
View File

@ -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