From a4be8a56d1dd7cf918a78bdd7a33870a8b323877 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Feb 2024 20:56:27 +0100 Subject: [PATCH] Avoid problems with CppUnit's macros when doing unity builds --- tests/testutils.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/testutils.h b/tests/testutils.h index 7a856bb..09b3a65 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -14,6 +14,12 @@ #define CPP_UTILITIES_HAS_EXEC_APP #endif +// ensure CppUnit's macros produce unique variable names when doing unity builds +#if defined(__COUNTER__) +#undef CPPUNIT_UNIQUE_COUNTER +#define CPPUNIT_UNIQUE_COUNTER __COUNTER__ +#endif + namespace CppUtilities { /*!