summaryrefslogtreecommitdiffstats
path: root/pstl/test/std/algorithms/alg.merge
diff options
context:
space:
mode:
authorLouis Dionne <ldionne@apple.com>2019-07-18 20:21:52 +0000
committerLouis Dionne <ldionne@apple.com>2019-07-18 20:21:52 +0000
commit249c1c7407ab6cd489ddce14f5574bc8c094c9bc (patch)
tree68059cc3eefbb28e0d486eefbb4ae5b8751f08d2 /pstl/test/std/algorithms/alg.merge
parentf893d5bf0f313b718f6209d666e5a6e32eed961e (diff)
downloadbcm5719-llvm-249c1c7407ab6cd489ddce14f5574bc8c094c9bc.tar.gz
bcm5719-llvm-249c1c7407ab6cd489ddce14f5574bc8c094c9bc.zip
[pstl] Declare main() as returning int, not int32_t
llvm-svn: 366490
Diffstat (limited to 'pstl/test/std/algorithms/alg.merge')
-rw-r--r--pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp2
-rw-r--r--pstl/test/std/algorithms/alg.merge/merge.pass.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp b/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp
index a7aa2e70bbe..64433c835ed 100644
--- a/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp
+++ b/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp
@@ -134,7 +134,7 @@ struct test_non_const
}
};
-int32_t
+int
main()
{
test_by_type<float64_t>([](int32_t i) { return -2 * i; }, [](int32_t i) { return -(2 * i + 1); },
diff --git a/pstl/test/std/algorithms/alg.merge/merge.pass.cpp b/pstl/test/std/algorithms/alg.merge/merge.pass.cpp
index 6d7027ca024..56b557cca74 100644
--- a/pstl/test/std/algorithms/alg.merge/merge.pass.cpp
+++ b/pstl/test/std/algorithms/alg.merge/merge.pass.cpp
@@ -96,7 +96,7 @@ struct test_non_const
}
};
-int32_t
+int
main()
{
test_merge_by_type<int32_t>([](size_t v) { return (v % 2 == 0 ? v : -v) * 3; }, [](size_t v) { return v * 2; });
OpenPOWER on IntegriCloud