@@ -93,7 +93,7 @@ extern "C" _DLL_EXPORT TestList& __cdecl GetTestList();
93
93
} \
94
94
namespace Suite ##Name
95
95
96
- #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1926)
96
+ #if ! defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL
97
97
#define TEST_EX (Name, List, ...) \
98
98
class Test ##Name : public UnitTest::Test \
99
99
{ \
@@ -124,13 +124,13 @@ extern "C" _DLL_EXPORT TestList& __cdecl GetTestList();
124
124
void Test##Name::RunImpl() const
125
125
#endif
126
126
127
- #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1926)
127
+ #if ! defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL
128
128
#define TEST (Name, ...) TEST_EX(Name, UnitTest::GetTestList(), __VA_ARGS__)
129
129
#else
130
130
#define TEST (Name, ...) TEST_EX(Name, UnitTest::GetTestList(), ##__VA_ARGS__)
131
131
#endif
132
132
133
- #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1926)
133
+ #if ! defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL
134
134
#define TEST_FIXTURE_EX (Fixture, Name, List, ...) \
135
135
class Fixture ##Name##Helper : public Fixture \
136
136
{ \
@@ -242,7 +242,7 @@ extern "C" _DLL_EXPORT TestList& __cdecl GetTestList();
242
242
void Fixture##Name##Helper::RunImpl()
243
243
#endif
244
244
245
- #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1926)
245
+ #if ! defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL
246
246
#define TEST_FIXTURE (Fixture, Name, ...) TEST_FIXTURE_EX(Fixture, Name, UnitTest::GetTestList(), __VA_ARGS__)
247
247
#else
248
248
#define TEST_FIXTURE (Fixture, Name, ...) TEST_FIXTURE_EX(Fixture, Name, UnitTest::GetTestList(), ##__VA_ARGS__)
0 commit comments