From e9ad58a76e8efe4d9529e66cbddb4da14ecf5e26 Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow.lists@gmail.com>
Date: Tue, 18 Nov 2014 16:15:00 +0000
Subject: [PATCH] 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
---
 libcxx/test/support/test_iterators.h | 105 -----------------------------------
 1 file changed, 105 deletions(-)

diff --git a/libcxx/test/support/test_iterators.h b/libcxx/test/support/test_iterators.h
index b91653d..e09fd83 100644
--- a/libcxx/test/support/test_iterators.h
+++ b/libcxx/test/support/test_iterators.h
@@ -306,108 +306,6 @@ operator-(const random_access_iterator<T>& x, const random_access_iterator<U>& y
     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<Iter> i) { return i.base(); }
 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; }
 
-- 
2.7.4