[cfe-commits] [libcxx] r171452 - in /libcxx/trunk/test: ./ containers/ containers/associative/map/map.modifiers/ containers/associative/multimap/multimap.modifiers/ containers/associative/multiset/ containers/associative/multiset/multiset.cons/ containers/associative/set/ containers/associative/set/set.cons/ containers/sequences/deque/deque.cons/ containers/sequences/deque/deque.modifiers/ containers/sequences/deque/deque.special/ containers/sequences/forwardlist/forwardlist.cons/ containers/sequences/forwardlist/forw...
Marshall Clow
mclow at qualcomm.com
Wed Jan 2 18:29:36 PST 2013
Author: marshall
Date: Wed Jan 2 20:29:29 2013
New Revision: 171452
URL: http://llvm.org/viewvc/llvm-project?rev=171452&view=rev
Log:
Removed several more different 'iterators.h' files in libcxx/test
Added:
libcxx/trunk/test/iterators.h
- copied unchanged from r171443, libcxx/trunk/test/localization/iterators.h
Removed:
libcxx/trunk/test/containers/iterators.h
libcxx/trunk/test/iterators/iterators.h
libcxx/trunk/test/re/iterators.h
libcxx/trunk/test/re/re.traits/iterators.h
Modified:
libcxx/trunk/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
libcxx/trunk/test/containers/associative/multiset/insert_iter_iter.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
libcxx/trunk/test/containers/associative/set/insert_iter_iter.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/iter_iter.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.special/copy.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.special/move.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.special/move_backward.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.cons/input_iterator.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/insert_init.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/insert_range.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/insert_init.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/insert_range.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp
libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp
libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp
libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op!=/test.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp
libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.match/awk.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.match/basic.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.match/ecma.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.match/egrep.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.match/extended.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.match/grep.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.replace/test1.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.replace/test2.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.search/awk.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.search/basic.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.search/ecma.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.search/egrep.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.search/extended.pass.cpp
libcxx/trunk/test/re/re.alg/re.alg.search/grep.pass.cpp
libcxx/trunk/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp
libcxx/trunk/test/re/re.regex/re.regex.construct/iter_iter.pass.cpp
libcxx/trunk/test/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp
libcxx/trunk/test/re/re.results/re.results.form/form1.pass.cpp
libcxx/trunk/test/re/re.results/re.results.form/form2.pass.cpp
libcxx/trunk/test/re/re.traits/lookup_classname.pass.cpp
libcxx/trunk/test/re/re.traits/lookup_collatename.pass.cpp
libcxx/trunk/test/re/re.traits/transform.pass.cpp
libcxx/trunk/test/re/re.traits/transform_primary.pass.cpp
Modified: libcxx/trunk/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <map>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <map>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/multiset/insert_iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/insert_iter_iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/insert_iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/insert_iter_iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <set>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <set>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <set>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../test_compare.h"
#include "../../../test_allocator.h"
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <set>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../test_compare.h"
int main()
Modified: libcxx/trunk/test/containers/associative/set/insert_iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/insert_iter_iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/insert_iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/insert_iter_iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <set>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/set/set.cons/iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/iter_iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/iter_iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <set>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <set>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../test_compare.h"
#include "../../../test_allocator.h"
Modified: libcxx/trunk/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <set>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../test_compare.h"
int main()
Removed: libcxx/trunk/test/containers/iterators.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/iterators.h?rev=171451&view=auto
==============================================================================
--- libcxx/trunk/test/containers/iterators.h (original)
+++ libcxx/trunk/test/containers/iterators.h (removed)
@@ -1,251 +0,0 @@
-#ifndef ITERATORS_H
-#define ITERATORS_H
-
-#include <iterator>
-
-template <class It>
-class input_iterator
-{
- It it_;
-
- template <class U> friend class input_iterator;
-public:
- typedef std::input_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_;}
-
- input_iterator() : it_() {}
- explicit input_iterator(It it) : it_(it) {}
- template <class U>
- input_iterator(const input_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- input_iterator& operator++() {++it_; return *this;}
- input_iterator operator++(int)
- {input_iterator tmp(*this); ++(*this); return tmp;}
-
- friend bool operator==(const input_iterator& x, const input_iterator& y)
- {return x.it_ == y.it_;}
- friend bool operator!=(const input_iterator& x, const input_iterator& y)
- {return !(x == y);}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const input_iterator<T>& x, const input_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const input_iterator<T>& x, const input_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class It>
-class forward_iterator
-{
- It it_;
-
- template <class U> friend class forward_iterator;
-public:
- typedef std::forward_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_;}
-
- forward_iterator() : it_() {}
- explicit forward_iterator(It it) : it_(it) {}
- template <class U>
- forward_iterator(const forward_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- forward_iterator& operator++() {++it_; return *this;}
- forward_iterator operator++(int)
- {forward_iterator tmp(*this); ++(*this); return tmp;}
-
- friend bool operator==(const forward_iterator& x, const forward_iterator& y)
- {return x.it_ == y.it_;}
- friend bool operator!=(const forward_iterator& x, const forward_iterator& y)
- {return !(x == y);}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class It>
-class bidirectional_iterator
-{
- It it_;
-
- template <class U> friend class bidirectional_iterator;
-public:
- typedef std::bidirectional_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_;}
-
- bidirectional_iterator() : it_() {}
- explicit bidirectional_iterator(It it) : it_(it) {}
- template <class U>
- bidirectional_iterator(const bidirectional_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- bidirectional_iterator& operator++() {++it_; return *this;}
- bidirectional_iterator operator++(int)
- {bidirectional_iterator tmp(*this); ++(*this); return tmp;}
-
- bidirectional_iterator& operator--() {--it_; return *this;}
- bidirectional_iterator operator--(int)
- {bidirectional_iterator tmp(*this); --(*this); return tmp;}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class It>
-class random_access_iterator
-{
- It it_;
-
- template <class U> friend class random_access_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_;}
-
- random_access_iterator() : it_() {}
- explicit random_access_iterator(It it) : it_(it) {}
- template <class U>
- random_access_iterator(const random_access_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- random_access_iterator& operator++() {++it_; return *this;}
- random_access_iterator operator++(int)
- {random_access_iterator tmp(*this); ++(*this); return tmp;}
-
- random_access_iterator& operator--() {--it_; return *this;}
- random_access_iterator operator--(int)
- {random_access_iterator tmp(*this); --(*this); return tmp;}
-
- random_access_iterator& operator+=(difference_type n) {it_ += n; return *this;}
- random_access_iterator operator+(difference_type n) const
- {random_access_iterator tmp(*this); tmp += n; return tmp;}
- friend random_access_iterator operator+(difference_type n, random_access_iterator x)
- {x += n; return x;}
- random_access_iterator& operator-=(difference_type n) {return *this += -n;}
- random_access_iterator operator-(difference_type n) const
- {random_access_iterator tmp(*this); tmp -= n; return tmp;}
-
- reference operator[](difference_type n) const {return it_[n];}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class T, class U>
-inline
-bool
-operator<(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return x.base() < y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator<=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return !(y < x);
-}
-
-template <class T, class U>
-inline
-bool
-operator>(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return y < x;
-}
-
-template <class T, class U>
-inline
-bool
-operator>=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return !(x < y);
-}
-
-template <class T, class U>
-inline
-typename std::iterator_traits<T>::difference_type
-operator-(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return x.base() - y.base();
-}
-
-#endif // ITERATORS_H
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -15,7 +15,7 @@
#include <deque>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
std::deque<int>
make(int size, int start = 0 )
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp Wed Jan 2 20:29:29 2013
@@ -14,7 +14,7 @@
#include <deque>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
std::deque<int>
make(int size, int start = 0 )
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../stack_allocator.h"
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class InputIterator>
void
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp Wed Jan 2 20:29:29 2013
@@ -15,7 +15,7 @@
#include <deque>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../test_allocator.h"
template <class InputIterator, class Allocator>
Modified: libcxx/trunk/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -15,7 +15,7 @@
#include <deque>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../MoveOnly.h"
#include "../../../stack_allocator.h"
Modified: libcxx/trunk/test/containers/sequences/deque/deque.special/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.special/copy.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.special/copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.special/copy.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <deque>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
std::deque<int>
make(int size, int start = 0 )
Modified: libcxx/trunk/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <deque>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
std::deque<int>
make(int size, int start = 0 )
Modified: libcxx/trunk/test/containers/sequences/deque/deque.special/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.special/move.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.special/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.special/move.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <deque>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
std::deque<int>
make(int size, int start = 0 )
Modified: libcxx/trunk/test/containers/sequences/deque/deque.special/move_backward.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.special/move_backward.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.special/move_backward.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.special/move_backward.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <deque>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
std::deque<int>
make(int size, int start = 0 )
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp Wed Jan 2 20:29:29 2013
@@ -16,7 +16,7 @@
#include <cassert>
#include <iterator>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp Wed Jan 2 20:29:29 2013
@@ -16,7 +16,7 @@
#include <cassert>
#include <iterator>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <iterator>
#include "../../../test_allocator.h"
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp Wed Jan 2 20:29:29 2013
@@ -16,7 +16,7 @@
#include <forward_list>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/sequences/list/list.cons/input_iterator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/input_iterator.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.cons/input_iterator.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.cons/input_iterator.pass.cpp Wed Jan 2 20:29:29 2013
@@ -14,7 +14,7 @@
#include <list>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../stack_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -15,7 +15,7 @@
#include <vector>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class C, class Iterator>
void
Modified: libcxx/trunk/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp Wed Jan 2 20:29:29 2013
@@ -16,7 +16,7 @@
#include <vector>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class C, class Iterator>
void
Modified: libcxx/trunk/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -15,7 +15,7 @@
#include <vector>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -14,7 +14,7 @@
#include <vector>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../stack_allocator.h"
template <class C, class Iterator>
Modified: libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp Wed Jan 2 20:29:29 2013
@@ -15,7 +15,7 @@
#include <vector>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../stack_allocator.h"
template <class C, class Iterator>
Modified: libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -15,7 +15,7 @@
#include <vector>
#include <cassert>
#include "../../../stack_allocator.h"
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp Wed Jan 2 20:29:29 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp Wed Jan 2 20:29:29 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp Wed Jan 2 20:29:29 2013
@@ -22,7 +22,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp Wed Jan 2 20:29:29 2013
@@ -22,7 +22,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp Wed Jan 2 20:29:29 2013
@@ -23,7 +23,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
Modified: libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <string>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp Wed Jan 2 20:29:29 2013
@@ -20,7 +20,7 @@
#include <string>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp Wed Jan 2 20:29:29 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp Wed Jan 2 20:29:29 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp Wed Jan 2 20:29:29 2013
@@ -22,7 +22,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp Wed Jan 2 20:29:29 2013
@@ -22,7 +22,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp Wed Jan 2 20:29:29 2013
@@ -23,7 +23,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <string>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp Wed Jan 2 20:29:29 2013
@@ -20,7 +20,7 @@
#include <string>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/unord/unord.multiset/insert_init.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/insert_init.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/insert_init.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/insert_init.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <unordered_set>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/unord/unord.multiset/insert_range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/insert_range.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/insert_range.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/insert_range.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <unordered_set>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp Wed Jan 2 20:29:29 2013
@@ -20,7 +20,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
#include "../../../test_allocator.h"
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp Wed Jan 2 20:29:29 2013
@@ -20,7 +20,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
#include "../../../test_allocator.h"
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp Wed Jan 2 20:29:29 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
#include "../../../test_allocator.h"
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp Wed Jan 2 20:29:29 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
#include "../../../test_allocator.h"
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp Wed Jan 2 20:29:29 2013
@@ -22,7 +22,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
#include "../../../test_allocator.h"
Modified: libcxx/trunk/test/containers/unord/unord.set/insert_init.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/insert_init.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/insert_init.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/insert_init.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <unordered_set>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/unord/unord.set/insert_range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/insert_range.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/insert_range.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/insert_range.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <unordered_set>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp Wed Jan 2 20:29:29 2013
@@ -20,7 +20,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
#include "../../../test_allocator.h"
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp Wed Jan 2 20:29:29 2013
@@ -20,7 +20,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
#include "../../../test_allocator.h"
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp Wed Jan 2 20:29:29 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
#include "../../../test_allocator.h"
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp Wed Jan 2 20:29:29 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
#include "../../../test_allocator.h"
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp Wed Jan 2 20:29:29 2013
@@ -22,7 +22,7 @@
#include <cassert>
#include <cfloat>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
#include "../../../test_allocator.h"
Modified: libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp (original)
+++ libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp Wed Jan 2 20:29:29 2013
@@ -21,7 +21,7 @@
#include <iterator>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp (original)
+++ libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp Wed Jan 2 20:29:29 2013
@@ -20,7 +20,7 @@
#include <iterator>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp (original)
+++ libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp Wed Jan 2 20:29:29 2013
@@ -15,7 +15,7 @@
#include <iterator>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp (original)
+++ libcxx/trunk/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp Wed Jan 2 20:29:29 2013
@@ -15,7 +15,7 @@
#include <iterator>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class It>
void
Removed: libcxx/trunk/test/iterators/iterators.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/iterators.h?rev=171451&view=auto
==============================================================================
--- libcxx/trunk/test/iterators/iterators.h (original)
+++ libcxx/trunk/test/iterators/iterators.h (removed)
@@ -1,251 +0,0 @@
-#ifndef ITERATORS_H
-#define ITERATORS_H
-
-#include <iterator>
-
-template <class It>
-class input_iterator
-{
- It it_;
-
- template <class U> friend class input_iterator;
-public:
- typedef std::input_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_;}
-
- input_iterator() : it_() {}
- explicit input_iterator(It it) : it_(it) {}
- template <class U>
- input_iterator(const input_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- input_iterator& operator++() {++it_; return *this;}
- input_iterator operator++(int)
- {input_iterator tmp(*this); ++(*this); return tmp;}
-
- friend bool operator==(const input_iterator& x, const input_iterator& y)
- {return x.it_ == y.it_;}
- friend bool operator!=(const input_iterator& x, const input_iterator& y)
- {return !(x == y);}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const input_iterator<T>& x, const input_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const input_iterator<T>& x, const input_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class It>
-class forward_iterator
-{
- It it_;
-
- template <class U> friend class forward_iterator;
-public:
- typedef std::forward_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_;}
-
- forward_iterator() : it_() {}
- explicit forward_iterator(It it) : it_(it) {}
- template <class U>
- forward_iterator(const forward_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- forward_iterator& operator++() {++it_; return *this;}
- forward_iterator operator++(int)
- {forward_iterator tmp(*this); ++(*this); return tmp;}
-
- friend bool operator==(const forward_iterator& x, const forward_iterator& y)
- {return x.it_ == y.it_;}
- friend bool operator!=(const forward_iterator& x, const forward_iterator& y)
- {return !(x == y);}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class It>
-class bidirectional_iterator
-{
- It it_;
-
- template <class U> friend class bidirectional_iterator;
-public:
- typedef std::bidirectional_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_;}
-
- bidirectional_iterator() : it_() {}
- explicit bidirectional_iterator(It it) : it_(it) {}
- template <class U>
- bidirectional_iterator(const bidirectional_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- bidirectional_iterator& operator++() {++it_; return *this;}
- bidirectional_iterator operator++(int)
- {bidirectional_iterator tmp(*this); ++(*this); return tmp;}
-
- bidirectional_iterator& operator--() {--it_; return *this;}
- bidirectional_iterator operator--(int)
- {bidirectional_iterator tmp(*this); --(*this); return tmp;}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class It>
-class random_access_iterator
-{
- It it_;
-
- template <class U> friend class random_access_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_;}
-
- random_access_iterator() : it_() {}
- explicit random_access_iterator(It it) : it_(it) {}
- template <class U>
- random_access_iterator(const random_access_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- random_access_iterator& operator++() {++it_; return *this;}
- random_access_iterator operator++(int)
- {random_access_iterator tmp(*this); ++(*this); return tmp;}
-
- random_access_iterator& operator--() {--it_; return *this;}
- random_access_iterator operator--(int)
- {random_access_iterator tmp(*this); --(*this); return tmp;}
-
- random_access_iterator& operator+=(difference_type n) {it_ += n; return *this;}
- random_access_iterator operator+(difference_type n) const
- {random_access_iterator tmp(*this); tmp += n; return tmp;}
- friend random_access_iterator operator+(difference_type n, random_access_iterator x)
- {x += n; return x;}
- random_access_iterator& operator-=(difference_type n) {return *this += -n;}
- random_access_iterator operator-(difference_type n) const
- {random_access_iterator tmp(*this); tmp -= n; return tmp;}
-
- reference operator[](difference_type n) const {return it_[n];}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class T, class U>
-inline
-bool
-operator<(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return x.base() < y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator<=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return !(y < x);
-}
-
-template <class T, class U>
-inline
-bool
-operator>(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return y < x;
-}
-
-template <class T, class U>
-inline
-bool
-operator>=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return !(x < y);
-}
-
-template <class T, class U>
-inline
-typename std::iterator_traits<T>::difference_type
-operator-(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return x.base() - y.base();
-}
-
-#endif // ITERATORS_H
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp Wed Jan 2 20:29:29 2013
@@ -20,7 +20,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.%2B/difference_type.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.%2B%3D/difference_type.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-%3D/difference_type.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It, class U>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp Wed Jan 2 20:29:29 2013
@@ -15,7 +15,7 @@
#include <iterator>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -16,7 +16,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp Wed Jan 2 20:29:29 2013
@@ -16,7 +16,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp Wed Jan 2 20:29:29 2013
@@ -16,7 +16,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp Wed Jan 2 20:29:29 2013
@@ -16,7 +16,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp Wed Jan 2 20:29:29 2013
@@ -16,7 +16,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp Wed Jan 2 20:29:29 2013
@@ -20,7 +20,7 @@
#include <memory>
#endif
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op%3D/move_iterator.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It, class U>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp Wed Jan 2 20:29:29 2013
@@ -26,7 +26,7 @@
#include <iterator>
#include <type_traits>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp Wed Jan 2 20:29:29 2013
@@ -15,7 +15,7 @@
#include <iterator>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -16,7 +16,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It, class U>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op!=/test.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op%21%3D/test.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op!=/test.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op!=/test.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op%2B%2B/post.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp Wed Jan 2 20:29:29 2013
@@ -16,7 +16,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op%2B%2B/pre.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp Wed Jan 2 20:29:29 2013
@@ -16,7 +16,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op%2B/difference_type.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op%2B%3D/difference_type.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp Wed Jan 2 20:29:29 2013
@@ -16,7 +16,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp Wed Jan 2 20:29:29 2013
@@ -16,7 +16,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-%3D/difference_type.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op%3D/reverse_iterator.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It, class U>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op%3D%3D/test.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp Wed Jan 2 20:29:29 2013
@@ -20,7 +20,7 @@
#include <cstddef>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It1, class It2>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt%3D/test.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt%3D/test.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <iterator>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
template <class It>
void
Modified: libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp (original)
+++ libcxx/trunk/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp Wed Jan 2 20:29:29 2013
@@ -28,7 +28,7 @@
#include <iterator>
#include <type_traits>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class It>
struct find_current
Removed: libcxx/trunk/test/re/iterators.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/iterators.h?rev=171451&view=auto
==============================================================================
--- libcxx/trunk/test/re/iterators.h (original)
+++ libcxx/trunk/test/re/iterators.h (removed)
@@ -1,277 +0,0 @@
-#ifndef ITERATORS_H
-#define ITERATORS_H
-
-#include <iterator>
-
-template <class It>
-class output_iterator
-{
- It it_;
-
- template <class U> friend class output_iterator;
-public:
- typedef std::output_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_;}
-
- explicit output_iterator(It it) : it_(it) {}
- template <class U>
- output_iterator(const output_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
-
- output_iterator& operator++() {++it_; return *this;}
- output_iterator operator++(int)
- {output_iterator tmp(*this); ++(*this); return tmp;}
-};
-
-template <class It>
-class input_iterator
-{
- It it_;
-
- template <class U> friend class input_iterator;
-public:
- typedef std::input_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_;}
-
- input_iterator() : it_() {}
- explicit input_iterator(It it) : it_(it) {}
- template <class U>
- input_iterator(const input_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- input_iterator& operator++() {++it_; return *this;}
- input_iterator operator++(int)
- {input_iterator tmp(*this); ++(*this); return tmp;}
-
- friend bool operator==(const input_iterator& x, const input_iterator& y)
- {return x.it_ == y.it_;}
- friend bool operator!=(const input_iterator& x, const input_iterator& y)
- {return !(x == y);}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const input_iterator<T>& x, const input_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const input_iterator<T>& x, const input_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class It>
-class forward_iterator
-{
- It it_;
-
- template <class U> friend class forward_iterator;
-public:
- typedef std::forward_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_;}
-
- forward_iterator() : it_() {}
- explicit forward_iterator(It it) : it_(it) {}
- template <class U>
- forward_iterator(const forward_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- forward_iterator& operator++() {++it_; return *this;}
- forward_iterator operator++(int)
- {forward_iterator tmp(*this); ++(*this); return tmp;}
-
- friend bool operator==(const forward_iterator& x, const forward_iterator& y)
- {return x.it_ == y.it_;}
- friend bool operator!=(const forward_iterator& x, const forward_iterator& y)
- {return !(x == y);}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class It>
-class bidirectional_iterator
-{
- It it_;
-
- template <class U> friend class bidirectional_iterator;
-public:
- typedef std::bidirectional_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_;}
-
- bidirectional_iterator() : it_() {}
- explicit bidirectional_iterator(It it) : it_(it) {}
- template <class U>
- bidirectional_iterator(const bidirectional_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- bidirectional_iterator& operator++() {++it_; return *this;}
- bidirectional_iterator operator++(int)
- {bidirectional_iterator tmp(*this); ++(*this); return tmp;}
-
- bidirectional_iterator& operator--() {--it_; return *this;}
- bidirectional_iterator operator--(int)
- {bidirectional_iterator tmp(*this); --(*this); return tmp;}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class It>
-class random_access_iterator
-{
- It it_;
-
- template <class U> friend class random_access_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_;}
-
- random_access_iterator() : it_() {}
- explicit random_access_iterator(It it) : it_(it) {}
- template <class U>
- random_access_iterator(const random_access_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- random_access_iterator& operator++() {++it_; return *this;}
- random_access_iterator operator++(int)
- {random_access_iterator tmp(*this); ++(*this); return tmp;}
-
- random_access_iterator& operator--() {--it_; return *this;}
- random_access_iterator operator--(int)
- {random_access_iterator tmp(*this); --(*this); return tmp;}
-
- random_access_iterator& operator+=(difference_type n) {it_ += n; return *this;}
- random_access_iterator operator+(difference_type n) const
- {random_access_iterator tmp(*this); tmp += n; return tmp;}
- friend random_access_iterator operator+(difference_type n, random_access_iterator x)
- {x += n; return x;}
- random_access_iterator& operator-=(difference_type n) {return *this += -n;}
- random_access_iterator operator-(difference_type n) const
- {random_access_iterator tmp(*this); tmp -= n; return tmp;}
-
- reference operator[](difference_type n) const {return it_[n];}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class T, class U>
-inline
-bool
-operator<(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return x.base() < y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator<=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return !(y < x);
-}
-
-template <class T, class U>
-inline
-bool
-operator>(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return y < x;
-}
-
-template <class T, class U>
-inline
-bool
-operator>=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return !(x < y);
-}
-
-template <class T, class U>
-inline
-typename std::iterator_traits<T>::difference_type
-operator-(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return x.base() - y.base();
-}
-
-#endif // ITERATORS_H
Modified: libcxx/trunk/test/re/re.alg/re.alg.match/awk.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.match/awk.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.match/awk.pass.cpp (original)
+++ libcxx/trunk/test/re/re.alg/re.alg.match/awk.pass.cpp Wed Jan 2 20:29:29 2013
@@ -20,7 +20,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.alg/re.alg.match/basic.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.match/basic.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.match/basic.pass.cpp (original)
+++ libcxx/trunk/test/re/re.alg/re.alg.match/basic.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.alg/re.alg.match/ecma.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.match/ecma.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.match/ecma.pass.cpp (original)
+++ libcxx/trunk/test/re/re.alg/re.alg.match/ecma.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.alg/re.alg.match/egrep.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.match/egrep.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.match/egrep.pass.cpp (original)
+++ libcxx/trunk/test/re/re.alg/re.alg.match/egrep.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.alg/re.alg.match/extended.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.match/extended.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.match/extended.pass.cpp (original)
+++ libcxx/trunk/test/re/re.alg/re.alg.match/extended.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.alg/re.alg.match/grep.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.match/grep.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.match/grep.pass.cpp (original)
+++ libcxx/trunk/test/re/re.alg/re.alg.match/grep.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.alg/re.alg.replace/test1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.replace/test1.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.replace/test1.pass.cpp (original)
+++ libcxx/trunk/test/re/re.alg/re.alg.replace/test1.pass.cpp Wed Jan 2 20:29:29 2013
@@ -22,7 +22,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.alg/re.alg.replace/test2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.replace/test2.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.replace/test2.pass.cpp (original)
+++ libcxx/trunk/test/re/re.alg/re.alg.replace/test2.pass.cpp Wed Jan 2 20:29:29 2013
@@ -22,7 +22,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.alg/re.alg.search/awk.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.search/awk.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.search/awk.pass.cpp (original)
+++ libcxx/trunk/test/re/re.alg/re.alg.search/awk.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.alg/re.alg.search/basic.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.search/basic.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.search/basic.pass.cpp (original)
+++ libcxx/trunk/test/re/re.alg/re.alg.search/basic.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.alg/re.alg.search/ecma.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.search/ecma.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.search/ecma.pass.cpp (original)
+++ libcxx/trunk/test/re/re.alg/re.alg.search/ecma.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.alg/re.alg.search/egrep.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.search/egrep.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.search/egrep.pass.cpp (original)
+++ libcxx/trunk/test/re/re.alg/re.alg.search/egrep.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.alg/re.alg.search/extended.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.search/extended.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.search/extended.pass.cpp (original)
+++ libcxx/trunk/test/re/re.alg/re.alg.search/extended.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.alg/re.alg.search/grep.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.alg/re.alg.search/grep.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.alg/re.alg.search/grep.pass.cpp (original)
+++ libcxx/trunk/test/re/re.alg/re.alg.search/grep.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp (original)
+++ libcxx/trunk/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.regex/re.regex.construct/iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.regex/re.regex.construct/iter_iter.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.regex/re.regex.construct/iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/re/re.regex/re.regex.construct/iter_iter.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class Iter>
void
Modified: libcxx/trunk/test/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp (original)
+++ libcxx/trunk/test/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class Iter>
void
Modified: libcxx/trunk/test/re/re.results/re.results.form/form1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.results/re.results.form/form1.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.results/re.results.form/form1.pass.cpp (original)
+++ libcxx/trunk/test/re/re.results/re.results.form/form1.pass.cpp Wed Jan 2 20:29:29 2013
@@ -19,7 +19,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.results/re.results.form/form2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.results/re.results.form/form2.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.results/re.results.form/form2.pass.cpp (original)
+++ libcxx/trunk/test/re/re.results/re.results.form/form2.pass.cpp Wed Jan 2 20:29:29 2013
@@ -21,7 +21,7 @@
#include <regex>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
#include "../../test_allocator.h"
int main()
Removed: libcxx/trunk/test/re/re.traits/iterators.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.traits/iterators.h?rev=171451&view=auto
==============================================================================
--- libcxx/trunk/test/re/re.traits/iterators.h (original)
+++ libcxx/trunk/test/re/re.traits/iterators.h (removed)
@@ -1,251 +0,0 @@
-#ifndef ITERATORS_H
-#define ITERATORS_H
-
-#include <iterator>
-
-template <class It>
-class input_iterator
-{
- It it_;
-
- template <class U> friend class input_iterator;
-public:
- typedef std::input_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_;}
-
- input_iterator() : it_() {}
- explicit input_iterator(It it) : it_(it) {}
- template <class U>
- input_iterator(const input_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- input_iterator& operator++() {++it_; return *this;}
- input_iterator operator++(int)
- {input_iterator tmp(*this); ++(*this); return tmp;}
-
- friend bool operator==(const input_iterator& x, const input_iterator& y)
- {return x.it_ == y.it_;}
- friend bool operator!=(const input_iterator& x, const input_iterator& y)
- {return !(x == y);}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const input_iterator<T>& x, const input_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const input_iterator<T>& x, const input_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class It>
-class forward_iterator
-{
- It it_;
-
- template <class U> friend class forward_iterator;
-public:
- typedef std::forward_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_;}
-
- forward_iterator() : it_() {}
- explicit forward_iterator(It it) : it_(it) {}
- template <class U>
- forward_iterator(const forward_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- forward_iterator& operator++() {++it_; return *this;}
- forward_iterator operator++(int)
- {forward_iterator tmp(*this); ++(*this); return tmp;}
-
- friend bool operator==(const forward_iterator& x, const forward_iterator& y)
- {return x.it_ == y.it_;}
- friend bool operator!=(const forward_iterator& x, const forward_iterator& y)
- {return !(x == y);}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class It>
-class bidirectional_iterator
-{
- It it_;
-
- template <class U> friend class bidirectional_iterator;
-public:
- typedef std::bidirectional_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_;}
-
- bidirectional_iterator() : it_() {}
- explicit bidirectional_iterator(It it) : it_(it) {}
- template <class U>
- bidirectional_iterator(const bidirectional_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- bidirectional_iterator& operator++() {++it_; return *this;}
- bidirectional_iterator operator++(int)
- {bidirectional_iterator tmp(*this); ++(*this); return tmp;}
-
- bidirectional_iterator& operator--() {--it_; return *this;}
- bidirectional_iterator operator--(int)
- {bidirectional_iterator tmp(*this); --(*this); return tmp;}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class It>
-class random_access_iterator
-{
- It it_;
-
- template <class U> friend class random_access_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_;}
-
- random_access_iterator() : it_() {}
- explicit random_access_iterator(It it) : it_(it) {}
- template <class U>
- random_access_iterator(const random_access_iterator<U>& u) :it_(u.it_) {}
-
- reference operator*() const {return *it_;}
- pointer operator->() const {return it_;}
-
- random_access_iterator& operator++() {++it_; return *this;}
- random_access_iterator operator++(int)
- {random_access_iterator tmp(*this); ++(*this); return tmp;}
-
- random_access_iterator& operator--() {--it_; return *this;}
- random_access_iterator operator--(int)
- {random_access_iterator tmp(*this); --(*this); return tmp;}
-
- random_access_iterator& operator+=(difference_type n) {it_ += n; return *this;}
- random_access_iterator operator+(difference_type n) const
- {random_access_iterator tmp(*this); tmp += n; return tmp;}
- friend random_access_iterator operator+(difference_type n, random_access_iterator x)
- {x += n; return x;}
- random_access_iterator& operator-=(difference_type n) {return *this += -n;}
- random_access_iterator operator-(difference_type n) const
- {random_access_iterator tmp(*this); tmp -= n; return tmp;}
-
- reference operator[](difference_type n) const {return it_[n];}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return !(x == y);
-}
-
-template <class T, class U>
-inline
-bool
-operator<(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return x.base() < y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator<=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return !(y < x);
-}
-
-template <class T, class U>
-inline
-bool
-operator>(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return y < x;
-}
-
-template <class T, class U>
-inline
-bool
-operator>=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return !(x < y);
-}
-
-template <class T, class U>
-inline
-typename std::iterator_traits<T>::difference_type
-operator-(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
- return x.base() - y.base();
-}
-
-#endif // ITERATORS_H
Modified: libcxx/trunk/test/re/re.traits/lookup_classname.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.traits/lookup_classname.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.traits/lookup_classname.pass.cpp (original)
+++ libcxx/trunk/test/re/re.traits/lookup_classname.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <regex>
#include <cassert>
-#include "iterators.h"
+#include "../../iterators.h"
template <class char_type>
void
Modified: libcxx/trunk/test/re/re.traits/lookup_collatename.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.traits/lookup_collatename.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.traits/lookup_collatename.pass.cpp (original)
+++ libcxx/trunk/test/re/re.traits/lookup_collatename.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <regex>
#include <iterator>
#include <cassert>
-#include "iterators.h"
+#include "../../iterators.h"
template <class char_type>
void
Modified: libcxx/trunk/test/re/re.traits/transform.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.traits/transform.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.traits/transform.pass.cpp (original)
+++ libcxx/trunk/test/re/re.traits/transform.pass.cpp Wed Jan 2 20:29:29 2013
@@ -17,7 +17,7 @@
#include <regex>
#include <cassert>
-#include "iterators.h"
+#include "../../iterators.h"
int main()
{
Modified: libcxx/trunk/test/re/re.traits/transform_primary.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.traits/transform_primary.pass.cpp?rev=171452&r1=171451&r2=171452&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.traits/transform_primary.pass.cpp (original)
+++ libcxx/trunk/test/re/re.traits/transform_primary.pass.cpp Wed Jan 2 20:29:29 2013
@@ -18,7 +18,7 @@
#include <regex>
#include <cassert>
-#include "iterators.h"
+#include "../../iterators.h"
int main()
{
More information about the cfe-commits
mailing list