summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/numerics
diff options
context:
space:
mode:
authorBilly Robert O'Neal III <bion@microsoft.com>2018-01-06 02:50:03 +0000
committerBilly Robert O'Neal III <bion@microsoft.com>2018-01-06 02:50:03 +0000
commit231d15e086b4ed52ce1ee92629719304c81e094d (patch)
tree770dddc412507a155fdb0f4bb5c279cbeed405c6 /libcxx/test/std/numerics
parent1e1195dce5bc07a2f925c3e3cc3a62534fffa82d (diff)
downloadbcm5719-llvm-231d15e086b4ed52ce1ee92629719304c81e094d.tar.gz
bcm5719-llvm-231d15e086b4ed52ce1ee92629719304c81e094d.zip
Add casts to prevent narrowing warnings.
llvm-svn: 321923
Diffstat (limited to 'libcxx/test/std/numerics')
-rw-r--r--libcxx/test/std/numerics/numeric.ops/transform.exclusive.scan/transform_exclusive_scan_init_bop_uop.pass.cpp4
-rw-r--r--libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop.pass.cpp4
-rw-r--r--libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop_init.pass.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/libcxx/test/std/numerics/numeric.ops/transform.exclusive.scan/transform_exclusive_scan_init_bop_uop.pass.cpp b/libcxx/test/std/numerics/numeric.ops/transform.exclusive.scan/transform_exclusive_scan_init_bop_uop.pass.cpp
index ca5a8979037..ffe1fbc2fb1 100644
--- a/libcxx/test/std/numerics/numeric.ops/transform.exclusive.scan/transform_exclusive_scan_init_bop_uop.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/transform.exclusive.scan/transform_exclusive_scan_init_bop_uop.pass.cpp
@@ -105,7 +105,7 @@ void basic_tests()
std::iota(v.begin(), v.end(), 0);
std::transform_exclusive_scan(v.begin(), v.end(), v.begin(), 30, std::plus<>(), add_ten{});
for (size_t i = 0; i < v.size(); ++i)
- assert(v[i] == 30 + triangle(i - 1) + i * 10);
+ assert(v[i] == 30 + triangle(i - 1) + (int) i * 10);
}
{
@@ -113,7 +113,7 @@ void basic_tests()
std::iota(v.begin(), v.end(), 1);
std::transform_exclusive_scan(v.begin(), v.end(), v.begin(), 40, std::plus<>(), add_ten{});
for (size_t i = 0; i < v.size(); ++i)
- assert(v[i] == 40 + triangle(i) + i * 10);
+ assert(v[i] == 40 + triangle(i) + (int) i * 10);
}
{
diff --git a/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop.pass.cpp b/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop.pass.cpp
index a8d4d73849f..1817eade33b 100644
--- a/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop.pass.cpp
@@ -96,7 +96,7 @@ void basic_tests()
std::iota(v.begin(), v.end(), 0);
std::transform_inclusive_scan(v.begin(), v.end(), v.begin(), std::plus<>(), add_ten{});
for (size_t i = 0; i < v.size(); ++i)
- assert(v[i] == triangle(i) + (i + 1) * 10);
+ assert(v[i] == triangle(i) + (int)(i + 1) * 10);
}
{
@@ -104,7 +104,7 @@ void basic_tests()
std::iota(v.begin(), v.end(), 1);
std::transform_inclusive_scan(v.begin(), v.end(), v.begin(), std::plus<>(), add_ten{});
for (size_t i = 0; i < v.size(); ++i)
- assert(v[i] == triangle(i + 1) + (i + 1) * 10);
+ assert(v[i] == triangle(i + 1) + (int)(i + 1) * 10);
}
{
diff --git a/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop_init.pass.cpp b/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop_init.pass.cpp
index f4e6c0a99c9..64fa7cabe9f 100644
--- a/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop_init.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop_init.pass.cpp
@@ -105,7 +105,7 @@ void basic_tests()
std::iota(v.begin(), v.end(), 0);
std::transform_inclusive_scan(v.begin(), v.end(), v.begin(), std::plus<>(), add_ten{}, 30);
for (size_t i = 0; i < v.size(); ++i)
- assert(v[i] == 30 + triangle(i) + (i + 1) * 10);
+ assert(v[i] == 30 + triangle(i) + (int) (i + 1) * 10);
}
{
@@ -113,7 +113,7 @@ void basic_tests()
std::iota(v.begin(), v.end(), 1);
std::transform_inclusive_scan(v.begin(), v.end(), v.begin(), std::plus<>(), add_ten{}, 40);
for (size_t i = 0; i < v.size(); ++i)
- assert(v[i] == 40 + triangle(i + 1) + (i + 1) * 10);
+ assert(v[i] == 40 + triangle(i + 1) + (int) (i + 1) * 10);
}
{
OpenPOWER on IntegriCloud