github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2025-04-02 15:40:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'new-api' into api-merge

Browse Source
This commit is contained in:
Eric Fiselier 2015-02-18 18:47:19 -05:00
commit 6f2ee1a361
4 changed files with 9 additions and 9 deletions

2
include/benchmark/benchmark.h
View File

@ -124,7 +124,7 @@ class Benchmark {
static void AddRange(std::vector<int>* dst, int lo, int hi, int mult);
DISALLOW_COPY_AND_ASSIGN(Benchmark)
BENCHMARK_DISALLOW_COPY_AND_ASSIGN(Benchmark);
};
// ------------------------------------------------------

12
include/benchmark/macros.h
View File

@ -19,13 +19,13 @@
#endif
#if __cplusplus < 201103L
# define DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&); \
TypeName& operator=(const TypeName&);
# define BENCHMARK_DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&); \
TypeName& operator=(const TypeName&)
#else
# define DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&) = delete; \
TypeName& operator=(const TypeName&) = delete;
# define BENCHMARK_DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&) = delete; \
TypeName& operator=(const TypeName&) = delete
#endif
#if defined(__GNUC__)

2
include/benchmark/minimal_benchmark.h
View File

@ -447,7 +447,7 @@ public:
private:
Benchmark *imp_;
DISALLOW_COPY_AND_ASSIGN(MinimalBenchmark)
BENCHMARK_DISALLOW_COPY_AND_ASSIGN(MinimalBenchmark);
};

2
src/walltime.cc
View File

@ -104,7 +104,7 @@ private:
std::atomic<int32_t> drift_adjust_;
int64_t max_interval_cycles_;
DISALLOW_COPY_AND_ASSIGN(WallTimeImp)
BENCHMARK_DISALLOW_COPY_AND_ASSIGN(WallTimeImp);
};