commit 5e10e120db2ddf36d75e910ec2c77adebbf7543f
author Ismael <ijimenezm@hotmail.es> Tue May 24 20:26:21 2016 +0200
committer Ismael <ijimenezm@hotmail.es> Tue May 24 20:26:21 2016 +0200
tree 4d9d370196107d6c02617a1917afe323c9877771
parent e5cf020d9730d24391e1cd1dfb37aef2c163d82c

fixed overshadow

include/benchmark/benchmark_api.h

diff --git a/include/benchmark/benchmark_api.h b/include/benchmark/benchmark_api.h
index 5f1ee20..04ec624 100644
--- a/include/benchmark/benchmark_api.h
+++ b/include/benchmark/benchmark_api.h
@@ -321,7 +321,7 @@
   }
 
   BENCHMARK_ALWAYS_INLINE
-  size_t complexity_n() {
+  size_t complexity_length_n() {
     return complexity_n_;
   }
 

src/benchmark.cc

diff --git a/src/benchmark.cc b/src/benchmark.cc
index c515e8d..e13fa52 100644
--- a/src/benchmark.cc
+++ b/src/benchmark.cc
@@ -694,7 +694,7 @@
     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();