diff options
author | Marshall Clow <mclow.lists@gmail.com> | 2018-01-15 19:32:32 +0000 |
---|---|---|
committer | Marshall Clow <mclow.lists@gmail.com> | 2018-01-15 19:32:32 +0000 |
commit | 404ee020f017bc3fffaadcdbc50f8f49a3674046 (patch) | |
tree | 3f7596ec3e7449b4fc2b7ab85d127343e4440d29 /libcxx/test/std/algorithms/alg.sorting | |
parent | 8694428e365648723f5519af0a6818eb24ecb990 (diff) | |
download | bcm5719-llvm-404ee020f017bc3fffaadcdbc50f8f49a3674046.tar.gz bcm5719-llvm-404ee020f017bc3fffaadcdbc50f8f49a3674046.zip |
Some of the tests from earlier today had 'int' as the return type when it should have been 'bool'. Fix that. It doesn't change the behavior of any of the tests, but it's more accurate.
llvm-svn: 322505
Diffstat (limited to 'libcxx/test/std/algorithms/alg.sorting')
8 files changed, 8 insertions, 8 deletions
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp index 8df07dad1a5..c3d6fd919cb 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp @@ -20,7 +20,7 @@ #include "test_macros.h" #if TEST_STD_VER > 17 -TEST_CONSTEXPR int test_constexpr() { +TEST_CONSTEXPR bool test_constexpr() { int ia[] = {1, 1, 1, 1, 0, 1, 1}; int ib[] = {0, 0, 1, 0, 0, 0, 0}; return std::is_heap(std::begin(ia), std::end(ia)) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp index 80b5cd36f20..3f290bb2944 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp @@ -21,7 +21,7 @@ #include "test_macros.h" #if TEST_STD_VER > 17 -TEST_CONSTEXPR int test_constexpr() { +TEST_CONSTEXPR bool test_constexpr() { int ia[] = {0, 0, 1, 1, 1}; int ib[] = {1, 0, 4, 1, 0}; return std::is_heap(std::begin(ia), std::end(ia), std::greater<int>()) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp index 5616401da79..96369eb6053 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp @@ -20,7 +20,7 @@ #include "test_macros.h" #if TEST_STD_VER > 17 -TEST_CONSTEXPR int test_constexpr() { +TEST_CONSTEXPR bool test_constexpr() { int ia[] = {0, 0, 0, 0, 1, 0}; int ib[] = {0, 0, 0, 1, 1, 1}; return (std::is_heap_until(std::begin(ia), std::end(ia)) == ia+4) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp index dba4a0c7ffe..edd27b0d790 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp @@ -21,7 +21,7 @@ #include "test_macros.h" #if TEST_STD_VER > 17 -TEST_CONSTEXPR int test_constexpr() { +TEST_CONSTEXPR bool test_constexpr() { int ia[] = {1, 0, 0, 0}; int ib[] = {0, 1, 1, 0}; return (std::is_heap_until(std::begin(ia), std::end(ia), std::greater<int>()) == ia+1) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp index e50aae8ef18..3652c089cfb 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp @@ -20,7 +20,7 @@ #include "test_iterators.h" #if TEST_STD_VER > 17 -TEST_CONSTEXPR int test_constexpr() { +TEST_CONSTEXPR bool test_constexpr() { int ia[] = {0, 0, 1, 1}; int ib[] = {1, 1, 0, 0}; return std::is_sorted(std::begin(ia), std::end(ia)) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp index a1562d7c1ed..228aacac622 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp @@ -21,7 +21,7 @@ #include "test_iterators.h" #if TEST_STD_VER > 17 -TEST_CONSTEXPR int test_constexpr() { +TEST_CONSTEXPR bool test_constexpr() { int ia[] = {1, 1, 0, 0}; int ib[] = {0, 0, 1, 1}; return std::is_sorted(std::begin(ia), std::end(ia), std::greater<int>()) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp index 5d30532c825..b2ed76f519a 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp @@ -20,7 +20,7 @@ #include "test_iterators.h" #if TEST_STD_VER > 17 -TEST_CONSTEXPR int test_constexpr() { +TEST_CONSTEXPR bool test_constexpr() { int ia[] = {0, 1, 0}; int ib[] = {0, 1, 1}; return (std::is_sorted_until(std::begin(ia), std::end(ia)) == ia+2) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp index 37b5e44da35..76724bc397e 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp @@ -21,7 +21,7 @@ #include "test_iterators.h" #if TEST_STD_VER > 17 -TEST_CONSTEXPR int test_constexpr() { +TEST_CONSTEXPR bool test_constexpr() { int ia[] = {1, 0, 1}; int ib[] = {1, 1, 0}; return (std::is_sorted_until(std::begin(ia), std::end(ia), std::greater<int>()) == ia+2) |