@@ -351,9 +351,9 @@ CString libc_make_test_file_path_func(const char *file_name);
351351 } \
352352 void Run () override ; \
353353 const char *getName () const override { return name; } \
354- static constexpr TypeList::Tests<SuiteName##_##TestName>::type \
355- SuiteName##_##TestName##_Instance; \
356354 }; \
355+ constexpr TypeList::Tests<SuiteName##_##TestName>::type \
356+ SuiteName##_##TestName##_Instance; \
357357 template <typename T> void SuiteName##_##TestName<T>::Run()
358358
359359#define TYPED_TEST_F (SuiteClass, TestName, TypeList ) \
@@ -371,9 +371,9 @@ CString libc_make_test_file_path_func(const char *file_name);
371371 } \
372372 void Run () override ; \
373373 const char *getName () const override { return name; } \
374- static constexpr TypeList::Tests<SuiteClass##_##TestName>::type \
375- SuiteClass##_##TestName##_Instance; \
376374 }; \
375+ static constexpr TypeList::Tests<SuiteClass##_##TestName>::type \
376+ SuiteClass##_##TestName##_Instance; \
377377 template <typename T> void SuiteClass##_##TestName<T>::Run()
378378
379379#define TEST (SuiteName, TestName ) \
@@ -384,8 +384,8 @@ CString libc_make_test_file_path_func(const char *file_name);
384384 constexpr SuiteName##_##TestName() { addTest (this ); } \
385385 void Run () override ; \
386386 const char *getName () const override { return #SuiteName " ." #TestName; } \
387- static constexpr SuiteName##_##TestName SuiteName##_##TestName##_Instance; \
388387 }; \
388+ static constexpr SuiteName##_##TestName SuiteName##_##TestName##_Instance; \
389389 void SuiteName##_##TestName::Run()
390390
391391#define TEST_F (SuiteClass, TestName ) \
@@ -397,9 +397,8 @@ CString libc_make_test_file_path_func(const char *file_name);
397397 constexpr SuiteClass##_##TestName() { addTest (this ); } \
398398 void Run () override ; \
399399 const char *getName () const override { return #SuiteClass " ." #TestName; } \
400- static constexpr SuiteClass##_##TestName \
401- SuiteClass##_##TestName##_Instance; \
402400 }; \
401+ static constexpr SuiteClass##_##TestName SuiteClass##_##TestName##_Instance; \
403402 void SuiteClass##_##TestName::Run()
404403
405404// Helper to trick the compiler into ignoring lack of braces on the else
0 commit comments