diff options
| author | Martin Hořeňovský | 2023-02-19 19:45:14 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2023-02-20 14:31:26 +0100 |
| commit | dcc9fa3f38f1962ef01bb4b273f999df9d0b2b3d (patch) | |
| tree | 1dec2f431eb4a524b0e2086b11c04908b787b2ac | |
| parent | bf6a15a69a694b0717c9eb8cc04cf7ae1305b002 (diff) | |
| download | catch3-dcc9fa3f38f1962ef01bb4b273f999df9d0b2b3d.tar.gz | |
Use StringRef UDL for more string literals when expanding macros
* for the name of the listener when registering listener
* for the original expression in assertion macros
| -rw-r--r-- | src/catch2/internal/catch_test_macro_impl.hpp | 4 | ||||
| -rw-r--r-- | src/catch2/reporters/catch_reporter_registrars.hpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/catch2/internal/catch_test_macro_impl.hpp b/src/catch2/internal/catch_test_macro_impl.hpp index 1b4ea8e7..e569680b 100644 --- a/src/catch2/internal/catch_test_macro_impl.hpp +++ b/src/catch2/internal/catch_test_macro_impl.hpp @@ -23,9 +23,9 @@ #if !defined(CATCH_CONFIG_DISABLE) #if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION) - #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__ + #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__##_catch_sr #else - #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION" + #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"_catch_sr #endif #if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) diff --git a/src/catch2/reporters/catch_reporter_registrars.hpp b/src/catch2/reporters/catch_reporter_registrars.hpp index fe8cf1ec..db5688f2 100644 --- a/src/catch2/reporters/catch_reporter_registrars.hpp +++ b/src/catch2/reporters/catch_reporter_registrars.hpp @@ -118,7 +118,7 @@ namespace Catch { CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ namespace { \ Catch::ListenerRegistrar<listenerType> INTERNAL_CATCH_UNIQUE_NAME( \ - catch_internal_RegistrarFor )( #listenerType ); \ + catch_internal_RegistrarFor )( #listenerType##_catch_sr ); \ } \ CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION |