dolysis
/
benchmark
mirror of https://github.com/google/benchmark.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix pedantic compilation flag violation (#1156) 

';' after method definition was removed.
Also, pedantic flag is now uncommented in CMakeList.txt.
This commit is contained in:
Mariusz Wachowicz 2021-05-21 10:48:20 +02:00 committed by GitHub
parent a4bcd937b2
commit db2de74cc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -167,9 +167,8 @@ else()
# Disable warning when compiling tests as gtest does not use 'override'.
add_cxx_compiler_flag(-Wsuggest-override)
endif()
# Disabled until googletest (gmock) stops emitting variadic macro warnings
#add_cxx_compiler_flag(-pedantic)
#add_cxx_compiler_flag(-pedantic-errors)
add_cxx_compiler_flag(-pedantic)
add_cxx_compiler_flag(-pedantic-errors)
add_cxx_compiler_flag(-Wshorten-64-to-32)
add_cxx_compiler_flag(-fstrict-aliasing)
# Disable warnings regarding deprecated parts of the library while building

4
src/benchmark.cc
View File

@ -308,7 +308,7 @@ void FlushStreams(BenchmarkReporter* reporter) {
if (!reporter) return;
std::flush(reporter->GetOutputStream());
std::flush(reporter->GetErrorStream());
};
}
// Reports in both display and file reporters.
void Report(BenchmarkReporter* display_reporter,
@ -333,7 +333,7 @@ void Report(BenchmarkReporter* display_reporter,
FlushStreams(display_reporter);
FlushStreams(file_reporter);
};
}
void RunBenchmarks(const std::vector<BenchmarkInstance>& benchmarks,
BenchmarkReporter* display_reporter,