diff options
| author | Roman Proskuryakov | 2020-12-28 16:00:19 +0300 |
|---|---|---|
| committer | GitHub | 2020-12-28 14:00:19 +0100 |
| commit | 0acb371b9200140ed958d60b86cbb95663ee93bd (patch) | |
| tree | c9fa1dee89d94b846485ee5d082ee9f4478a90ab /src/catch2 | |
| parent | 045feff834dbdc4af85bc5423416e294aa4a1e88 (diff) | |
| download | catch3-0acb371b9200140ed958d60b86cbb95663ee93bd.tar.gz | |
Fix Wold-style-cast error (#2125)
* Add Wold-style-cast to cmake flags
* Fix old style cast in catch_stats.hpp
* Fix old style cast in catch_stats.cpp
Diffstat (limited to 'src/catch2')
| -rw-r--r-- | src/catch2/benchmark/detail/catch_stats.cpp | 2 | ||||
| -rw-r--r-- | src/catch2/benchmark/detail/catch_stats.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/catch2/benchmark/detail/catch_stats.cpp b/src/catch2/benchmark/detail/catch_stats.cpp index 6f6c3802..8e14bfd7 100644 --- a/src/catch2/benchmark/detail/catch_stats.cpp +++ b/src/catch2/benchmark/detail/catch_stats.cpp @@ -182,7 +182,7 @@ namespace Catch { double k0 = -n * nd; double k1 = sb2 - n * sg2 + nd; double det = k1 * k1 - 4 * sg2 * k0; - return (int)(-2. * k0 / (k1 + std::sqrt(det))); + return static_cast<int>(-2. * k0 / (k1 + std::sqrt(det))); }; auto var_out = [n, sb2, sg2](double c) { diff --git a/src/catch2/benchmark/detail/catch_stats.hpp b/src/catch2/benchmark/detail/catch_stats.hpp index 6fb8fd58..b8044131 100644 --- a/src/catch2/benchmark/detail/catch_stats.hpp +++ b/src/catch2/benchmark/detail/catch_stats.hpp @@ -102,7 +102,7 @@ namespace Catch { double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5)); int n = static_cast<int>(resample.size()); - double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / (double)n; + double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / static_cast<double>(n); // degenerate case with uniform samples if (prob_n == 0) return { point, point, point, confidence_level }; |