Remove unnecessary includes. (see #2094)

src/catch2/benchmark/catch_benchmark.hpp

@@ -12,7 +12,6 @@
 
 #include <catch2/interfaces/catch_interfaces_config.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <catch2/internal/catch_context.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/internal/catch_unique_name.hpp>

src/catch2/benchmark/detail/catch_stats.cpp

@@ -10,7 +10,6 @@
 #include <catch2/benchmark/detail/catch_stats.hpp>
 
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 
 #include <cassert>
 #include <cstddef>

src/catch2/catch_tag_alias_autoregistrar.hpp

@@ -9,7 +9,6 @@
 #define CATCH_TAG_ALIAS_AUTOREGISTRAR_HPP_INCLUDED
 
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <catch2/internal/catch_unique_name.hpp>
 #include <catch2/internal/catch_source_line_info.hpp>
 

src/catch2/catch_translate_exception.hpp

@@ -10,7 +10,6 @@
 
 #include <catch2/interfaces/catch_interfaces_exception.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <catch2/internal/catch_unique_name.hpp>
 
 #include <exception>

src/catch2/internal/catch_clara.hpp

@@ -8,6 +8,8 @@
 #ifndef CATCH_CLARA_HPP_INCLUDED
 #define CATCH_CLARA_HPP_INCLUDED
 
+#include <catch2/internal/catch_compiler_detections.hpp>
+
 #if defined( CATCH_COMPILER_CLANG )
 #    pragma clang diagnostic push
 #    pragma clang diagnostic ignored "-Wweak-vtables"
@@ -29,7 +31,6 @@
 #    endif
 #endif
 
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 #include <catch2/internal/catch_noncopyable.hpp>
 #include <catch2/internal/catch_void_type.hpp>

src/catch2/internal/catch_combined_tu.cpp

@@ -24,7 +24,6 @@
 
 #include <catch2/catch_tag_alias_autoregistrar.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
 
 namespace Catch {
@@ -46,7 +45,6 @@ namespace Catch {
 //////////////////////////////////////////
 
 #include <catch2/internal/catch_polyfills.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <cmath>
 
 namespace Catch {
@@ -75,7 +73,6 @@ namespace Catch {
 // vvv formerly catch_uncaught_exceptions.cpp vvv //
 ////////////////////////////////////////////////////
 
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <catch2/internal/catch_uncaught_exceptions.hpp>
 #include <catch2/internal/catch_config_uncaught_exceptions.hpp>
 
@@ -131,7 +128,6 @@ namespace Catch {
 // vvv formerly catch_startup_exception_registry.cpp vvv //
 ///////////////////////////////////////////////////////////
 #include <catch2/internal/catch_startup_exception_registry.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 
 namespace Catch {
 #if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)

src/catch2/internal/catch_commandline.cpp

@@ -8,7 +8,6 @@
 #include <catch2/internal/catch_commandline.hpp>
 
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <catch2/catch_config.hpp>
 #include <catch2/internal/catch_string_manip.hpp>
 #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>

src/catch2/internal/catch_compiler_capabilities.hpp

@@ -28,22 +28,6 @@
 #include <catch2/internal/catch_platform.hpp>
 #include <catch2/catch_user_config.hpp>
 
-#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
-
 #ifdef __cplusplus
 
 #  if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)

src/catch2/internal/catch_console_colour.cpp

@@ -4,6 +4,9 @@
 //   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
+#include <catch2/internal/catch_console_colour.hpp>
+#include <catch2/internal/catch_compiler_detections.hpp>
+
 // SPDX-License-Identifier: BSL-1.0
 #if defined(CATCH_COMPILER_CLANG)
 #    pragma clang diagnostic push
@@ -11,7 +14,6 @@
 #endif
 
 
-#include <catch2/internal/catch_console_colour.hpp>
 #include <catch2/internal/catch_enforce.hpp>
 #include <catch2/internal/catch_errno_guard.hpp>
 #include <catch2/interfaces/catch_interfaces_config.hpp>
@@ -22,7 +24,6 @@
 #include <catch2/internal/catch_debugger.hpp>
 #include <catch2/internal/catch_windows_h_proxy.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 
 #include <cassert>
 #include <ostream>

src/catch2/internal/catch_enforce.hpp

@@ -10,7 +10,6 @@
 
 #include <catch2/internal/catch_source_line_info.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <catch2/internal/catch_stream.hpp>
 
 #include <exception>

src/catch2/internal/catch_exception_translator_registry.cpp

@@ -7,7 +7,6 @@
 // SPDX-License-Identifier: BSL-1.0
 #include <catch2/internal/catch_exception_translator_registry.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <catch2/internal/catch_enforce.hpp>
 #include <catch2/internal/catch_test_failure_exception.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>

src/catch2/internal/catch_fatal_condition_handler.hpp

@@ -10,7 +10,6 @@
 
 #include <catch2/internal/catch_platform.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 
 #include <cassert>
 

src/catch2/internal/catch_main.cpp

@@ -7,7 +7,6 @@
 // SPDX-License-Identifier: BSL-1.0
 #include <catch2/catch_session.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <catch2/internal/catch_config_wchar.hpp>
 #include <catch2/internal/catch_leak_detector.hpp>
 #include <catch2/internal/catch_platform.hpp>

src/catch2/internal/catch_run_context.cpp

@@ -11,7 +11,6 @@
 #include <catch2/interfaces/catch_interfaces_generatortracker.hpp>
 #include <catch2/interfaces/catch_interfaces_config.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <catch2/internal/catch_context.hpp>
 #include <catch2/internal/catch_enforce.hpp>
 #include <catch2/internal/catch_fatal_condition_handler.hpp>

src/catch2/internal/catch_section.hpp

@@ -9,7 +9,6 @@
 #define CATCH_SECTION_HPP_INCLUDED
 
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <catch2/internal/catch_noncopyable.hpp>
 #include <catch2/catch_section_info.hpp>
 #include <catch2/catch_timer.hpp>

src/catch2/internal/catch_source_line_info.cpp

@@ -10,6 +10,8 @@
 #include <cstring>
 #include <ostream>
 
+#include <catch2/internal/catch_compiler_detections.hpp>
+
 namespace Catch {
 
     bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {

src/catch2/internal/catch_test_registry.cpp

@@ -7,7 +7,6 @@
 // SPDX-License-Identifier: BSL-1.0
 #include <catch2/internal/catch_test_registry.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <catch2/catch_test_case_info.hpp>
 #include <catch2/internal/catch_test_case_registry_impl.hpp>
 #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>

src/catch2/internal/catch_to_string.hpp

@@ -11,7 +11,6 @@
 #include <string>
 
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <catch2/internal/catch_stream.hpp>
 
 namespace Catch {

src/catch2/reporters/catch_reporter_registrars.hpp

@@ -12,7 +12,6 @@
 #include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter_factory.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 

tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp

@@ -16,7 +16,6 @@
 #include <catch2/internal/catch_commandline.hpp>
 #include <catch2/generators/catch_generators.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_compiler_detections.hpp>
 
 
 namespace {