diff --git a/UnitTest++/ParameterizedMacros.h b/UnitTest++/ParameterizedMacros.h index 0adc2ba..9043c90 100644 --- a/UnitTest++/ParameterizedMacros.h +++ b/UnitTest++/ParameterizedMacros.h @@ -5,21 +5,21 @@ #define SET_SUITE_PARAMETERS(Type, Name, SetUpBody) \ - class ParameterizedCreator ## Name \ + class ParameterizedCreator##Name \ { \ public: \ - ParameterizedCreator ## Name() : globalInstance(getGlobalInstance()) {} \ - UnitTest::ParameterizedTest<## Type> & globalInstance; \ + ParameterizedCreator##Name() : globalInstance(getGlobalInstance()) {} \ + UnitTest::ParameterizedTest & globalInstance; \ private: \ - static UnitTest::ParameterizedTest<## Type> & getGlobalInstance() \ + static UnitTest::ParameterizedTest & getGlobalInstance() \ { \ - static UnitTest::ParameterizedTest<## Type> instance(#Name, create()); \ + static UnitTest::ParameterizedTest instance(#Name, create()); \ return instance; \ } \ - static vector<## Type> create() { vector<## Type> parameters; SetUpBody return parameters; } \ - } static parameterizedCreator ## Name ## Instance; \ + static vector create() { vector parameters; SetUpBody return parameters; } \ + } static parameterizedCreator##Name##Instance; \ \ - static UnitTest::ParameterizedTest<## Type> & ## Name(parameterizedCreator ## Name ## Instance.globalInstance) + static UnitTest::ParameterizedTest & Name(parameterizedCreator##Name##Instance.globalInstance) #endif \ No newline at end of file