commit 01bba479acbb04df26b74b99215eb2050e6bbc99
author Eric Fiselier <eric@efcs.ca> Wed Mar 18 14:50:16 2015 -0400
committer Eric Fiselier <eric@efcs.ca> Wed Mar 18 14:50:16 2015 -0400
tree 5d3396c28be867fd4b63a2c9fd34cd96c1fac27e
parent a6a90ec6b8404d512ca16696740ef9baf86061cf

Remove use of reserved names in benchmark macros

include/benchmark/benchmark_api.h

diff --git a/include/benchmark/benchmark_api.h b/include/benchmark/benchmark_api.h
index 41b8b4f..a4be2da 100644
--- a/include/benchmark/benchmark_api.h
+++ b/include/benchmark/benchmark_api.h
@@ -427,7 +427,7 @@
 
 #define BENCHMARK(n)                                         \
   static ::benchmark::internal::Benchmark* BENCHMARK_CONCAT( \
-      __benchmark_, n, __LINE__) BENCHMARK_UNUSED =          \
+      _benchmark_, n, __LINE__) BENCHMARK_UNUSED =           \
       (new ::benchmark::internal::Benchmark(#n, n))
 
 // Old-style macros
@@ -447,12 +447,12 @@
 // will register BM_Foo<1> as a benchmark.
 #define BENCHMARK_TEMPLATE(n, a)                             \
   static ::benchmark::internal::Benchmark* BENCHMARK_CONCAT( \
-      __benchmark_, n, __LINE__) BENCHMARK_UNUSED =          \
+      _benchmark_, n, __LINE__) BENCHMARK_UNUSED =           \
       (new ::benchmark::internal::Benchmark(#n "<" #a ">", n<a>))
 
 #define BENCHMARK_TEMPLATE2(n, a, b)                         \
   static ::benchmark::internal::Benchmark* BENCHMARK_CONCAT( \
-      __benchmark_, n, __LINE__) BENCHMARK_UNUSED =          \
+      _benchmark_, n, __LINE__) BENCHMARK_UNUSED =           \
       (new ::benchmark::internal::Benchmark(#n "<" #a "," #b ">", n<a, b>))
 
 // Helper macro to create a main routine in a test that runs the benchmarks