Fix INSTANTIATE_TEST_CASE_P with zero variadic arguments

This commit is contained in:
Ayaz Salikhov
2019-01-18 14:53:25 +03:00
parent 0adeadd283
commit 7c4164bf40
2 changed files with 32 additions and 7 deletions

View File

@@ -41,6 +41,7 @@
#include <memory>
#include <set>
#include <tuple>
#include <type_traits>
#include <utility>
#include <vector>
@@ -396,6 +397,30 @@ typename ParamNameGenFunc<ParamType>::Type *GetParamNameGen() {
return DefaultParamName;
}
// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
//
// Macroses allow to address an issue with zero element variadic macro
#define EXPAND(X) X
#define VA__GETFIRST(X, ...) X
#define VA_GETFIRST(...) EXPAND(VA__GETFIRST(__VA_ARGS__, 0))
#define VA_GETREST(X, ...) __VA_ARGS__
// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
//
// Function is intended to swallow 0 as last argument and call GetParamNameGen
template <class ParamType>
auto CreateParamGenerator(int) -> decltype(GetParamNameGen<ParamType>()) {
return GetParamNameGen<ParamType>();
}
template <class ParamType, class Arg>
auto CreateParamGenerator(Arg&& arg, int) -> decltype(
GetParamNameGen<ParamType>(std::forward<Arg>(arg))) {
return GetParamNameGen<ParamType>(std::forward<Arg>(arg));
}
// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
//
// Stores a parameter value and later creates tests parameterized with that