From 4453fefb00b6757b2414783c38c2ddfdd56320d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Tue, 29 Aug 2017 15:45:58 +0200 Subject: [PATCH] Remove check for compiler version before using __COUNTER__ All still supported compiler versions support __COUNTER__. User can also still turn off use of __COUNTER__ by defining CATCH_CONFIG_NO_COUNTER. --- include/internal/catch_compiler_capabilities.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/include/internal/catch_compiler_capabilities.h b/include/internal/catch_compiler_capabilities.h index 56fd4673..3bd40461 100644 --- a/include/internal/catch_compiler_capabilities.h +++ b/include/internal/catch_compiler_capabilities.h @@ -86,15 +86,10 @@ //////////////////////////////////////////////////////////////////////////////// -// Use __COUNTER__ if the compiler supports it -#if ( defined _MSC_VER && _MSC_VER >= 1300 ) || \ - ( defined __GNUC__ && ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3 )) ) || \ - ( defined __clang__ && __clang_major__ >= 3 ) - +// All supported compilers support COUNTER macro, +//but user still might want to turn it off #define CATCH_INTERNAL_CONFIG_COUNTER -#endif - // Now set the actual defines based on the above + anything the user has configured