From 5e10e120db2ddf36d75e910ec2c77adebbf7543f Mon Sep 17 00:00:00 2001 From: Ismael Date: Tue, 24 May 2016 20:26:21 +0200 Subject: [PATCH] fixed overshadow --- include/benchmark/benchmark_api.h | 2 +- src/benchmark.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/benchmark/benchmark_api.h b/include/benchmark/benchmark_api.h index 5f1ee204..04ec6243 100644 --- a/include/benchmark/benchmark_api.h +++ b/include/benchmark/benchmark_api.h @@ -321,7 +321,7 @@ public: } BENCHMARK_ALWAYS_INLINE - size_t complexity_n() { + size_t complexity_length_n() { return complexity_n_; } diff --git a/src/benchmark.cc b/src/benchmark.cc index c515e8dc..e13fa522 100644 --- a/src/benchmark.cc +++ b/src/benchmark.cc @@ -694,7 +694,7 @@ void RunInThread(const benchmark::internal::Benchmark::Instance* b, MutexLock l(GetBenchmarkLock()); total->bytes_processed += st.bytes_processed(); total->items_processed += st.items_processed(); - total->complexity_n += st.complexity_n(); + total->complexity_n += st.complexity_length_n(); } timer_manager->Finalize();