dolysis
/
benchmark
mirror of https://github.com/google/benchmark.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix MSVC build failures

This commit is contained in:
Eric Fiselier 2016-08-02 19:33:41 -06:00
parent 5f5ca31ce0
commit 25eae60c4c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/benchmark/benchmark_api.h
View File

@ -660,8 +660,10 @@ internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn) {
return internal::RegisterBenchmarkInternal(
::new BenchType(name, std::forward<Lambda>(fn)));
}
#endif
#if !defined(BENCHMARK_GCC_VERSION) || BENCHMARK_GCC_VERSION >= 409
#if defined(BENCHMARK_HAS_CXX11) && \
(!defined(BENCHMARK_GCC_VERSION) || BENCHMARK_GCC_VERSION >= 409)
template <class Lambda, class ...Args>
internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn,
Args&&... args) {
@ -671,7 +673,7 @@ internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn,
#else
#define BENCHMARK_HAS_NO_VARIADIC_REGISTER_BENCHMARK
#endif
#endif // BENCHMARK_HAS_CXX11
// The base class for all fixture tests.
class Fixture: public internal::Benchmark {