Trying again to fix error caused by -Wunused-function.

This thing with the pragma ignore was getting out of hand: now MinGW (and probably GCC) was erroring too. So I chose to move the definition of IsZero() out of the anonymous namespace into benchmark.cc.

Trying again to fix error caused by -Wunused-function.
ec6f0357 · Joao Paulo Magalhaes · 17354131 · ec6f0357 · ec6f0357 · ec6f0357
Commit ec6f0357 authored May 03, 2017 by Joao Paulo Magalhaes
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 17 deletions

benchmark.cc src/benchmark.cc +4 -0

benchmark_api_internal.h src/benchmark_api_internal.h +2 -7

output_test_helper.cc test/output_test_helper.cc +1 -10

No files found.
--- a/src/benchmark.cc
+++ b/src/benchmark.cc
@@ -543,6 +543,10 @@ std::unique_ptr<BenchmarkReporter> CreateReporter(
 }  // end namespace
+bool IsZero(double n) {
+  return std::abs(n) < std::numeric_limits<double>::epsilon();
+}
 ConsoleReporter::OutputOptions GetOutputOptions(bool force_no_color) {
  int output_opts = ConsoleReporter::OO_Defaults;
  if ((FLAGS_benchmark_color == "auto" && IsColorTerminal()) ||

--- a/src/benchmark_api_internal.h
+++ b/src/benchmark_api_internal.h
@@ -36,15 +36,10 @@ bool FindBenchmarksInternal(const std::string& re,
                            std::vector<Benchmark::Instance>* benchmarks,
                            std::ostream* Err);
-ConsoleReporter::OutputOptions GetOutputOptions(bool force_no_color = false);
+bool IsZero(double n);
-namespace {
-bool IsZero(double n) {
+ConsoleReporter::OutputOptions GetOutputOptions(bool force_no_color = false);
-  return std::abs(n) < std::numeric_limits<double>::epsilon();
-}
-}  // end namespace
 }  // end namespace internal
 }  // end namespace benchmark

--- a/test/output_test_helper.cc
+++ b/test/output_test_helper.cc
@@ -7,16 +7,7 @@
 #include "../src/check.h"  // NOTE: check.h is for internal use only!
 #include "../src/re.h"     // NOTE: re.h is for internal use only
 #include "output_test.h"
+#include "../src/benchmark_api_internal.h"
-// clang fails with -Werror because IsZero() is not used in this library
-#ifdef __clang__
-# pragma clang diagnostic push
-# pragma clang diagnostic ignored "-Wunused-function"
-#endif
-#include "../src/benchmark_api_internal.h" // IsZero() is provided here
-#ifdef __clang__
-# pragma clang diagnostic pop
-#endif
 // ========================================================================= //
 // ------------------------------ Internals -------------------------------- //