Remove warnings for internal use of CSVReporter (#956)

In a previous commit[1], diagnostic pragmas were used to avoid this warning. However, the incorrect warning flag was indicated, leaving the warning in place. -Wdeprecated is for deprecated features while -Wdeprecated-declarations for deprecated functions, variables, and types[2]. [1] c4084619 [2] https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html

Remove warnings for internal use of CSVReporter (#956)
8cead007 · Keith Moyer · GitHub · a77d5f70 · 8cead007 · 8cead007
Unverified Commit 8cead007 authored Apr 14, 2020 by Keith Moyer Committed by GitHub Apr 14, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

benchmark.cc src/benchmark.cc +2 -2

output_test_helper.cc test/output_test_helper.cc +2 -2

No files found.
--- a/src/benchmark.cc
+++ b/src/benchmark.cc
@@ -284,10 +284,10 @@ void RunBenchmarks(const std::vector<BenchmarkInstance>& benchmarks,
 }

 // Disable deprecated warnings temporarily because we need to reference
-// CSVReporter but don't want to trigger -Werror=-Wdeprecated
+// CSVReporter but don't want to trigger -Werror=-Wdeprecated-declarations
 #ifdef __GNUC__
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated"
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif

 std::unique_ptr<BenchmarkReporter> CreateReporter(

--- a/test/output_test_helper.cc
+++ b/test/output_test_helper.cc
@@ -374,10 +374,10 @@ int SetSubstitutions(
 }

 // Disable deprecated warnings temporarily because we need to reference
-// CSVReporter but don't want to trigger -Werror=-Wdeprecated
+// CSVReporter but don't want to trigger -Werror=-Wdeprecated-declarations
 #ifdef __GNUC__
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated"
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 void RunOutputTests(int argc, char* argv[]) {
  using internal::GetTestCaseList;