Commit 8e72846d by Eric Fiselier

rename minimal_benchmark.h and fix recursive include in benchmark_api.h

parent df904a19
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#define BENCHMARK_BENCHMARK_H_ #define BENCHMARK_BENCHMARK_H_
#include "macros.h" #include "macros.h"
#include "minimal_benchmark.h" #include "benchmark_api.h"
#include "reporter.h" #include "reporter.h"
#endif // BENCHMARK_BENCHMARK_H_ #endif // BENCHMARK_BENCHMARK_H_
...@@ -132,8 +132,8 @@ static void BM_MultiThreaded(benchmark::State& state) { ...@@ -132,8 +132,8 @@ static void BM_MultiThreaded(benchmark::State& state) {
BENCHMARK(BM_MultiThreaded)->Threads(4); BENCHMARK(BM_MultiThreaded)->Threads(4);
*/ */
#ifndef BENCHMARK_MINIMAL_BENCHMARK_H_ #ifndef BENCHMARK_BENCHMARK_API_H_
#define BENCHMARK_MINIMAL_BENCHMARK_H_ #define BENCHMARK_BENCHMARK_API_H_
#include <assert.h> #include <assert.h>
#include <stddef.h> #include <stddef.h>
...@@ -462,4 +462,4 @@ class Benchmark { ...@@ -462,4 +462,4 @@ class Benchmark {
::benchmark::RunSpecifiedBenchmarks(); \ ::benchmark::RunSpecifiedBenchmarks(); \
} }
#endif // BENCHMARK_MINIMAL_BENCHMARK_H_ #endif // BENCHMARK_BENCHMARK_API_H_
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "benchmark.h" // For forward declaration of BenchmarkReporter #include "benchmark_api.h" // For forward declaration of BenchmarkReporter
namespace benchmark { namespace benchmark {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment