maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Since Eric poisoned the comma operator on all our test iterators, we no longer need 'comma_iterator'. Remove it from the test suite. 

llvm-svn: 222238
This commit is contained in:
Marshall Clow 2014-11-18 16:15:00 +00:00
parent cb6579c0f1
commit e9ad58a76e
1 changed files with 0 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,108 +306,6 @@ operator-(const random_access_iterator<T>& x, const random_access_iterator<U>& y
return x.base() - y.base(); return x.base() - y.base();
} }
template <class It>
class comma_iterator
{
It it_;
template <class U> friend class comma_iterator;
public:
typedef std::random_access_iterator_tag iterator_category;
typedef typename std::iterator_traits<It>::value_type value_type;
typedef typename std::iterator_traits<It>::difference_type difference_type;
typedef It pointer;
typedef typename std::iterator_traits<It>::reference reference;
It base() const {return it_;}
comma_iterator() : it_() {}
explicit comma_iterator(It it) : it_(it) {}
template <class U>
comma_iterator(const comma_iterator<U>& u) :it_(u.it_) {}
reference operator*() const {return *it_;}
pointer operator->() const {return it_;}
comma_iterator& operator++() {++it_; return *this;}
comma_iterator operator++(int)
{comma_iterator tmp(*this); ++(*this); return tmp;}
comma_iterator& operator--() {--it_; return *this;}
comma_iterator operator--(int)
{comma_iterator tmp(*this); --(*this); return tmp;}
comma_iterator& operator+=(difference_type n) {it_ += n; return *this;}
comma_iterator operator+(difference_type n) const
{comma_iterator tmp(*this); tmp += n; return tmp;}
friend comma_iterator operator+(difference_type n, comma_iterator x)
{x += n; return x;}
comma_iterator& operator-=(difference_type n) {return *this += -n;}
comma_iterator operator-(difference_type n) const
{comma_iterator tmp(*this); tmp -= n; return tmp;}
reference operator[](difference_type n) const {return it_[n];}
template <typename T>
void operator,(const T &) { assert(false); }
};
template <class T, class U>
inline
bool
operator==(const comma_iterator<T>& x, const comma_iterator<U>& y)
{
return x.base() == y.base();
}
template <class T, class U>
inline
bool
operator!=(const comma_iterator<T>& x, const comma_iterator<U>& y)
{
return !(x == y);
}
template <class T, class U>
inline
bool
operator<(const comma_iterator<T>& x, const comma_iterator<U>& y)
{
return x.base() < y.base();
}
template <class T, class U>
inline
bool
operator<=(const comma_iterator<T>& x, const comma_iterator<U>& y)
{
return !(y < x);
}
template <class T, class U>
inline
bool
operator>(const comma_iterator<T>& x, const comma_iterator<U>& y)
{
return y < x;
}
template <class T, class U>
inline
bool
operator>=(const comma_iterator<T>& x, const comma_iterator<U>& y)
{
return !(x < y);
}
template <class T, class U>
inline
typename std::iterator_traits<T>::difference_type
operator-(const comma_iterator<T>& x, const comma_iterator<U>& y)
{
return x.base() - y.base();
}
template <class Iter> template <class Iter>
inline Iter base(output_iterator<Iter> i) { return i.base(); } inline Iter base(output_iterator<Iter> i) { return i.base(); }
@ -423,9 +321,6 @@ inline Iter base(bidirectional_iterator<Iter> i) { return i.base(); }
template <class Iter> template <class Iter>
inline Iter base(random_access_iterator<Iter> i) { return i.base(); } inline Iter base(random_access_iterator<Iter> i) { return i.base(); }
template <class Iter>
inline Iter base(comma_iterator<Iter> i) { return i.base(); }
template <class Iter> // everything else template <class Iter> // everything else
inline Iter base(Iter i) { return i; } inline Iter base(Iter i) { return i; }