diff options
| author | Martin Hořeňovský | 2020-11-27 11:08:26 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-11-28 11:18:51 +0100 |
| commit | 72525a3053f601f00e7d897d66750b1f1e8527c9 (patch) | |
| tree | 86e8fc0a4c740afe8130ae72ac260468000eea0f /src | |
| parent | 1982c0d5eef1c68a4c5b652fda8575ab3db7a839 (diff) | |
| download | catch3-72525a3053f601f00e7d897d66750b1f1e8527c9.tar.gz | |
Rename catch_common.hpp -> catch_source_line_info.hpp
Previous splitting of catch_common.hpp left it containing only one
actual thing, which is the `SourceLineInfo` type. Given that, there
is no reason to keep the old name.
Also found out that it was included in some places for no reason
(primarily Matchers).
Diffstat (limited to 'src')
22 files changed, 25 insertions, 28 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4aaea817..6398b808 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -47,7 +47,7 @@ set(INTERNAL_HEADERS ${SOURCES_DIR}/internal/catch_case_sensitive.hpp ${SOURCES_DIR}/internal/catch_clara.hpp ${SOURCES_DIR}/internal/catch_commandline.hpp - ${SOURCES_DIR}/internal/catch_common.hpp + ${SOURCES_DIR}/internal/catch_source_line_info.hpp ${SOURCES_DIR}/internal/catch_compiler_capabilities.hpp ${SOURCES_DIR}/catch_config.hpp ${SOURCES_DIR}/internal/catch_config_uncaught_exceptions.hpp @@ -145,7 +145,7 @@ set(IMPL_SOURCES ${SOURCES_DIR}/matchers/internal/catch_matchers_combined_tu.cpp ${SOURCES_DIR}/internal/catch_clara.cpp ${SOURCES_DIR}/internal/catch_commandline.cpp - ${SOURCES_DIR}/internal/catch_common.cpp + ${SOURCES_DIR}/internal/catch_source_line_info.cpp ${SOURCES_DIR}/catch_config.cpp ${SOURCES_DIR}/internal/catch_console_colour.cpp ${SOURCES_DIR}/internal/catch_context.cpp diff --git a/src/catch2/catch_all.hpp b/src/catch2/catch_all.hpp index ed035223..e266a26f 100644 --- a/src/catch2/catch_all.hpp +++ b/src/catch2/catch_all.hpp @@ -49,7 +49,6 @@ #include <catch2/internal/catch_case_sensitive.hpp> #include <catch2/internal/catch_clara.hpp> #include <catch2/internal/catch_commandline.hpp> -#include <catch2/internal/catch_common.hpp> #include <catch2/internal/catch_compiler_capabilities.hpp> #include <catch2/internal/catch_config_uncaught_exceptions.hpp> #include <catch2/internal/catch_console_colour.hpp> @@ -81,6 +80,7 @@ #include <catch2/internal/catch_run_context.hpp> #include <catch2/internal/catch_section.hpp> #include <catch2/internal/catch_singletons.hpp> +#include <catch2/internal/catch_source_line_info.hpp> #include <catch2/internal/catch_startup_exception_registry.hpp> #include <catch2/internal/catch_stream.hpp> #include <catch2/internal/catch_stream_end_stop.hpp> diff --git a/src/catch2/catch_assertion_info.hpp b/src/catch2/catch_assertion_info.hpp index 50a8e101..516c324c 100644 --- a/src/catch2/catch_assertion_info.hpp +++ b/src/catch2/catch_assertion_info.hpp @@ -9,7 +9,7 @@ #define CATCH_ASSERTION_INFO_HPP_INCLUDED #include <catch2/internal/catch_result_type.hpp> -#include <catch2/internal/catch_common.hpp> +#include <catch2/internal/catch_source_line_info.hpp> #include <catch2/internal/catch_stringref.hpp> namespace Catch { diff --git a/src/catch2/catch_assertion_result.hpp b/src/catch2/catch_assertion_result.hpp index b6356b5b..0afb0e02 100644 --- a/src/catch2/catch_assertion_result.hpp +++ b/src/catch2/catch_assertion_result.hpp @@ -8,13 +8,14 @@ #ifndef CATCH_ASSERTION_RESULT_HPP_INCLUDED #define CATCH_ASSERTION_RESULT_HPP_INCLUDED -#include <string> #include <catch2/catch_assertion_info.hpp> #include <catch2/internal/catch_result_type.hpp> -#include <catch2/internal/catch_common.hpp> +#include <catch2/internal/catch_source_line_info.hpp> #include <catch2/internal/catch_stringref.hpp> #include <catch2/internal/catch_lazy_expr.hpp> +#include <string> + namespace Catch { struct AssertionResultData diff --git a/src/catch2/catch_section_info.hpp b/src/catch2/catch_section_info.hpp index 67143c57..df0732ec 100644 --- a/src/catch2/catch_section_info.hpp +++ b/src/catch2/catch_section_info.hpp @@ -8,7 +8,7 @@ #ifndef CATCH_SECTION_INFO_HPP_INCLUDED #define CATCH_SECTION_INFO_HPP_INCLUDED -#include <catch2/internal/catch_common.hpp> +#include <catch2/internal/catch_source_line_info.hpp> #include <catch2/internal/catch_stringref.hpp> #include <catch2/catch_totals.hpp> diff --git a/src/catch2/catch_tag_alias.hpp b/src/catch2/catch_tag_alias.hpp index 0809dc12..d566d70c 100644 --- a/src/catch2/catch_tag_alias.hpp +++ b/src/catch2/catch_tag_alias.hpp @@ -8,7 +8,7 @@ #ifndef CATCH_TAG_ALIAS_HPP_INCLUDED #define CATCH_TAG_ALIAS_HPP_INCLUDED -#include <catch2/internal/catch_common.hpp> +#include <catch2/internal/catch_source_line_info.hpp> #include <string> diff --git a/src/catch2/catch_tag_alias_autoregistrar.hpp b/src/catch2/catch_tag_alias_autoregistrar.hpp index 8bad4e36..7611b41a 100644 --- a/src/catch2/catch_tag_alias_autoregistrar.hpp +++ b/src/catch2/catch_tag_alias_autoregistrar.hpp @@ -8,7 +8,7 @@ #ifndef CATCH_TAG_ALIAS_AUTOREGISTRAR_HPP_INCLUDED #define CATCH_TAG_ALIAS_AUTOREGISTRAR_HPP_INCLUDED -#include <catch2/internal/catch_common.hpp> +#include <catch2/internal/catch_source_line_info.hpp> namespace Catch { diff --git a/src/catch2/catch_test_case_info.hpp b/src/catch2/catch_test_case_info.hpp index b78997a3..1383f11b 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 <catch2/internal/catch_common.hpp> +#include <catch2/internal/catch_source_line_info.hpp> #include <catch2/internal/catch_noncopyable.hpp> #include <catch2/internal/catch_stringref.hpp> #include <catch2/internal/catch_test_registry.hpp> diff --git a/src/catch2/generators/catch_generators.hpp b/src/catch2/generators/catch_generators.hpp index fe9c3996..4ac73005 100644 --- a/src/catch2/generators/catch_generators.hpp +++ b/src/catch2/generators/catch_generators.hpp @@ -9,7 +9,7 @@ #define CATCH_GENERATORS_HPP_INCLUDED #include <catch2/interfaces/catch_interfaces_generatortracker.hpp> -#include <catch2/internal/catch_common.hpp> +#include <catch2/internal/catch_source_line_info.hpp> #include <catch2/internal/catch_stringref.hpp> #include <vector> diff --git a/src/catch2/interfaces/catch_interfaces_reporter.hpp b/src/catch2/interfaces/catch_interfaces_reporter.hpp index 12751367..791cc992 100644 --- a/src/catch2/interfaces/catch_interfaces_reporter.hpp +++ b/src/catch2/interfaces/catch_interfaces_reporter.hpp @@ -9,7 +9,6 @@ #define CATCH_INTERFACES_REPORTER_HPP_INCLUDED #include <catch2/catch_section_info.hpp> -#include <catch2/internal/catch_common.hpp> #include <catch2/catch_totals.hpp> #include <catch2/catch_assertion_result.hpp> #include <catch2/internal/catch_message_info.hpp> diff --git a/src/catch2/internal/catch_console_colour.hpp b/src/catch2/internal/catch_console_colour.hpp index 20ab56d7..7b102013 100644 --- a/src/catch2/internal/catch_console_colour.hpp +++ b/src/catch2/internal/catch_console_colour.hpp @@ -8,7 +8,7 @@ #ifndef CATCH_CONSOLE_COLOUR_HPP_INCLUDED #define CATCH_CONSOLE_COLOUR_HPP_INCLUDED -#include <catch2/internal/catch_common.hpp> +#include <iosfwd> namespace Catch { diff --git a/src/catch2/internal/catch_enforce.hpp b/src/catch2/internal/catch_enforce.hpp index bf1f46ea..3f81ef1a 100644 --- a/src/catch2/internal/catch_enforce.hpp +++ b/src/catch2/internal/catch_enforce.hpp @@ -8,7 +8,7 @@ #ifndef CATCH_ENFORCE_HPP_INCLUDED #define CATCH_ENFORCE_HPP_INCLUDED -#include <catch2/internal/catch_common.hpp> +#include <catch2/internal/catch_source_line_info.hpp> #include <catch2/internal/catch_compiler_capabilities.hpp> #include <catch2/internal/catch_stream.hpp> diff --git a/src/catch2/internal/catch_message_info.hpp b/src/catch2/internal/catch_message_info.hpp index 2dba5850..0c3076ea 100644 --- a/src/catch2/internal/catch_message_info.hpp +++ b/src/catch2/internal/catch_message_info.hpp @@ -9,7 +9,7 @@ #define CATCH_MESSAGE_INFO_HPP_INCLUDED #include <catch2/internal/catch_result_type.hpp> -#include <catch2/internal/catch_common.hpp> +#include <catch2/internal/catch_source_line_info.hpp> #include <catch2/interfaces/catch_interfaces_capture.hpp> #include <string> diff --git a/src/catch2/internal/catch_common.cpp b/src/catch2/internal/catch_source_line_info.cpp index 48590499..9a4fe74e 100644 --- a/src/catch2/internal/catch_common.cpp +++ b/src/catch2/internal/catch_source_line_info.cpp @@ -5,7 +5,7 @@ // https://www.boost.org/LICENSE_1_0.txt) // SPDX-License-Identifier: BSL-1.0 -#include <catch2/internal/catch_common.hpp> +#include <catch2/internal/catch_source_line_info.hpp> #include <cstring> #include <ostream> diff --git a/src/catch2/internal/catch_common.hpp b/src/catch2/internal/catch_source_line_info.hpp index 82360594..4133011f 100644 --- a/src/catch2/internal/catch_common.hpp +++ b/src/catch2/internal/catch_source_line_info.hpp @@ -5,11 +5,14 @@ // https://www.boost.org/LICENSE_1_0.txt) // SPDX-License-Identifier: BSL-1.0 -#ifndef CATCH_COMMON_HPP_INCLUDED -#define CATCH_COMMON_HPP_INCLUDED +#ifndef CATCH_SOURCE_LINE_INFO_HPP_INCLUDED +#define CATCH_SOURCE_LINE_INFO_HPP_INCLUDED #include <catch2/internal/catch_compiler_capabilities.hpp> +#include <cstddef> +#include <iosfwd> + #define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line #define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) #ifdef CATCH_CONFIG_COUNTER @@ -18,8 +21,6 @@ # define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ ) #endif -#include <iosfwd> - // We need a dummy global operator<< so we can bring it into Catch namespace later struct Catch_global_namespace_dummy {}; std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy); @@ -53,4 +54,4 @@ namespace Catch { #define CATCH_INTERNAL_LINEINFO \ ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) ) -#endif // CATCH_COMMON_HPP_INCLUDED +#endif // CATCH_SOURCE_LINE_INFO_HPP_INCLUDED diff --git a/src/catch2/internal/catch_stream.cpp b/src/catch2/internal/catch_stream.cpp index b56ded28..3014256d 100644 --- a/src/catch2/internal/catch_stream.cpp +++ b/src/catch2/internal/catch_stream.cpp @@ -5,7 +5,6 @@ // https://www.boost.org/LICENSE_1_0.txt) // SPDX-License-Identifier: BSL-1.0 -#include <catch2/internal/catch_common.hpp> #include <catch2/internal/catch_enforce.hpp> #include <catch2/internal/catch_stream.hpp> #include <catch2/internal/catch_debug_console.hpp> diff --git a/src/catch2/internal/catch_test_case_tracker.hpp b/src/catch2/internal/catch_test_case_tracker.hpp index 7e8d0007..2c51346a 100644 --- a/src/catch2/internal/catch_test_case_tracker.hpp +++ b/src/catch2/internal/catch_test_case_tracker.hpp @@ -9,7 +9,7 @@ #define CATCH_TEST_CASE_TRACKER_HPP_INCLUDED #include <catch2/internal/catch_compiler_capabilities.hpp> -#include <catch2/internal/catch_common.hpp> +#include <catch2/internal/catch_source_line_info.hpp> #include <string> #include <vector> diff --git a/src/catch2/internal/catch_test_registry.hpp b/src/catch2/internal/catch_test_registry.hpp index 053fe2dc..b5b091c7 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 <catch2/internal/catch_common.hpp> +#include <catch2/internal/catch_source_line_info.hpp> #include <catch2/internal/catch_noncopyable.hpp> #include <catch2/interfaces/catch_interfaces_testcase.hpp> #include <catch2/internal/catch_compiler_capabilities.hpp> diff --git a/src/catch2/internal/catch_xmlwriter.hpp b/src/catch2/internal/catch_xmlwriter.hpp index def52879..c8738f97 100644 --- a/src/catch2/internal/catch_xmlwriter.hpp +++ b/src/catch2/internal/catch_xmlwriter.hpp @@ -15,7 +15,7 @@ // and reports that calls to XmlEncode's op << are ambiguous between // the declaration and definition. // It also has to be in the header. -#include <catch2/internal/catch_common.hpp> +#include <catch2/internal/catch_source_line_info.hpp> #include <vector> diff --git a/src/catch2/matchers/catch_matchers.hpp b/src/catch2/matchers/catch_matchers.hpp index a4cde1ec..fe8f48c4 100644 --- a/src/catch2/matchers/catch_matchers.hpp +++ b/src/catch2/matchers/catch_matchers.hpp @@ -8,7 +8,6 @@ #ifndef CATCH_MATCHERS_HPP_INCLUDED #define CATCH_MATCHERS_HPP_INCLUDED -#include <catch2/internal/catch_common.hpp> #include <catch2/matchers/internal/catch_matchers_impl.hpp> #include <string> diff --git a/src/catch2/matchers/catch_matchers_predicate.hpp b/src/catch2/matchers/catch_matchers_predicate.hpp index d850cab5..99a01a4e 100644 --- a/src/catch2/matchers/catch_matchers_predicate.hpp +++ b/src/catch2/matchers/catch_matchers_predicate.hpp @@ -8,7 +8,6 @@ #ifndef CATCH_MATCHERS_PREDICATE_HPP_INCLUDED #define CATCH_MATCHERS_PREDICATE_HPP_INCLUDED -#include <catch2/internal/catch_common.hpp> #include <catch2/matchers/catch_matchers.hpp> #include <catch2/internal/catch_meta.hpp> diff --git a/src/catch2/matchers/catch_matchers_templated.hpp b/src/catch2/matchers/catch_matchers_templated.hpp index 349d7863..544a2a5b 100644 --- a/src/catch2/matchers/catch_matchers_templated.hpp +++ b/src/catch2/matchers/catch_matchers_templated.hpp @@ -8,7 +8,6 @@ #ifndef CATCH_MATCHERS_TEMPLATED_HPP_INCLUDED #define CATCH_MATCHERS_TEMPLATED_HPP_INCLUDED -#include <catch2/internal/catch_common.hpp> #include <catch2/matchers/catch_matchers.hpp> #include <catch2/internal/catch_stringref.hpp> |