diff options
author | Howard Hinnant <hhinnant@apple.com> | 2010-08-22 00:08:10 +0000 |
---|---|---|
committer | Howard Hinnant <hhinnant@apple.com> | 2010-08-22 00:08:10 +0000 |
commit | 664ae8118ea09fd6aec69eb34dc93f5573fdcb99 (patch) | |
tree | 0adb06ae200b3ce8348cfb8931ba2d83e7e8d336 /libcxx/test/algorithms/alg.sorting/alg.set.operations | |
parent | 475999dcf9ee95dc5835962a65f3fd96e3c3cc23 (diff) | |
download | bcm5719-llvm-664ae8118ea09fd6aec69eb34dc93f5573fdcb99.tar.gz bcm5719-llvm-664ae8118ea09fd6aec69eb34dc93f5573fdcb99.zip |
Fixing whitespace problems
llvm-svn: 111753
Diffstat (limited to 'libcxx/test/algorithms/alg.sorting/alg.set.operations')
10 files changed, 48 insertions, 50 deletions
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp index 665ba51fa51..13f02213797 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp +++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp @@ -9,8 +9,8 @@ // <algorithm> -// template<InputIterator Iter1, InputIterator Iter2> -// requires HasLess<Iter1::value_type, Iter2::value_type> +// template<InputIterator Iter1, InputIterator Iter2> +// requires HasLess<Iter1::value_type, Iter2::value_type> // && HasLess<Iter2::value_type, Iter1::value_type> // bool // includes(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2); @@ -41,7 +41,6 @@ test() assert(std::includes(Iter1(ia), Iter1(ia+sa), Iter2(ib), Iter2(ib+sb))); assert(!std::includes(Iter1(ib), Iter1(ib+sb), Iter2(ia), Iter2(ia+sa))); - assert(std::includes(Iter1(ia), Iter1(ia+2), Iter2(ic), Iter2(ic+2))); assert(!std::includes(Iter1(ia), Iter1(ia+2), Iter2(ib), Iter2(ib+2))); diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp index ccdb04d878d..75181ab3d79 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp +++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp @@ -9,9 +9,9 @@ // <algorithm> -// template<InputIterator Iter1, InputIterator Iter2, typename Compare> -// requires Predicate<Compare, Iter1::value_type, Iter2::value_type> -// && Predicate<Compare, Iter2::value_type, Iter1::value_type> +// template<InputIterator Iter1, InputIterator Iter2, typename Compare> +// requires Predicate<Compare, Iter1::value_type, Iter2::value_type> +// && Predicate<Compare, Iter2::value_type, Iter1::value_type> // bool // includes(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2, Compare comp); @@ -42,7 +42,6 @@ test() assert(std::includes(Iter1(ia), Iter1(ia+sa), Iter2(ib), Iter2(ib+sb), std::less<int>())); assert(!std::includes(Iter1(ib), Iter1(ib+sb), Iter2(ia), Iter2(ia+sa), std::less<int>())); - assert(std::includes(Iter1(ia), Iter1(ia+2), Iter2(ic), Iter2(ic+2), std::less<int>())); assert(!std::includes(Iter1(ia), Iter1(ia+2), Iter2(ib), Iter2(ib+2), std::less<int>())); diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp index 03628b22135..ef4473c0d63 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp +++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp @@ -9,11 +9,11 @@ // <algorithm> -// template<InputIterator InIter1, InputIterator InIter2, typename OutIter> -// requires OutputIterator<OutIter, InIter1::reference> -// && OutputIterator<OutIter, InIter2::reference> -// && HasLess<InIter2::value_type, InIter1::value_type> -// && HasLess<InIter1::value_type, InIter2::value_type> +// template<InputIterator InIter1, InputIterator InIter2, typename OutIter> +// requires OutputIterator<OutIter, InIter1::reference> +// && OutputIterator<OutIter, InIter2::reference> +// && HasLess<InIter2::value_type, InIter1::value_type> +// && HasLess<InIter1::value_type, InIter2::value_type> // OutIter // set_difference(InIter1 first1, InIter1 last1, InIter2 first2, InIter2 last2, // OutIter result); diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp index 65e3cd6611b..f6e8d2c6b92 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp +++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp @@ -9,12 +9,12 @@ // <algorithm> -// template<InputIterator InIter1, InputIterator InIter2, typename OutIter, -// CopyConstructible Compare> -// requires OutputIterator<OutIter, InIter1::reference> -// && OutputIterator<OutIter, InIter2::reference> -// && Predicate<Compare, InIter1::value_type, InIter2::value_type> -// && Predicate<Compare, InIter2::value_type, InIter1::value_type> +// template<InputIterator InIter1, InputIterator InIter2, typename OutIter, +// CopyConstructible Compare> +// requires OutputIterator<OutIter, InIter1::reference> +// && OutputIterator<OutIter, InIter2::reference> +// && Predicate<Compare, InIter1::value_type, InIter2::value_type> +// && Predicate<Compare, InIter2::value_type, InIter1::value_type> // OutIter // set_difference(InIter1 first1, InIter1 last1, InIter2 first2, InIter2 last2, // OutIter result, Compare comp); diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp index e832215942f..6b3ede5ac03 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp +++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp @@ -9,11 +9,11 @@ // <algorithm> -// template<InputIterator InIter1, InputIterator InIter2, typename OutIter> -// requires OutputIterator<OutIter, InIter1::reference> -// && OutputIterator<OutIter, InIter2::reference> -// && HasLess<InIter2::value_type, InIter1::value_type> -// && HasLess<InIter1::value_type, InIter2::value_type> +// template<InputIterator InIter1, InputIterator InIter2, typename OutIter> +// requires OutputIterator<OutIter, InIter1::reference> +// && OutputIterator<OutIter, InIter2::reference> +// && HasLess<InIter2::value_type, InIter1::value_type> +// && HasLess<InIter1::value_type, InIter2::value_type> // OutIter // set_intersection(InIter1 first1, InIter1 last1, InIter2 first2, InIter2 last2, // OutIter result); diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp index 64aaf19d101..6b6c391fcda 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp +++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp @@ -9,12 +9,12 @@ // <algorithm> -// template<InputIterator InIter1, InputIterator InIter2, typename OutIter, -// CopyConstructible Compare> -// requires OutputIterator<OutIter, InIter1::reference> -// && OutputIterator<OutIter, InIter2::reference> -// && Predicate<Compare, InIter1::value_type, InIter2::value_type> -// && Predicate<Compare, InIter2::value_type, InIter1::value_type> +// template<InputIterator InIter1, InputIterator InIter2, typename OutIter, +// CopyConstructible Compare> +// requires OutputIterator<OutIter, InIter1::reference> +// && OutputIterator<OutIter, InIter2::reference> +// && Predicate<Compare, InIter1::value_type, InIter2::value_type> +// && Predicate<Compare, InIter2::value_type, InIter1::value_type> // OutIter // set_intersection(InIter1 first1, InIter1 last1, InIter2 first2, InIter2 last2, // OutIter result, Compare comp); diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp index b7e30f4eb63..d1491c368ff 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp +++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp @@ -9,11 +9,11 @@ // <algorithm> -// template<InputIterator InIter1, InputIterator InIter2, typename OutIter> -// requires OutputIterator<OutIter, InIter1::reference> -// && OutputIterator<OutIter, InIter2::reference> -// && HasLess<InIter2::value_type, InIter1::value_type> -// && HasLess<InIter1::value_type, InIter2::value_type> +// template<InputIterator InIter1, InputIterator InIter2, typename OutIter> +// requires OutputIterator<OutIter, InIter1::reference> +// && OutputIterator<OutIter, InIter2::reference> +// && HasLess<InIter2::value_type, InIter1::value_type> +// && HasLess<InIter1::value_type, InIter2::value_type> // OutIter // set_symmetric_difference(InIter1 first1, InIter1 last1, // InIter2 first2, InIter2 last2, diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp index b4614ba1f05..35a26c69e35 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp +++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp @@ -10,14 +10,14 @@ // <algorithm> // template<InputIterator InIter1, InputIterator InIter2, typename OutIter, -// CopyConstructible Compare> -// requires OutputIterator<OutIter, InIter1::reference> -// && OutputIterator<OutIter, InIter2::reference> -// && Predicate<Compare, InIter1::value_type, InIter2::value_type> -// && Predicate<Compare, InIter2::value_type, InIter1::value_type> +// CopyConstructible Compare> +// requires OutputIterator<OutIter, InIter1::reference> +// && OutputIterator<OutIter, InIter2::reference> +// && Predicate<Compare, InIter1::value_type, InIter2::value_type> +// && Predicate<Compare, InIter2::value_type, InIter1::value_type> // OutIter // set_symmetric_difference(InIter1 first1, InIter1 last1, -// InIter2 first2, InIter2 last2, +// InIter2 first2, InIter2 last2, // OutIter result, Compare comp); #include <algorithm> diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp index 669f05d3c86..76dfed18338 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp +++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp @@ -9,11 +9,11 @@ // <algorithm> -// template<InputIterator InIter1, InputIterator InIter2, typename OutIter> -// requires OutputIterator<OutIter, InIter1::reference> -// && OutputIterator<OutIter, InIter2::reference> -// && HasLess<InIter2::value_type, InIter1::value_type> -// && HasLess<InIter1::value_type, InIter2::value_type> +// template<InputIterator InIter1, InputIterator InIter2, typename OutIter> +// requires OutputIterator<OutIter, InIter1::reference> +// && OutputIterator<OutIter, InIter2::reference> +// && HasLess<InIter2::value_type, InIter1::value_type> +// && HasLess<InIter1::value_type, InIter2::value_type> // OutIter // set_union(InIter1 first1, InIter1 last1, // InIter2 first2, InIter2 last2, OutIter result); diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp index ff61b7e207c..0fbb43ad0c1 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp +++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp @@ -10,11 +10,11 @@ // <algorithm> // template<InputIterator InIter1, InputIterator InIter2, typename OutIter, -// CopyConstructible Compare> -// requires OutputIterator<OutIter, InIter1::reference> -// && OutputIterator<OutIter, InIter2::reference> -// && Predicate<Compare, InIter1::value_type, InIter2::value_type> -// && Predicate<Compare, InIter2::value_type, InIter1::value_type> +// CopyConstructible Compare> +// requires OutputIterator<OutIter, InIter1::reference> +// && OutputIterator<OutIter, InIter2::reference> +// && Predicate<Compare, InIter1::value_type, InIter2::value_type> +// && Predicate<Compare, InIter2::value_type, InIter1::value_type> // OutIter // set_union(InIter1 first1, InIter1 last1, InIter2 first2, InIter2 last2, // OutIter result, Compare comp); |