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

This commit is contained in:
Eric Fiselier 2015-03-17 14:01:04 -04:00
parent df904a1980
commit 8e72846da4
3 changed files with 5 additions and 5 deletions

View File

@ -15,7 +15,7 @@
#define BENCHMARK_BENCHMARK_H_
#include "macros.h"
#include "minimal_benchmark.h"
#include "benchmark_api.h"
#include "reporter.h"
#endif // BENCHMARK_BENCHMARK_H_

View File

@ -132,8 +132,8 @@ static void BM_MultiThreaded(benchmark::State& state) {
BENCHMARK(BM_MultiThreaded)->Threads(4);
*/
#ifndef BENCHMARK_MINIMAL_BENCHMARK_H_
#define BENCHMARK_MINIMAL_BENCHMARK_H_
#ifndef BENCHMARK_BENCHMARK_API_H_
#define BENCHMARK_BENCHMARK_API_H_
#include <assert.h>
#include <stddef.h>
@ -462,4 +462,4 @@ class Benchmark {
::benchmark::RunSpecifiedBenchmarks(); \
}
#endif // BENCHMARK_MINIMAL_BENCHMARK_H_
#endif // BENCHMARK_BENCHMARK_API_H_

View File

@ -18,7 +18,7 @@
#include <utility>
#include <vector>
#include "benchmark.h" // For forward declaration of BenchmarkReporter
#include "benchmark_api.h" // For forward declaration of BenchmarkReporter
namespace benchmark {