Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Make directCompare TU-local to stats.cpp

Commit
56fcd584c1a4ca7f9449843e239559e69a084a63
Author
Martin Hořeňovský ·
Parents
aafe09bc1cb5

Files · Download .tar.gz

Changes

 src/catch2/benchmark/detail/catch_stats.cpp | 22 +++++++++++++---------
 src/catch2/benchmark/detail/catch_stats.hpp |  4 ----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/catch2/benchmark/detail/catch_stats.cpp b/src/catch2/benchmark/detail/catch_stats.cpp
index fe64b1c5..d745bb1f 100644
--- a/src/catch2/benchmark/detail/catch_stats.cpp
+++ b/src/catch2/benchmark/detail/catch_stats.cpp
@@ -184,6 +184,19 @@ namespace Catch {
                     return std::sqrt( variance );
                 }
 
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+                // Used when we know we want == comparison of two doubles
+                // to centralize warning suppression
+                static bool directCompare( double lhs, double rhs ) {
+                    return lhs == rhs;
+                }
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic pop
+#endif
+
             } // namespace
         }     // namespace Detail
     }         // namespace Benchmark
@@ -193,15 +206,6 @@ namespace Catch {
     namespace Benchmark {
         namespace Detail {
 
-#if defined( __GNUC__ ) || defined( __clang__ )
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-            bool directCompare( double lhs, double rhs ) { return lhs == rhs; }
-#if defined( __GNUC__ ) || defined( __clang__ )
-#    pragma GCC diagnostic pop
-#endif
-
             double weighted_average_quantile( int k,
                                               int q,
                                               double* first,
diff --git a/src/catch2/benchmark/detail/catch_stats.hpp b/src/catch2/benchmark/detail/catch_stats.hpp
index 9450406b..5b7c8808 100644
--- a/src/catch2/benchmark/detail/catch_stats.hpp
+++ b/src/catch2/benchmark/detail/catch_stats.hpp
@@ -20,10 +20,6 @@ namespace Catch {
         namespace Detail {
             using sample = std::vector<double>;
 
-            // Used when we know we want == comparison of two doubles
-            // to centralize warning suppression
-            bool directCompare( double lhs, double rhs );
-
             double weighted_average_quantile( int k,
                                               int q,
                                               double* first,