summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/algorithms
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/test/std/algorithms')
-rw-r--r--libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp2
-rw-r--r--libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp2
-rw-r--r--libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp4
-rw-r--r--libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp2
-rw-r--r--libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp8
-rw-r--r--libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp8
-rw-r--r--libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp2
-rw-r--r--libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp2
-rw-r--r--libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp2
-rw-r--r--libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax.pass.cpp2
-rw-r--r--libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_comp.pass.cpp2
-rw-r--r--libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp2
-rw-r--r--libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp2
13 files changed, 20 insertions, 20 deletions
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
index 6617cd0916f..b56d31b9d0d 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
@@ -62,7 +62,7 @@ test_int_array()
struct source {
source() : i(0) { }
-
+
operator int() const { return i++; }
mutable int i;
};
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
index 234879149ae..449753fc263 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
@@ -61,6 +61,6 @@ int main()
random_access_iterator<const int*>(ia+s),
random_access_iterator<const int*>(ia),
random_access_iterator<const int*>(ia+s-1)));
-
+
#endif
}
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
index 3e1dfd17c3f..054bc656cdb 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
@@ -33,7 +33,7 @@ int main()
const unsigned sa = sizeof(ia)/sizeof(ia[0]);
int ib[] = {0, 1, 2, 3, 0, 1, 2, 3};
const unsigned sb = sizeof(ib)/sizeof(ib[0]); ((void)sb); // unused in c++11
-
+
typedef input_iterator<const int*> II;
typedef random_access_iterator<const int*> RAI;
typedef std::equal_to<int> EQ;
@@ -48,7 +48,7 @@ int main()
== (std::pair<RAI, RAI>(RAI(ia+3), RAI(ib+3))));
assert(bcp.count() > 0 && bcp.count() < sa);
bcp.reset();
-
+
#ifdef HAS_FOUR_ITERATOR_VERSION
assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib + sb), EQ())
== (std::pair<II, II>(II(ia+3), II(ib+3))));
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp
index 4cde1a7d32e..0e16d9bd17c 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp
@@ -69,7 +69,7 @@ void test(unsigned N)
std::random_shuffle(ia, ia+N);
std::make_heap(ia, ia+N, std::ref(pred));
assert(pred.count() <= 3*N);
- assert(std::is_heap(ia, ia+N, pred));
+ assert(std::is_heap(ia, ia+N, pred));
}
delete [] ia;
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
index 829157353fb..9c411730196 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
@@ -24,20 +24,20 @@
struct S {
S() : i_(0) {}
S(int i) : i_(i) {}
-
+
S(const S& rhs) : i_(rhs.i_) {}
S( S&& rhs) : i_(rhs.i_) { rhs.i_ = -1; }
-
+
S& operator =(const S& rhs) { i_ = rhs.i_; return *this; }
S& operator =( S&& rhs) { i_ = rhs.i_; rhs.i_ = -2; assert(this != &rhs); return *this; }
S& operator =(int i) { i_ = i; return *this; }
-
+
bool operator <(const S& rhs) const { return i_ < rhs.i_; }
bool operator ==(const S& rhs) const { return i_ == rhs.i_; }
bool operator ==(int i) const { return i_ == i; }
void set(int i) { i_ = i; }
-
+
int i_;
};
#endif
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
index ca6f8e40cbd..b4d25a93e50 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
@@ -34,21 +34,21 @@ struct indirect_less
struct S {
S() : i_(0) {}
S(int i) : i_(i) {}
-
+
S(const S& rhs) : i_(rhs.i_) {}
S( S&& rhs) : i_(rhs.i_) { rhs.i_ = -1; }
-
+
S& operator =(const S& rhs) { i_ = rhs.i_; return *this; }
S& operator =( S&& rhs) { i_ = rhs.i_; rhs.i_ = -2; assert(this != &rhs); return *this; }
S& operator =(int i) { i_ = i; return *this; }
-
+
bool operator <(const S& rhs) const { return i_ < rhs.i_; }
bool operator >(const S& rhs) const { return i_ > rhs.i_; }
bool operator ==(const S& rhs) const { return i_ == rhs.i_; }
bool operator ==(int i) const { return i_ == i; }
void set(int i) { i_ = i; }
-
+
int i_;
};
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
index 2197b97d7f2..904d79ec393 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
@@ -75,6 +75,6 @@ int main()
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
test<const int*>();
-
+
constexpr_test ();
}
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
index 37c181393aa..752dabad4e4 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
@@ -95,6 +95,6 @@ int main()
test<random_access_iterator<const int*> >();
test<const int*>();
test_eq();
-
+
constexpr_test();
}
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
index 9517f7eac94..2eaa6451040 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
@@ -95,6 +95,6 @@ int main()
test<random_access_iterator<const int*> >();
test<const int*>();
test_eq();
-
+
constexpr_test();
}
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax.pass.cpp
index 6ac972a2547..8276c3a5dfd 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax.pass.cpp
@@ -47,7 +47,7 @@ int main()
}
#if _LIBCPP_STD_VER > 11
{
-// Note that you can't take a reference to a local var, since
+// Note that you can't take a reference to a local var, since
// its address is not a compile-time constant.
constexpr static int x = 1;
constexpr static int y = 0;
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_comp.pass.cpp
index 771c8f84a74..3289f8a7582 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_comp.pass.cpp
@@ -50,7 +50,7 @@ int main()
}
#if _LIBCPP_STD_VER > 11
{
-// Note that you can't take a reference to a local var, since
+// Note that you can't take a reference to a local var, since
// its address is not a compile-time constant.
constexpr static int x = 1;
constexpr static int y = 0;
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
index 915b1d176ab..2f8532cfcdc 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
@@ -93,6 +93,6 @@ int main()
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
test<const int*>();
-
+
constexpr_test();
}
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
index d3a067fda3c..2a023580e3c 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
@@ -99,6 +99,6 @@ int main()
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
test<const int*>();
-
+
constexpr_test();
}
OpenPOWER on IntegriCloud