From cb49c62af9cdd5da6df5aadbc86c83b94fd807df Mon Sep 17 00:00:00 2001 From: HoseynHeydari Date: Sat, 16 Apr 2022 01:13:02 +0430 Subject: [PATCH] Move macros to seprate header file. (see #2094) --- examples/231-Cfg-OutputStreams.cpp | 2 +- src/catch2/benchmark/catch_benchmark.hpp | 1 + src/catch2/benchmark/catch_optimizer.hpp | 2 +- .../benchmark/detail/catch_estimate_clock.hpp | 2 +- src/catch2/benchmark/detail/catch_stats.cpp | 1 + src/catch2/catch_all.hpp | 1 + src/catch2/catch_config.cpp | 2 +- src/catch2/catch_tag_alias_autoregistrar.hpp | 1 + src/catch2/catch_template_test_macros.hpp | 2 +- src/catch2/catch_test_case_info.hpp | 2 +- src/catch2/catch_test_spec.hpp | 2 +- src/catch2/catch_tostring.hpp | 1 + src/catch2/catch_translate_exception.hpp | 1 + src/catch2/internal/catch_clara.hpp | 2 +- src/catch2/internal/catch_combined_tu.cpp | 7 ++--- src/catch2/internal/catch_commandline.cpp | 1 + .../internal/catch_compiler_capabilities.hpp | 2 +- .../internal/catch_compiler_detections.hpp | 26 +++++++++++++++++++ .../catch_config_uncaught_exceptions.hpp | 2 +- src/catch2/internal/catch_console_colour.cpp | 2 +- .../internal/catch_container_nonmembers.hpp | 1 + src/catch2/internal/catch_debugger.cpp | 2 +- src/catch2/internal/catch_debugger.hpp | 2 +- src/catch2/internal/catch_decomposer.hpp | 2 +- src/catch2/internal/catch_enforce.hpp | 1 + .../catch_exception_translator_registry.cpp | 1 + .../catch_fatal_condition_handler.cpp | 2 +- .../catch_fatal_condition_handler.hpp | 1 + src/catch2/internal/catch_main.cpp | 1 + src/catch2/internal/catch_output_redirect.cpp | 2 +- src/catch2/internal/catch_output_redirect.hpp | 1 + src/catch2/internal/catch_platform.hpp | 2 +- src/catch2/internal/catch_preprocessor.hpp | 2 +- .../catch_random_number_generator.cpp | 2 +- src/catch2/internal/catch_run_context.cpp | 1 + src/catch2/internal/catch_section.hpp | 1 + src/catch2/internal/catch_stream.hpp | 2 +- .../internal/catch_template_test_registry.hpp | 1 + .../internal/catch_test_case_tracker.cpp | 2 +- src/catch2/internal/catch_test_macro_impl.hpp | 2 +- src/catch2/internal/catch_test_registry.cpp | 1 + src/catch2/internal/catch_test_registry.hpp | 2 +- .../internal/catch_test_spec_parser.hpp | 2 +- src/catch2/internal/catch_to_string.hpp | 1 + .../catch_matchers_floating_point.cpp | 2 +- .../reporters/catch_reporter_combined_tu.cpp | 2 +- .../reporters/catch_reporter_console.cpp | 2 +- src/catch2/reporters/catch_reporter_junit.cpp | 2 +- .../reporters/catch_reporter_registrars.hpp | 1 + .../reporters/catch_reporter_teamcity.hpp | 2 +- src/catch2/reporters/catch_reporter_xml.cpp | 2 +- tests/ExtraTests/X02-DisabledMacros.cpp | 2 +- .../IntrospectiveTests/CmdLine.tests.cpp | 1 + .../IntrospectiveTests/Details.tests.cpp | 2 +- tests/SelfTest/TestRegistrations.cpp | 2 +- .../SelfTest/UsageTests/Compilation.tests.cpp | 2 +- tests/SelfTest/UsageTests/Condition.tests.cpp | 2 +- tests/SelfTest/UsageTests/Exception.tests.cpp | 2 +- .../SelfTest/UsageTests/Generators.tests.cpp | 2 +- tests/SelfTest/UsageTests/Matchers.tests.cpp | 2 +- .../UsageTests/MatchersRanges.tests.cpp | 2 +- tests/SelfTest/UsageTests/Message.tests.cpp | 2 +- tests/SelfTest/UsageTests/Misc.tests.cpp | 2 +- .../UsageTests/ToStringWhich.tests.cpp | 2 +- tests/SelfTest/UsageTests/Tricky.tests.cpp | 2 +- third_party/clara.hpp | 2 +- 66 files changed, 94 insertions(+), 47 deletions(-) create mode 100644 src/catch2/internal/catch_compiler_detections.hpp diff --git a/examples/231-Cfg-OutputStreams.cpp b/examples/231-Cfg-OutputStreams.cpp index 5dccd541..dd49cf2c 100644 --- a/examples/231-Cfg-OutputStreams.cpp +++ b/examples/231-Cfg-OutputStreams.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include class out_buff : public std::stringbuf { std::FILE* m_stream; diff --git a/src/catch2/benchmark/catch_benchmark.hpp b/src/catch2/benchmark/catch_benchmark.hpp index 28664b61..28da3286 100644 --- a/src/catch2/benchmark/catch_benchmark.hpp +++ b/src/catch2/benchmark/catch_benchmark.hpp @@ -12,6 +12,7 @@ #include #include +#include #include #include #include diff --git a/src/catch2/benchmark/catch_optimizer.hpp b/src/catch2/benchmark/catch_optimizer.hpp index 549b3e85..0db1a751 100644 --- a/src/catch2/benchmark/catch_optimizer.hpp +++ b/src/catch2/benchmark/catch_optimizer.hpp @@ -10,7 +10,7 @@ #ifndef CATCH_OPTIMIZER_HPP_INCLUDED #define CATCH_OPTIMIZER_HPP_INCLUDED -#include +#include #if defined(CATCH_COMPILER_MSC) # include // atomic_thread_fence diff --git a/src/catch2/benchmark/detail/catch_estimate_clock.hpp b/src/catch2/benchmark/detail/catch_estimate_clock.hpp index 0ae439f1..f37a239c 100644 --- a/src/catch2/benchmark/detail/catch_estimate_clock.hpp +++ b/src/catch2/benchmark/detail/catch_estimate_clock.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/catch2/benchmark/detail/catch_stats.cpp b/src/catch2/benchmark/detail/catch_stats.cpp index 0f94d5b7..deba9a0e 100644 --- a/src/catch2/benchmark/detail/catch_stats.cpp +++ b/src/catch2/benchmark/detail/catch_stats.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/catch2/catch_all.hpp b/src/catch2/catch_all.hpp index b082b766..77dd00c3 100644 --- a/src/catch2/catch_all.hpp +++ b/src/catch2/catch_all.hpp @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp index 852f0e46..b96cf46a 100644 --- a/src/catch2/catch_config.cpp +++ b/src/catch2/catch_config.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/catch2/catch_tag_alias_autoregistrar.hpp b/src/catch2/catch_tag_alias_autoregistrar.hpp index c742bcd3..ee73c7a5 100644 --- a/src/catch2/catch_tag_alias_autoregistrar.hpp +++ b/src/catch2/catch_tag_alias_autoregistrar.hpp @@ -9,6 +9,7 @@ #define CATCH_TAG_ALIAS_AUTOREGISTRAR_HPP_INCLUDED #include +#include #include #include diff --git a/src/catch2/catch_template_test_macros.hpp b/src/catch2/catch_template_test_macros.hpp index df30ddd0..e90d3730 100644 --- a/src/catch2/catch_template_test_macros.hpp +++ b/src/catch2/catch_template_test_macros.hpp @@ -8,7 +8,7 @@ #ifndef CATCH_TEMPLATE_TEST_MACROS_HPP_INCLUDED #define CATCH_TEMPLATE_TEST_MACROS_HPP_INCLUDED -#include +#include // We need this suppression to leak, because it took until GCC 10 // for the front end to handle local suppression via _Pragma properly diff --git a/src/catch2/catch_test_case_info.hpp b/src/catch2/catch_test_case_info.hpp index 5477ccc2..0b279cb7 100644 --- a/src/catch2/catch_test_case_info.hpp +++ b/src/catch2/catch_test_case_info.hpp @@ -8,7 +8,7 @@ #ifndef CATCH_TEST_CASE_INFO_HPP_INCLUDED #define CATCH_TEST_CASE_INFO_HPP_INCLUDED -#include +#include #include #include #include diff --git a/src/catch2/catch_test_spec.hpp b/src/catch2/catch_test_spec.hpp index 9f155690..8cb89c91 100644 --- a/src/catch2/catch_test_spec.hpp +++ b/src/catch2/catch_test_spec.hpp @@ -8,7 +8,7 @@ #ifndef CATCH_TEST_SPEC_HPP_INCLUDED #define CATCH_TEST_SPEC_HPP_INCLUDED -#include +#include #ifdef CATCH_COMPILER_CLANG #pragma clang diagnostic push diff --git a/src/catch2/catch_tostring.hpp b/src/catch2/catch_tostring.hpp index b6d416c1..92c799f1 100644 --- a/src/catch2/catch_tostring.hpp +++ b/src/catch2/catch_tostring.hpp @@ -16,6 +16,7 @@ #include #include +#include #include #include #include diff --git a/src/catch2/catch_translate_exception.hpp b/src/catch2/catch_translate_exception.hpp index dfd95cd6..f4dc0599 100644 --- a/src/catch2/catch_translate_exception.hpp +++ b/src/catch2/catch_translate_exception.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/catch2/internal/catch_clara.hpp b/src/catch2/internal/catch_clara.hpp index 30102251..add00c0d 100644 --- a/src/catch2/internal/catch_clara.hpp +++ b/src/catch2/internal/catch_clara.hpp @@ -29,7 +29,7 @@ # endif #endif -#include +#include #include #include #include diff --git a/src/catch2/internal/catch_combined_tu.cpp b/src/catch2/internal/catch_combined_tu.cpp index 601ac8e7..71af4cae 100644 --- a/src/catch2/internal/catch_combined_tu.cpp +++ b/src/catch2/internal/catch_combined_tu.cpp @@ -24,6 +24,7 @@ #include #include +#include #include namespace Catch { @@ -45,7 +46,7 @@ namespace Catch { ////////////////////////////////////////// #include -#include +#include #include namespace Catch { @@ -74,7 +75,7 @@ namespace Catch { // vvv formerly catch_uncaught_exceptions.cpp vvv // //////////////////////////////////////////////////// -#include +#include #include #include @@ -130,7 +131,7 @@ namespace Catch { // vvv formerly catch_startup_exception_registry.cpp vvv // /////////////////////////////////////////////////////////// #include -#include +#include namespace Catch { #if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) diff --git a/src/catch2/internal/catch_commandline.cpp b/src/catch2/internal/catch_commandline.cpp index d16e7e37..fb2275d1 100644 --- a/src/catch2/internal/catch_commandline.cpp +++ b/src/catch2/internal/catch_commandline.cpp @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/src/catch2/internal/catch_compiler_capabilities.hpp b/src/catch2/internal/catch_compiler_capabilities.hpp index 314ce98b..16888c74 100644 --- a/src/catch2/internal/catch_compiler_capabilities.hpp +++ b/src/catch2/internal/catch_compiler_capabilities.hpp @@ -24,7 +24,7 @@ // Many features, at point of detection, define an _INTERNAL_ macro, so they // can be combined, en-mass, with the _NO_ forms later. -#include +#include #include #include diff --git a/src/catch2/internal/catch_compiler_detections.hpp b/src/catch2/internal/catch_compiler_detections.hpp new file mode 100644 index 00000000..f30bc446 --- /dev/null +++ b/src/catch2/internal/catch_compiler_detections.hpp @@ -0,0 +1,26 @@ + +// Copyright Catch2 Authors +// Distributed under the Boost Software License, Version 1.0. +// (See accompanying file LICENSE_1_0.txt or copy at +// https://www.boost.org/LICENSE_1_0.txt) + +#ifndef CATCH_COMPILER_DETECTIONS_HPP_INCLUDED +#define CATCH_COMPILER_DETECTIONS_HPP_INCLUDED + +#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__) && !defined(__LCC__) +#define CATCH_COMPILER_GCC +#endif + +#if defined(__clang__) +#define CATCH_COMPILER_CLANG +#endif + +#if defined(_MSC_VER) && !defined(__clang__) +#define CATCH_COMPILER_MSC +#endif + +#if defined(__MINGW32__) +#define CATCH_COMPILER_MINGW32 +#endif + +#endif // CATCH_COMPILER_DETECTIONS_HPP_INCLUDED \ No newline at end of file diff --git a/src/catch2/internal/catch_config_uncaught_exceptions.hpp b/src/catch2/internal/catch_config_uncaught_exceptions.hpp index beabd31d..d3dc37a1 100644 --- a/src/catch2/internal/catch_config_uncaught_exceptions.hpp +++ b/src/catch2/internal/catch_config_uncaught_exceptions.hpp @@ -17,7 +17,7 @@ #ifndef CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED #define CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED -#include +#include #if defined(CATCH_COMPILER_MSC) # if _MSC_VER >= 1900 // Visual Studio 2015 or newer diff --git a/src/catch2/internal/catch_console_colour.cpp b/src/catch2/internal/catch_console_colour.cpp index 54ea3a70..ae22d67b 100644 --- a/src/catch2/internal/catch_console_colour.cpp +++ b/src/catch2/internal/catch_console_colour.cpp @@ -11,7 +11,6 @@ #endif -#include #include #include #include @@ -22,6 +21,7 @@ #include #include #include +#include #include diff --git a/src/catch2/internal/catch_container_nonmembers.hpp b/src/catch2/internal/catch_container_nonmembers.hpp index b828415c..7e9f8c12 100644 --- a/src/catch2/internal/catch_container_nonmembers.hpp +++ b/src/catch2/internal/catch_container_nonmembers.hpp @@ -9,6 +9,7 @@ #define CATCH_CONTAINER_NONMEMBERS_HPP_INCLUDED #include +#include #include #include diff --git a/src/catch2/internal/catch_debugger.cpp b/src/catch2/internal/catch_debugger.cpp index 31d77725..9b51b1f3 100644 --- a/src/catch2/internal/catch_debugger.cpp +++ b/src/catch2/internal/catch_debugger.cpp @@ -7,7 +7,7 @@ // SPDX-License-Identifier: BSL-1.0 #include -#include +#include #include #include #include diff --git a/src/catch2/internal/catch_debugger.hpp b/src/catch2/internal/catch_debugger.hpp index ca364d36..e89756f0 100644 --- a/src/catch2/internal/catch_debugger.hpp +++ b/src/catch2/internal/catch_debugger.hpp @@ -8,7 +8,7 @@ #ifndef CATCH_DEBUGGER_HPP_INCLUDED #define CATCH_DEBUGGER_HPP_INCLUDED -#include +#include #include namespace Catch { diff --git a/src/catch2/internal/catch_decomposer.hpp b/src/catch2/internal/catch_decomposer.hpp index 68390e72..73772ec6 100644 --- a/src/catch2/internal/catch_decomposer.hpp +++ b/src/catch2/internal/catch_decomposer.hpp @@ -9,7 +9,7 @@ #define CATCH_DECOMPOSER_HPP_INCLUDED #include -#include +#include #include #include diff --git a/src/catch2/internal/catch_enforce.hpp b/src/catch2/internal/catch_enforce.hpp index 3f81ef1a..a12de27c 100644 --- a/src/catch2/internal/catch_enforce.hpp +++ b/src/catch2/internal/catch_enforce.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/catch2/internal/catch_exception_translator_registry.cpp b/src/catch2/internal/catch_exception_translator_registry.cpp index acddea6e..603d00c2 100644 --- a/src/catch2/internal/catch_exception_translator_registry.cpp +++ b/src/catch2/internal/catch_exception_translator_registry.cpp @@ -7,6 +7,7 @@ // SPDX-License-Identifier: BSL-1.0 #include #include +#include #include #include #include diff --git a/src/catch2/internal/catch_fatal_condition_handler.cpp b/src/catch2/internal/catch_fatal_condition_handler.cpp index 754d643b..05d4165c 100644 --- a/src/catch2/internal/catch_fatal_condition_handler.cpp +++ b/src/catch2/internal/catch_fatal_condition_handler.cpp @@ -26,7 +26,7 @@ #include -#include +#include #include #include #include diff --git a/src/catch2/internal/catch_fatal_condition_handler.hpp b/src/catch2/internal/catch_fatal_condition_handler.hpp index 389dab5d..1d5d2196 100644 --- a/src/catch2/internal/catch_fatal_condition_handler.hpp +++ b/src/catch2/internal/catch_fatal_condition_handler.hpp @@ -10,6 +10,7 @@ #include #include +#include #include diff --git a/src/catch2/internal/catch_main.cpp b/src/catch2/internal/catch_main.cpp index f523bbfa..373d838f 100644 --- a/src/catch2/internal/catch_main.cpp +++ b/src/catch2/internal/catch_main.cpp @@ -7,6 +7,7 @@ // SPDX-License-Identifier: BSL-1.0 #include #include +#include #include #include #include diff --git a/src/catch2/internal/catch_output_redirect.cpp b/src/catch2/internal/catch_output_redirect.cpp index 235cc07a..a6bae64f 100644 --- a/src/catch2/internal/catch_output_redirect.cpp +++ b/src/catch2/internal/catch_output_redirect.cpp @@ -7,7 +7,7 @@ // SPDX-License-Identifier: BSL-1.0 #include -#include +#include #include #include diff --git a/src/catch2/internal/catch_output_redirect.hpp b/src/catch2/internal/catch_output_redirect.hpp index 1ccce57e..021b6d5e 100644 --- a/src/catch2/internal/catch_output_redirect.hpp +++ b/src/catch2/internal/catch_output_redirect.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff --git a/src/catch2/internal/catch_platform.hpp b/src/catch2/internal/catch_platform.hpp index 158044e6..ba723765 100644 --- a/src/catch2/internal/catch_platform.hpp +++ b/src/catch2/internal/catch_platform.hpp @@ -8,7 +8,7 @@ #ifndef CATCH_PLATFORM_HPP_INCLUDED #define CATCH_PLATFORM_HPP_INCLUDED -#include +#include // See e.g.: // https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h.auto.html diff --git a/src/catch2/internal/catch_preprocessor.hpp b/src/catch2/internal/catch_preprocessor.hpp index 80023a18..3aac18df 100644 --- a/src/catch2/internal/catch_preprocessor.hpp +++ b/src/catch2/internal/catch_preprocessor.hpp @@ -8,7 +8,7 @@ #ifndef CATCH_PREPROCESSOR_HPP_INCLUDED #define CATCH_PREPROCESSOR_HPP_INCLUDED -#include +#include #if defined(CATCH_COMPILER_GCC) // We need to silence "empty __VA_ARGS__ warning", and using just _Pragma does not work diff --git a/src/catch2/internal/catch_random_number_generator.cpp b/src/catch2/internal/catch_random_number_generator.cpp index e154446d..75d91e38 100644 --- a/src/catch2/internal/catch_random_number_generator.cpp +++ b/src/catch2/internal/catch_random_number_generator.cpp @@ -7,7 +7,7 @@ // SPDX-License-Identifier: BSL-1.0 #include -#include +#include namespace Catch { diff --git a/src/catch2/internal/catch_run_context.cpp b/src/catch2/internal/catch_run_context.cpp index 6a32cdc1..40836a61 100644 --- a/src/catch2/internal/catch_run_context.cpp +++ b/src/catch2/internal/catch_run_context.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/src/catch2/internal/catch_section.hpp b/src/catch2/internal/catch_section.hpp index 2e72923c..f6b3ed80 100644 --- a/src/catch2/internal/catch_section.hpp +++ b/src/catch2/internal/catch_section.hpp @@ -9,6 +9,7 @@ #define CATCH_SECTION_HPP_INCLUDED #include +#include #include #include #include diff --git a/src/catch2/internal/catch_stream.hpp b/src/catch2/internal/catch_stream.hpp index a3397a86..cdc50996 100644 --- a/src/catch2/internal/catch_stream.hpp +++ b/src/catch2/internal/catch_stream.hpp @@ -8,7 +8,7 @@ #ifndef CATCH_STREAM_HPP_INCLUDED #define CATCH_STREAM_HPP_INCLUDED -#include +#include #include #include diff --git a/src/catch2/internal/catch_template_test_registry.hpp b/src/catch2/internal/catch_template_test_registry.hpp index e45ad952..7eee9118 100644 --- a/src/catch2/internal/catch_template_test_registry.hpp +++ b/src/catch2/internal/catch_template_test_registry.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/src/catch2/internal/catch_test_case_tracker.cpp b/src/catch2/internal/catch_test_case_tracker.cpp index 7fd7fc55..192e4b48 100644 --- a/src/catch2/internal/catch_test_case_tracker.cpp +++ b/src/catch2/internal/catch_test_case_tracker.cpp @@ -7,7 +7,7 @@ // SPDX-License-Identifier: BSL-1.0 #include -#include +#include #include #include #include diff --git a/src/catch2/internal/catch_test_macro_impl.hpp b/src/catch2/internal/catch_test_macro_impl.hpp index 55a6534b..c49d1c59 100644 --- a/src/catch2/internal/catch_test_macro_impl.hpp +++ b/src/catch2/internal/catch_test_macro_impl.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/catch2/internal/catch_test_registry.cpp b/src/catch2/internal/catch_test_registry.cpp index faadb101..5fa87b53 100644 --- a/src/catch2/internal/catch_test_registry.cpp +++ b/src/catch2/internal/catch_test_registry.cpp @@ -7,6 +7,7 @@ // SPDX-License-Identifier: BSL-1.0 #include #include +#include #include #include #include diff --git a/src/catch2/internal/catch_test_registry.hpp b/src/catch2/internal/catch_test_registry.hpp index 1b0d099f..cd28dd66 100644 --- a/src/catch2/internal/catch_test_registry.hpp +++ b/src/catch2/internal/catch_test_registry.hpp @@ -8,7 +8,7 @@ #ifndef CATCH_TEST_REGISTRY_HPP_INCLUDED #define CATCH_TEST_REGISTRY_HPP_INCLUDED -#include +#include #include #include #include diff --git a/src/catch2/internal/catch_test_spec_parser.hpp b/src/catch2/internal/catch_test_spec_parser.hpp index 1a216be3..b4a52f85 100644 --- a/src/catch2/internal/catch_test_spec_parser.hpp +++ b/src/catch2/internal/catch_test_spec_parser.hpp @@ -13,7 +13,7 @@ #pragma clang diagnostic ignored "-Wpadded" #endif -#include +#include #include #include diff --git a/src/catch2/internal/catch_to_string.hpp b/src/catch2/internal/catch_to_string.hpp index d8ff35cf..069ca72c 100644 --- a/src/catch2/internal/catch_to_string.hpp +++ b/src/catch2/internal/catch_to_string.hpp @@ -11,6 +11,7 @@ #include #include +#include #include namespace Catch { diff --git a/src/catch2/matchers/catch_matchers_floating_point.cpp b/src/catch2/matchers/catch_matchers_floating_point.cpp index f8854847..66dfb663 100644 --- a/src/catch2/matchers/catch_matchers_floating_point.cpp +++ b/src/catch2/matchers/catch_matchers_floating_point.cpp @@ -6,7 +6,7 @@ // SPDX-License-Identifier: BSL-1.0 #include -#include +#include #include #include #include diff --git a/src/catch2/reporters/catch_reporter_combined_tu.cpp b/src/catch2/reporters/catch_reporter_combined_tu.cpp index fdd10649..6cfe78ba 100644 --- a/src/catch2/reporters/catch_reporter_combined_tu.cpp +++ b/src/catch2/reporters/catch_reporter_combined_tu.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/catch2/reporters/catch_reporter_console.cpp b/src/catch2/reporters/catch_reporter_console.cpp index 20d7c145..19a48a78 100644 --- a/src/catch2/reporters/catch_reporter_console.cpp +++ b/src/catch2/reporters/catch_reporter_console.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/catch2/reporters/catch_reporter_junit.cpp b/src/catch2/reporters/catch_reporter_junit.cpp index e9859e05..48dbd300 100644 --- a/src/catch2/reporters/catch_reporter_junit.cpp +++ b/src/catch2/reporters/catch_reporter_junit.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/catch2/reporters/catch_reporter_registrars.hpp b/src/catch2/reporters/catch_reporter_registrars.hpp index 31ecb080..49f49f45 100644 --- a/src/catch2/reporters/catch_reporter_registrars.hpp +++ b/src/catch2/reporters/catch_reporter_registrars.hpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include diff --git a/src/catch2/reporters/catch_reporter_teamcity.hpp b/src/catch2/reporters/catch_reporter_teamcity.hpp index b15c04a7..d8a3730e 100644 --- a/src/catch2/reporters/catch_reporter_teamcity.hpp +++ b/src/catch2/reporters/catch_reporter_teamcity.hpp @@ -8,7 +8,7 @@ #ifndef CATCH_REPORTER_TEAMCITY_HPP_INCLUDED #define CATCH_REPORTER_TEAMCITY_HPP_INCLUDED -#include +#include #include #include diff --git a/src/catch2/reporters/catch_reporter_xml.cpp b/src/catch2/reporters/catch_reporter_xml.cpp index e34af221..d62f2711 100644 --- a/src/catch2/reporters/catch_reporter_xml.cpp +++ b/src/catch2/reporters/catch_reporter_xml.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/ExtraTests/X02-DisabledMacros.cpp b/tests/ExtraTests/X02-DisabledMacros.cpp index d2d8f1e5..b236b22b 100644 --- a/tests/ExtraTests/X02-DisabledMacros.cpp +++ b/tests/ExtraTests/X02-DisabledMacros.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include diff --git a/tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp b/tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp index e7b0c9c1..c910664c 100644 --- a/tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp +++ b/tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp @@ -16,6 +16,7 @@ #include #include #include +#include namespace { diff --git a/tests/SelfTest/IntrospectiveTests/Details.tests.cpp b/tests/SelfTest/IntrospectiveTests/Details.tests.cpp index d2a290e2..5bc3d4f3 100644 --- a/tests/SelfTest/IntrospectiveTests/Details.tests.cpp +++ b/tests/SelfTest/IntrospectiveTests/Details.tests.cpp @@ -6,7 +6,7 @@ // SPDX-License-Identifier: BSL-1.0 -#include +#include #include #include #include diff --git a/tests/SelfTest/TestRegistrations.cpp b/tests/SelfTest/TestRegistrations.cpp index d5d9b564..8be2c8cd 100644 --- a/tests/SelfTest/TestRegistrations.cpp +++ b/tests/SelfTest/TestRegistrations.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include diff --git a/tests/SelfTest/UsageTests/Compilation.tests.cpp b/tests/SelfTest/UsageTests/Compilation.tests.cpp index 5b57e098..eb9db8f4 100644 --- a/tests/SelfTest/UsageTests/Compilation.tests.cpp +++ b/tests/SelfTest/UsageTests/Compilation.tests.cpp @@ -12,7 +12,7 @@ // in a different namespace. #include -#include +#include namespace foo { struct helper_1403 { diff --git a/tests/SelfTest/UsageTests/Condition.tests.cpp b/tests/SelfTest/UsageTests/Condition.tests.cpp index edd122d4..de0857b2 100644 --- a/tests/SelfTest/UsageTests/Condition.tests.cpp +++ b/tests/SelfTest/UsageTests/Condition.tests.cpp @@ -6,7 +6,7 @@ // SPDX-License-Identifier: BSL-1.0 -#include +#include #ifdef CATCH_COMPILER_CLANG # pragma clang diagnostic push diff --git a/tests/SelfTest/UsageTests/Exception.tests.cpp b/tests/SelfTest/UsageTests/Exception.tests.cpp index 9e8b7314..bcaa21db 100644 --- a/tests/SelfTest/UsageTests/Exception.tests.cpp +++ b/tests/SelfTest/UsageTests/Exception.tests.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/tests/SelfTest/UsageTests/Generators.tests.cpp b/tests/SelfTest/UsageTests/Generators.tests.cpp index 30ef24a4..e04371eb 100644 --- a/tests/SelfTest/UsageTests/Generators.tests.cpp +++ b/tests/SelfTest/UsageTests/Generators.tests.cpp @@ -7,7 +7,7 @@ // SPDX-License-Identifier: BSL-1.0 #include -#include +#include #include #include #include diff --git a/tests/SelfTest/UsageTests/Matchers.tests.cpp b/tests/SelfTest/UsageTests/Matchers.tests.cpp index f70e5602..66a418f4 100644 --- a/tests/SelfTest/UsageTests/Matchers.tests.cpp +++ b/tests/SelfTest/UsageTests/Matchers.tests.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include diff --git a/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp b/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp index 42a6f30c..54b7c4eb 100644 --- a/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp +++ b/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp @@ -7,7 +7,7 @@ // SPDX-License-Identifier: BSL-1.0 #include -#include +#include #include #include #include diff --git a/tests/SelfTest/UsageTests/Message.tests.cpp b/tests/SelfTest/UsageTests/Message.tests.cpp index 5a7dd355..cbd70050 100644 --- a/tests/SelfTest/UsageTests/Message.tests.cpp +++ b/tests/SelfTest/UsageTests/Message.tests.cpp @@ -7,7 +7,7 @@ // SPDX-License-Identifier: BSL-1.0 #include -#include +#include #include TEST_CASE( "INFO and WARN do not abort tests", "[messages][.]" ) { diff --git a/tests/SelfTest/UsageTests/Misc.tests.cpp b/tests/SelfTest/UsageTests/Misc.tests.cpp index 829f5086..6001fbf5 100644 --- a/tests/SelfTest/UsageTests/Misc.tests.cpp +++ b/tests/SelfTest/UsageTests/Misc.tests.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/tests/SelfTest/UsageTests/ToStringWhich.tests.cpp b/tests/SelfTest/UsageTests/ToStringWhich.tests.cpp index 4f786338..d3ef2b4b 100644 --- a/tests/SelfTest/UsageTests/ToStringWhich.tests.cpp +++ b/tests/SelfTest/UsageTests/ToStringWhich.tests.cpp @@ -8,7 +8,7 @@ #include -#include +#include #if defined(CATCH_COMPILER_GCC) // This has to be left enabled until end of the TU, because the GCC diff --git a/tests/SelfTest/UsageTests/Tricky.tests.cpp b/tests/SelfTest/UsageTests/Tricky.tests.cpp index 5108c6a5..68276f47 100644 --- a/tests/SelfTest/UsageTests/Tricky.tests.cpp +++ b/tests/SelfTest/UsageTests/Tricky.tests.cpp @@ -6,7 +6,7 @@ // SPDX-License-Identifier: BSL-1.0 -#include +#include #ifdef CATCH_COMPILER_CLANG #pragma clang diagnostic ignored "-Wpadded" diff --git a/third_party/clara.hpp b/third_party/clara.hpp index 6f661355..ca513ca0 100644 --- a/third_party/clara.hpp +++ b/third_party/clara.hpp @@ -47,7 +47,7 @@ #include #include -#include +#include #ifndef CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH #define CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80