github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2024-12-28 21:40:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from Nukesor/patch-1

Browse Source 
Unable to compile because of unused parameter
This commit is contained in:
Dominic Hamon 2014-04-07 18:57:31 -07:00
commit 54cd4fd848
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -8,6 +8,7 @@
# #
# Please keep the list sorted. # Please keep the list sorted.
Arne Beer <arne@twobeer.de>
Christopher Seymour <chris.j.seymour@hotmail.com> Christopher Seymour <chris.j.seymour@hotmail.com>
David Coeurjolly <david.coeurjolly@liris.cnrs.fr> David Coeurjolly <david.coeurjolly@liris.cnrs.fr>
Dominic Hamon <dma@stripysock.com> Dominic Hamon <dma@stripysock.com>

1
CONTRIBUTORS
View File

@ -22,6 +22,7 @@
# #
# Please keep the list sorted. # Please keep the list sorted.
Arne Beer <arne@twobeer.de>
Christopher Seymour <chris.j.seymour@hotmail.com> Christopher Seymour <chris.j.seymour@hotmail.com>
David Coeurjolly <david.coeurjolly@liris.cnrs.fr> David Coeurjolly <david.coeurjolly@liris.cnrs.fr>
Dominic Hamon <dma@stripysock.com> Dominic Hamon <dma@stripysock.com>

2
src/benchmark.cc
View File

@ -863,7 +863,7 @@ void Benchmark::RunInstance(const Instance& b, const BenchmarkReporter* br) {
// Run the specified benchmark, measure its peak memory usage, and // Run the specified benchmark, measure its peak memory usage, and
// return the peak memory usage. // return the peak memory usage.
double Benchmark::MeasurePeakHeapMemory(const Instance& b) { double Benchmark::MeasurePeakHeapMemory(const Instance&) {
if (!get_memory_usage) return 0.0; if (!get_memory_usage) return 0.0;
double bytes = 0.0; double bytes = 0.0;
/* TODO(dominich) /* TODO(dominich)