[libcxx] r222238 - Since Eric poisoned the comma operator on all our test iterators, we no longer need 'comma_iterator'. Remove it from the test suite.
Marshall Clow
mclow.lists at gmail.com
Tue Nov 18 08:15:00 PST 2014
Author: marshall
Date: Tue Nov 18 10:15:00 2014
New Revision: 222238
URL: http://llvm.org/viewvc/llvm-project?rev=222238&view=rev
Log:
Since Eric poisoned the comma operator on all our test iterators, we no longer need 'comma_iterator'. Remove it from the test suite.
Modified:
libcxx/trunk/test/support/test_iterators.h
Modified: libcxx/trunk/test/support/test_iterators.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/test_iterators.h?rev=222238&r1=222237&r2=222238&view=diff
==============================================================================
--- libcxx/trunk/test/support/test_iterators.h (original)
+++ libcxx/trunk/test/support/test_iterators.h Tue Nov 18 10:15:00 2014
@@ -306,108 +306,6 @@ operator-(const random_access_iterator<T
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>
inline Iter base(output_iterator<Iter> i) { return i.base(); }
@@ -423,9 +321,6 @@ inline Iter base(bidirectional_iterator<
template <class Iter>
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
inline Iter base(Iter i) { return i; }
More information about the cfe-commits
mailing list