diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 662e7a2a..9c92cb89 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -104,8 +104,8 @@ set(INTERNAL_HEADERS ${SOURCES_DIR}/internal/catch_singletons.hpp ${SOURCES_DIR}/internal/catch_startup_exception_registry.hpp ${SOURCES_DIR}/internal/catch_stream.hpp - ${SOURCES_DIR}/catch_stringref.hpp ${SOURCES_DIR}/internal/catch_string_manip.hpp + ${SOURCES_DIR}/internal/catch_stringref.hpp ${SOURCES_DIR}/catch_tag_alias.hpp ${SOURCES_DIR}/catch_tag_alias_autoregistrar.hpp ${SOURCES_DIR}/internal/catch_tag_alias_registry.hpp diff --git a/src/catch2/catch_all.hpp b/src/catch2/catch_all.hpp index 0cc9550d..c3f35500 100644 --- a/src/catch2/catch_all.hpp +++ b/src/catch2/catch_all.hpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -72,6 +71,7 @@ #include #include #include +#include #include #include #include diff --git a/src/catch2/catch_assertion_info.hpp b/src/catch2/catch_assertion_info.hpp index b05f4921..1e94f21f 100644 --- a/src/catch2/catch_assertion_info.hpp +++ b/src/catch2/catch_assertion_info.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include namespace Catch { diff --git a/src/catch2/catch_assertion_result.hpp b/src/catch2/catch_assertion_result.hpp index 5b1029f3..1afcf7c9 100644 --- a/src/catch2/catch_assertion_result.hpp +++ b/src/catch2/catch_assertion_result.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include namespace Catch { diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp index 263fb232..1f89af56 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_section_info.hpp b/src/catch2/catch_section_info.hpp index 6c8edb53..69648d0c 100644 --- a/src/catch2/catch_section_info.hpp +++ b/src/catch2/catch_section_info.hpp @@ -9,7 +9,7 @@ #define TWOBLUECUBES_CATCH_SECTION_INFO_H_INCLUDED #include -#include +#include #include #include diff --git a/src/catch2/catch_test_case_info.hpp b/src/catch2/catch_test_case_info.hpp index ccdaec67..f586ce92 100644 --- a/src/catch2/catch_test_case_info.hpp +++ b/src/catch2/catch_test_case_info.hpp @@ -9,7 +9,7 @@ #define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED #include -#include +#include #include #include diff --git a/src/catch2/interfaces/catch_interfaces_capture.hpp b/src/catch2/interfaces/catch_interfaces_capture.hpp index 72fdcbec..d26d4f27 100644 --- a/src/catch2/interfaces/catch_interfaces_capture.hpp +++ b/src/catch2/interfaces/catch_interfaces_capture.hpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include namespace Catch { diff --git a/src/catch2/interfaces/catch_interfaces_enum_values_registry.hpp b/src/catch2/interfaces/catch_interfaces_enum_values_registry.hpp index 2439c630..1a4fce26 100644 --- a/src/catch2/interfaces/catch_interfaces_enum_values_registry.hpp +++ b/src/catch2/interfaces/catch_interfaces_enum_values_registry.hpp @@ -8,7 +8,7 @@ #ifndef TWOBLUECUBES_CATCH_INTERFACESENUMVALUESREGISTRY_H_INCLUDED #define TWOBLUECUBES_CATCH_INTERFACESENUMVALUESREGISTRY_H_INCLUDED -#include +#include #include diff --git a/src/catch2/interfaces/catch_interfaces_reporter.hpp b/src/catch2/interfaces/catch_interfaces_reporter.hpp index 9edb9951..4c7391ec 100644 --- a/src/catch2/interfaces/catch_interfaces_reporter.hpp +++ b/src/catch2/interfaces/catch_interfaces_reporter.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/catch2/internal/catch_decomposer.hpp b/src/catch2/internal/catch_decomposer.hpp index 6ed828b9..4c90091c 100644 --- a/src/catch2/internal/catch_decomposer.hpp +++ b/src/catch2/internal/catch_decomposer.hpp @@ -9,7 +9,7 @@ #define TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED #include -#include +#include #include #include diff --git a/src/catch2/internal/catch_list.hpp b/src/catch2/internal/catch_list.hpp index 14abea77..88e4c2c8 100644 --- a/src/catch2/internal/catch_list.hpp +++ b/src/catch2/internal/catch_list.hpp @@ -9,7 +9,7 @@ #define TWOBLUECUBES_CATCH_LIST_H_INCLUDED #include -#include +#include #include #include diff --git a/src/catch2/internal/catch_stream.cpp b/src/catch2/internal/catch_stream.cpp index 5a29441b..809acc0b 100644 --- a/src/catch2/internal/catch_stream.cpp +++ b/src/catch2/internal/catch_stream.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/catch2/internal/catch_string_manip.cpp b/src/catch2/internal/catch_string_manip.cpp index 4e9322da..b24ec880 100644 --- a/src/catch2/internal/catch_string_manip.cpp +++ b/src/catch2/internal/catch_string_manip.cpp @@ -6,7 +6,7 @@ */ #include -#include +#include #include #include diff --git a/src/catch2/internal/catch_string_manip.hpp b/src/catch2/internal/catch_string_manip.hpp index f0b36a69..8570a8c0 100644 --- a/src/catch2/internal/catch_string_manip.hpp +++ b/src/catch2/internal/catch_string_manip.hpp @@ -7,7 +7,7 @@ #ifndef TWOBLUECUBES_CATCH_STRING_MANIP_H_INCLUDED #define TWOBLUECUBES_CATCH_STRING_MANIP_H_INCLUDED -#include +#include #include #include diff --git a/src/catch2/internal/catch_stringref.cpp b/src/catch2/internal/catch_stringref.cpp index 53e224eb..4b0bbae6 100644 --- a/src/catch2/internal/catch_stringref.cpp +++ b/src/catch2/internal/catch_stringref.cpp @@ -6,7 +6,7 @@ */ #include -#include +#include #include #include diff --git a/src/catch2/catch_stringref.hpp b/src/catch2/internal/catch_stringref.hpp similarity index 100% rename from src/catch2/catch_stringref.hpp rename to src/catch2/internal/catch_stringref.hpp diff --git a/src/catch2/internal/catch_test_macro_impl.hpp b/src/catch2/internal/catch_test_macro_impl.hpp index ffb767ed..effd5884 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 // We need this suppression to leak, because it took until GCC 9 // for the front end to handle local suppression via _Pragma properly diff --git a/src/catch2/internal/catch_test_registry.hpp b/src/catch2/internal/catch_test_registry.hpp index def1de2d..8a027bd9 100644 --- a/src/catch2/internal/catch_test_registry.hpp +++ b/src/catch2/internal/catch_test_registry.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include diff --git a/src/catch2/matchers/catch_matchers_templated.hpp b/src/catch2/matchers/catch_matchers_templated.hpp index d1ca7813..34bef90e 100644 --- a/src/catch2/matchers/catch_matchers_templated.hpp +++ b/src/catch2/matchers/catch_matchers_templated.hpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include diff --git a/src/catch2/matchers/internal/catch_matchers_impl.hpp b/src/catch2/matchers/internal/catch_matchers_impl.hpp index 9f706201..fe548265 100644 --- a/src/catch2/matchers/internal/catch_matchers_impl.hpp +++ b/src/catch2/matchers/internal/catch_matchers_impl.hpp @@ -6,7 +6,7 @@ #define TWOBLUECUBES_CATCH_CAPTURE_MATCHERS_HPP_INCLUDED #include -#include +#include namespace Catch { diff --git a/src/catch2/reporters/catch_reporter_console.cpp b/src/catch2/reporters/catch_reporter_console.cpp index a7cb9fb7..cb38318b 100644 --- a/src/catch2/reporters/catch_reporter_console.cpp +++ b/src/catch2/reporters/catch_reporter_console.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/SelfTest/IntrospectiveTests/String.tests.cpp b/tests/SelfTest/IntrospectiveTests/String.tests.cpp index e616801c..8c57e583 100644 --- a/tests/SelfTest/IntrospectiveTests/String.tests.cpp +++ b/tests/SelfTest/IntrospectiveTests/String.tests.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include