Commit 25eae60c by Eric Fiselier

Attempt to fix MSVC build failures

parent 5f5ca31c
...@@ -660,8 +660,10 @@ internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn) { ...@@ -660,8 +660,10 @@ internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn) {
return internal::RegisterBenchmarkInternal( return internal::RegisterBenchmarkInternal(
::new BenchType(name, std::forward<Lambda>(fn))); ::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> template <class Lambda, class ...Args>
internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn, internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn,
Args&&... args) { Args&&... args) {
...@@ -671,7 +673,7 @@ internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn, ...@@ -671,7 +673,7 @@ internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn,
#else #else
#define BENCHMARK_HAS_NO_VARIADIC_REGISTER_BENCHMARK #define BENCHMARK_HAS_NO_VARIADIC_REGISTER_BENCHMARK
#endif #endif
#endif // BENCHMARK_HAS_CXX11
// The base class for all fixture tests. // The base class for all fixture tests.
class Fixture: public internal::Benchmark { class Fixture: public internal::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