Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Only provide CATCH_REGISTER_ENUM

No longer have version without the CATCH_ prefix
Commit
541f1ed1b3be769044b7cbb0f35770df73a1d219
Author
Phil Nash ·
Parents
346723c9b62d

Files · Download .tar.gz

Changes

 include/internal/catch_tostring.h                   | 6 +-----
 projects/SelfTest/UsageTests/EnumToString.tests.cpp | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/internal/catch_tostring.h b/include/internal/catch_tostring.h
index d2b43920..07bbc3b6 100644
--- a/include/internal/catch_tostring.h
+++ b/include/internal/catch_tostring.h
@@ -648,11 +648,7 @@ struct ratio_string<std::milli> {
         } \
     };
 
-#ifdef CATCH_CONFIG_PREFIX_ALL
-#  define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
-#else
-#  define REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
-#endif
+#define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
 
 #ifdef _MSC_VER
 #pragma warning(pop)
diff --git a/projects/SelfTest/UsageTests/EnumToString.tests.cpp b/projects/SelfTest/UsageTests/EnumToString.tests.cpp
index 49ea9ca2..ee68968c 100644
--- a/projects/SelfTest/UsageTests/EnumToString.tests.cpp
+++ b/projects/SelfTest/UsageTests/EnumToString.tests.cpp
@@ -67,7 +67,7 @@ TEST_CASE( "toString(enum class w/operator<<)", "[toString][enum][enumClass]" )
 
 enum class EnumClass3 { Value1, Value2, Value3, Value4 };
 
-REGISTER_ENUM( EnumClass3, EnumClass3::Value1, EnumClass3::Value2, EnumClass3::Value3 )
+CATCH_REGISTER_ENUM( EnumClass3, EnumClass3::Value1, EnumClass3::Value2, EnumClass3::Value3 )
 
 
 TEST_CASE( "REGISTER_ENUM" ) {