Skip to content

B
benchmark
Unverified Commit db2de74c by Mariusz Wachowicz Committed by GitHub
Options

Fix pedantic compilation flag violation (#1156)

';' after method definition was removed. Also, pedantic flag is now uncommented in CMakeList.txt.
parent a4bcd937
Showing with 4 additions and 5 deletions
CMakeLists.txt
...@@ -167,9 +167,8 @@ else() ...@@ -167,9 +167,8 @@ else()
# Disable warning when compiling tests as gtest does not use 'override'. # Disable warning when compiling tests as gtest does not use 'override'.
add_cxx_compiler_flag(-Wsuggest-override) add_cxx_compiler_flag(-Wsuggest-override)
endif() endif()
# Disabled until googletest (gmock) stops emitting variadic macro warnings add_cxx_compiler_flag(-pedantic)
#add_cxx_compiler_flag(-pedantic) add_cxx_compiler_flag(-pedantic-errors)
#add_cxx_compiler_flag(-pedantic-errors)
add_cxx_compiler_flag(-Wshorten-64-to-32) add_cxx_compiler_flag(-Wshorten-64-to-32)
add_cxx_compiler_flag(-fstrict-aliasing) add_cxx_compiler_flag(-fstrict-aliasing)
# Disable warnings regarding deprecated parts of the library while building # Disable warnings regarding deprecated parts of the library while building
......
src/benchmark.cc
...@@ -308,7 +308,7 @@ void FlushStreams(BenchmarkReporter* reporter) { ...@@ -308,7 +308,7 @@ void FlushStreams(BenchmarkReporter* reporter) {
if (!reporter) return; if (!reporter) return;
std::flush(reporter->GetOutputStream()); std::flush(reporter->GetOutputStream());
std::flush(reporter->GetErrorStream()); std::flush(reporter->GetErrorStream());
}; }
// Reports in both display and file reporters. // Reports in both display and file reporters.
void Report(BenchmarkReporter* display_reporter, void Report(BenchmarkReporter* display_reporter,
...@@ -333,7 +333,7 @@ void Report(BenchmarkReporter* display_reporter, ...@@ -333,7 +333,7 @@ void Report(BenchmarkReporter* display_reporter,
FlushStreams(display_reporter); FlushStreams(display_reporter);
FlushStreams(file_reporter); FlushStreams(file_reporter);
}; }
void RunBenchmarks(const std::vector<BenchmarkInstance>& benchmarks, void RunBenchmarks(const std::vector<BenchmarkInstance>& benchmarks,
BenchmarkReporter* display_reporter, BenchmarkReporter* display_reporter,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment