diff options
| author | Martin Hořeňovský | 2022-05-23 23:57:34 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2022-05-23 23:57:42 +0200 |
| commit | 85c00eb946b04a55a41aa131fb3f2050fa2f8b44 (patch) | |
| tree | bd118f98ac42986b17cdb55b0195b73f1a0e4bb0 | |
| parent | 3a18a688a07e3f7217d7a1b0ae45a324edfdef52 (diff) | |
| download | catch3-85c00eb946b04a55a41aa131fb3f2050fa2f8b44.tar.gz | |
Ensure that console_width.hpp includes user_config.hpp first
Otherwise we can get macro redefinition warnings when another
file includes console_width.hpp first, before user_config.hpp.
Closes #2431
| -rw-r--r-- | src/catch2/internal/catch_console_width.hpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/catch2/internal/catch_console_width.hpp b/src/catch2/internal/catch_console_width.hpp index ad868e33..7156ec4e 100644 --- a/src/catch2/internal/catch_console_width.hpp +++ b/src/catch2/internal/catch_console_width.hpp @@ -8,6 +8,10 @@ #ifndef CATCH_CONSOLE_WIDTH_HPP_INCLUDED #define CATCH_CONSOLE_WIDTH_HPP_INCLUDED +// This include must be kept so that user's configured value for CONSOLE_WIDTH +// is used before we attempt to provide a default value +#include <catch2/catch_user_config.hpp> + #ifndef CATCH_CONFIG_CONSOLE_WIDTH #define CATCH_CONFIG_CONSOLE_WIDTH 80 #endif |