Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include/internal/benchmark
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-10-28 13:13:23 +0100
committerGitHub2019-10-28 13:13:23 +0100
commit5290d4bedcf8f008d2a5475a5cdcd9fe0c8127c5 (patch)
tree12766a7f86da045be9f995a97e1e46e3fcede4dd /include/internal/benchmark
parent7ada02e21ee66ac89783011526ca8058f8234053 (diff)
parent849f2848bdf625a7b6248e4e62ba0e39ee609634 (diff)
downloadcatch3-5290d4bedcf8f008d2a5475a5cdcd9fe0c8127c5.tar.gz
Merge pull request #1791 from catchorg/dev-reorganize-warning-suppression
Rework how warning suppression in macros is done
Diffstat (limited to 'include/internal/benchmark')
-rw-r--r--include/internal/benchmark/detail/catch_stats.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/internal/benchmark/detail/catch_stats.cpp b/include/internal/benchmark/detail/catch_stats.cpp
index 40e0ea98..b85b740e 100644
--- a/include/internal/benchmark/detail/catch_stats.cpp
+++ b/include/internal/benchmark/detail/catch_stats.cpp
@@ -176,9 +176,10 @@ namespace Catch {
bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+ CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
static std::random_device entropy;
- CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
+ CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++