LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix use of operator comma in is_permutation and delete comma operator for test iterators.

Browse Source 
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.


git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@220715 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2014-10-27 20:26:25 +00:00
parent e4e883e6c8
commit 62a0e01343
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
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