From 50f459d2c0110b5ea752455a2094fc83abe83ff5 Mon Sep 17 00:00:00 2001 From: Arne Beer Date: Sun, 6 Apr 2014 16:42:24 +0200 Subject: [PATCH 1/3] Unable to compile because of unused parameter There is a unused parameter at benchmark:866 Benchmark::MeasurePeakHeapMemory . The function is marked as TODO and the code that uses the parameter is commented out. I just removed the parameter so it can compile again without editing the CMake compile flags. --- src/benchmark.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/benchmark.cc b/src/benchmark.cc index 60145909..dc8c6f3f 100644 --- a/src/benchmark.cc +++ b/src/benchmark.cc @@ -863,7 +863,7 @@ void Benchmark::RunInstance(const Instance& b, const BenchmarkReporter* br) { // Run the specified benchmark, measure its peak memory usage, and // return the peak memory usage. -double Benchmark::MeasurePeakHeapMemory(const Instance& b) { +double Benchmark::MeasurePeakHeapMemory() { if (!get_memory_usage) return 0.0; double bytes = 0.0; /* TODO(dominich) From feea2f022f532c68cca55d4b0b43b2b3b58b7961 Mon Sep 17 00:00:00 2001 From: Arne Beer Date: Sun, 6 Apr 2014 22:03:51 +0200 Subject: [PATCH 2/3] Compile warning removed, adding myself to contributors --- CONTRIBUTORS | 1 + src/benchmark.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 1989f209..9ee150c6 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -22,6 +22,7 @@ # # Please keep the list sorted. +Arne Beer Christopher Seymour David Coeurjolly Dominic Hamon diff --git a/src/benchmark.cc b/src/benchmark.cc index dc8c6f3f..7e1357f6 100644 --- a/src/benchmark.cc +++ b/src/benchmark.cc @@ -863,7 +863,7 @@ void Benchmark::RunInstance(const Instance& b, const BenchmarkReporter* br) { // Run the specified benchmark, measure its peak memory usage, and // return the peak memory usage. -double Benchmark::MeasurePeakHeapMemory() { +double Benchmark::MeasurePeakHeapMemory(const Instance&) { if (!get_memory_usage) return 0.0; double bytes = 0.0; /* TODO(dominich) From 92cb4ec50c039eeb37ae281ba911ef81e34afd77 Mon Sep 17 00:00:00 2001 From: Arne Beer Date: Mon, 7 Apr 2014 22:19:53 +0200 Subject: [PATCH 3/3] Update AUTHORS --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 3ceec3c5..818dd2ef 100644 --- a/AUTHORS +++ b/AUTHORS @@ -8,6 +8,7 @@ # # Please keep the list sorted. +Arne Beer Christopher Seymour David Coeurjolly Dominic Hamon