From c3f448e96fb422eaeed2022acae94f3f1fac6a2e Mon Sep 17 00:00:00 2001 From: "dmitry.trifonov" Date: Thu, 7 Nov 2013 16:56:26 +0400 Subject: [PATCH] compiler checks for __COUNTER__ --- include/internal/catch_common.h | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/include/internal/catch_common.h b/include/internal/catch_common.h index 8336880d..b41f3a22 100644 --- a/include/internal/catch_common.h +++ b/include/internal/catch_common.h @@ -10,10 +10,24 @@ #define INTERNAL_CATCH_UNIQUE_NAME_COUNTER2( name, counter ) name##counter #define INTERNAL_CATCH_UNIQUE_NAME_COUNTER( name, counter ) INTERNAL_CATCH_UNIQUE_NAME_COUNTER2( name, counter ) +#define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_COUNTER( name, __LINE__ ) + +// try to define truly unique name independent of line it has been introduced +#if defined(_MSC_VER) && (_MSC_VER >= 1300) + // __COUNTER__ introduced in VS 7 (VS.NET 2002) + #define INTERNAL_CATCH_TRUE_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_COUNTER( name, __COUNTER__ ) +#elif defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 3) + // __COUNTER__ introduced in gcc 4.3 + // http://gcc.gnu.org/gcc-4.3/changes.html + #define INTERNAL_CATCH_TRUE_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_COUNTER( name, __COUNTER__ ) +#elif defined(__clang__) && (__clang_major__ >= 3) + // really haven't found when __COUNTER__ was introduced in clang, but 3.0 definetely have it + #define INTERNAL_CATCH_TRUE_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_COUNTER( name, __COUNTER__ ) +#else + // since there's no __COUNTER__ use __LINE__ as a more or less reasonable substitute + #define INTERNAL_CATCH_TRUE_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_COUNTER( name, __LINE__ ) +#endif -#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line -#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) -#define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ ) #define INTERNAL_CATCH_STRINGIFY2( expr ) #expr #define INTERNAL_CATCH_STRINGIFY( expr ) INTERNAL_CATCH_STRINGIFY2( expr )