diff options
| author | Martin Hořeňovský | 2022-04-16 15:00:41 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2022-04-16 16:34:08 +0200 |
| commit | 7b93a2014cb417d277339e3d679cac64bfac237b (patch) | |
| tree | f5ec8d2454f911a52059ff6207050b288dc43b33 | |
| parent | 98bb638fb2e3f1af7ef87bc483faff35076c6c51 (diff) | |
| download | catch3-7b93a2014cb417d277339e3d679cac64bfac237b.tar.gz | |
Rename catch_stream -> catch_reusable_string_stream
After everything else was split out, this name much reflects the
actual contents of the file(s).
20 files changed, 21 insertions, 23 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fb859db9..ba4ca435 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -131,7 +131,7 @@ set(INTERNAL_HEADERS ${SOURCES_DIR}/catch_session.hpp ${SOURCES_DIR}/internal/catch_singletons.hpp ${SOURCES_DIR}/internal/catch_startup_exception_registry.hpp - ${SOURCES_DIR}/internal/catch_stream.hpp + ${SOURCES_DIR}/internal/catch_reusable_string_stream.hpp ${SOURCES_DIR}/internal/catch_stream_end_stop.hpp ${SOURCES_DIR}/internal/catch_string_manip.hpp ${SOURCES_DIR}/internal/catch_stringref.hpp @@ -204,7 +204,7 @@ set(IMPL_SOURCES ${SOURCES_DIR}/internal/catch_stdstreams.cpp ${SOURCES_DIR}/catch_session.cpp ${SOURCES_DIR}/internal/catch_singletons.cpp - ${SOURCES_DIR}/internal/catch_stream.cpp + ${SOURCES_DIR}/internal/catch_reusable_string_stream.cpp ${SOURCES_DIR}/internal/catch_stringref.cpp ${SOURCES_DIR}/internal/catch_string_manip.cpp ${SOURCES_DIR}/internal/catch_tag_alias_registry.cpp diff --git a/src/catch2/catch_all.hpp b/src/catch2/catch_all.hpp index 101eb834..5c715e35 100644 --- a/src/catch2/catch_all.hpp +++ b/src/catch2/catch_all.hpp @@ -86,6 +86,7 @@ #include <catch2/internal/catch_reporter_registry.hpp> #include <catch2/internal/catch_reporter_spec_parser.hpp> #include <catch2/internal/catch_result_type.hpp> +#include <catch2/internal/catch_reusable_string_stream.hpp> #include <catch2/internal/catch_run_context.hpp> #include <catch2/internal/catch_section.hpp> #include <catch2/internal/catch_sharding.hpp> @@ -93,7 +94,6 @@ #include <catch2/internal/catch_source_line_info.hpp> #include <catch2/internal/catch_startup_exception_registry.hpp> #include <catch2/internal/catch_stdstreams.hpp> -#include <catch2/internal/catch_stream.hpp> #include <catch2/internal/catch_stream_end_stop.hpp> #include <catch2/internal/catch_string_manip.hpp> #include <catch2/internal/catch_stringref.hpp> diff --git a/src/catch2/catch_approx.cpp b/src/catch2/catch_approx.cpp index 21652111..b477d6ed 100644 --- a/src/catch2/catch_approx.cpp +++ b/src/catch2/catch_approx.cpp @@ -7,7 +7,7 @@ // SPDX-License-Identifier: BSL-1.0 #include <catch2/catch_approx.hpp> #include <catch2/internal/catch_enforce.hpp> -#include <catch2/internal/catch_stream.hpp> +#include <catch2/internal/catch_reusable_string_stream.hpp> #include <cmath> #include <limits> diff --git a/src/catch2/catch_assertion_result.cpp b/src/catch2/catch_assertion_result.cpp index 04e00d26..2912c8d3 100644 --- a/src/catch2/catch_assertion_result.cpp +++ b/src/catch2/catch_assertion_result.cpp @@ -6,7 +6,7 @@ // SPDX-License-Identifier: BSL-1.0 #include <catch2/catch_assertion_result.hpp> -#include <catch2/internal/catch_stream.hpp> +#include <catch2/internal/catch_reusable_string_stream.hpp> namespace Catch { diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp index 7363ee70..9e56e9fe 100644 --- a/src/catch2/catch_config.cpp +++ b/src/catch2/catch_config.cpp @@ -8,7 +8,6 @@ #include <catch2/catch_config.hpp> #include <catch2/catch_user_config.hpp> #include <catch2/internal/catch_enforce.hpp> -#include <catch2/internal/catch_stream.hpp> #include <catch2/internal/catch_stringref.hpp> #include <catch2/internal/catch_string_manip.hpp> #include <catch2/internal/catch_test_spec_parser.hpp> diff --git a/src/catch2/catch_message.hpp b/src/catch2/catch_message.hpp index 970ba438..dac7a21d 100644 --- a/src/catch2/catch_message.hpp +++ b/src/catch2/catch_message.hpp @@ -9,7 +9,7 @@ #define CATCH_MESSAGE_HPP_INCLUDED #include <catch2/internal/catch_result_type.hpp> -#include <catch2/internal/catch_stream.hpp> +#include <catch2/internal/catch_reusable_string_stream.hpp> #include <catch2/internal/catch_stream_end_stop.hpp> #include <catch2/internal/catch_message_info.hpp> #include <catch2/interfaces/catch_interfaces_capture.hpp> diff --git a/src/catch2/catch_tostring.hpp b/src/catch2/catch_tostring.hpp index 9182a119..964c8a66 100644 --- a/src/catch2/catch_tostring.hpp +++ b/src/catch2/catch_tostring.hpp @@ -17,7 +17,7 @@ #include <catch2/internal/catch_compiler_capabilities.hpp> #include <catch2/internal/catch_config_wchar.hpp> -#include <catch2/internal/catch_stream.hpp> +#include <catch2/internal/catch_reusable_string_stream.hpp> #include <catch2/internal/catch_void_type.hpp> #include <catch2/interfaces/catch_interfaces_enum_values_registry.hpp> diff --git a/src/catch2/internal/catch_debug_console.cpp b/src/catch2/internal/catch_debug_console.cpp index ce351de0..5564c6a8 100644 --- a/src/catch2/internal/catch_debug_console.cpp +++ b/src/catch2/internal/catch_debug_console.cpp @@ -9,12 +9,13 @@ #include <catch2/internal/catch_debug_console.hpp> #include <catch2/internal/catch_config_android_logwrite.hpp> -#include <catch2/internal/catch_stream.hpp> #include <catch2/internal/catch_platform.hpp> #include <catch2/internal/catch_windows_h_proxy.hpp> #include <catch2/catch_user_config.hpp> #include <catch2/internal/catch_stdstreams.hpp> +#include <ostream> + #if defined(CATCH_CONFIG_ANDROID_LOGWRITE) #include <android/log.h> diff --git a/src/catch2/internal/catch_debugger.cpp b/src/catch2/internal/catch_debugger.cpp index 57ade819..349cf4ab 100644 --- a/src/catch2/internal/catch_debugger.cpp +++ b/src/catch2/internal/catch_debugger.cpp @@ -7,7 +7,6 @@ // SPDX-License-Identifier: BSL-1.0 #include <catch2/internal/catch_debugger.hpp> #include <catch2/internal/catch_errno_guard.hpp> -#include <catch2/internal/catch_stream.hpp> #include <catch2/internal/catch_platform.hpp> #include <catch2/internal/catch_stdstreams.hpp> diff --git a/src/catch2/internal/catch_enforce.hpp b/src/catch2/internal/catch_enforce.hpp index 3f81ef1a..db52a0e2 100644 --- a/src/catch2/internal/catch_enforce.hpp +++ b/src/catch2/internal/catch_enforce.hpp @@ -10,7 +10,7 @@ #include <catch2/internal/catch_source_line_info.hpp> #include <catch2/internal/catch_compiler_capabilities.hpp> -#include <catch2/internal/catch_stream.hpp> +#include <catch2/internal/catch_reusable_string_stream.hpp> #include <exception> diff --git a/src/catch2/internal/catch_enum_values_registry.cpp b/src/catch2/internal/catch_enum_values_registry.cpp index ef4baf9a..32d0a16d 100644 --- a/src/catch2/internal/catch_enum_values_registry.cpp +++ b/src/catch2/internal/catch_enum_values_registry.cpp @@ -7,7 +7,6 @@ // SPDX-License-Identifier: BSL-1.0 #include <catch2/internal/catch_enum_values_registry.hpp> #include <catch2/internal/catch_string_manip.hpp> -#include <catch2/internal/catch_stream.hpp> #include <cassert> diff --git a/src/catch2/internal/catch_output_redirect.hpp b/src/catch2/internal/catch_output_redirect.hpp index fd7234ef..d3463d99 100644 --- a/src/catch2/internal/catch_output_redirect.hpp +++ b/src/catch2/internal/catch_output_redirect.hpp @@ -9,7 +9,7 @@ #define CATCH_OUTPUT_REDIRECT_HPP_INCLUDED #include <catch2/internal/catch_platform.hpp> -#include <catch2/internal/catch_stream.hpp> +#include <catch2/internal/catch_reusable_string_stream.hpp> #include <catch2/internal/catch_compiler_capabilities.hpp> #include <cstdio> diff --git a/src/catch2/internal/catch_stream.cpp b/src/catch2/internal/catch_reusable_string_stream.cpp index 10eb4a9e..9b082423 100644 --- a/src/catch2/internal/catch_stream.cpp +++ b/src/catch2/internal/catch_reusable_string_stream.cpp @@ -5,7 +5,7 @@ // https://www.boost.org/LICENSE_1_0.txt) // SPDX-License-Identifier: BSL-1.0 -#include <catch2/internal/catch_stream.hpp> +#include <catch2/internal/catch_reusable_string_stream.hpp> #include <catch2/internal/catch_singletons.hpp> #include <catch2/internal/catch_unique_ptr.hpp> diff --git a/src/catch2/internal/catch_stream.hpp b/src/catch2/internal/catch_reusable_string_stream.hpp index 104a2412..55cff727 100644 --- a/src/catch2/internal/catch_stream.hpp +++ b/src/catch2/internal/catch_reusable_string_stream.hpp @@ -5,8 +5,8 @@ // https://www.boost.org/LICENSE_1_0.txt) // SPDX-License-Identifier: BSL-1.0 -#ifndef CATCH_STREAM_HPP_INCLUDED -#define CATCH_STREAM_HPP_INCLUDED +#ifndef CATCH_REUSABLE_STRING_STREAM_HPP_INCLUDED +#define CATCH_REUSABLE_STRING_STREAM_HPP_INCLUDED #include <catch2/internal/catch_noncopyable.hpp> @@ -54,4 +54,4 @@ namespace Catch { }; } -#endif // CATCH_STREAM_HPP_INCLUDED +#endif // CATCH_REUSABLE_STRING_STREAM_HPP_INCLUDED diff --git a/src/catch2/internal/catch_to_string.hpp b/src/catch2/internal/catch_to_string.hpp index d8ff35cf..15b24e19 100644 --- a/src/catch2/internal/catch_to_string.hpp +++ b/src/catch2/internal/catch_to_string.hpp @@ -11,7 +11,7 @@ #include <string> #include <catch2/internal/catch_compiler_capabilities.hpp> -#include <catch2/internal/catch_stream.hpp> +#include <catch2/internal/catch_reusable_string_stream.hpp> namespace Catch { template <typename T> diff --git a/src/catch2/internal/catch_xmlwriter.hpp b/src/catch2/internal/catch_xmlwriter.hpp index edeb64a2..55633937 100644 --- a/src/catch2/internal/catch_xmlwriter.hpp +++ b/src/catch2/internal/catch_xmlwriter.hpp @@ -8,7 +8,7 @@ #ifndef CATCH_XMLWRITER_HPP_INCLUDED #define CATCH_XMLWRITER_HPP_INCLUDED -#include <catch2/internal/catch_stream.hpp> +#include <catch2/internal/catch_reusable_string_stream.hpp> #include <catch2/internal/catch_stringref.hpp> #include <iosfwd> diff --git a/src/catch2/matchers/internal/catch_matchers_combined_tu.cpp b/src/catch2/matchers/internal/catch_matchers_combined_tu.cpp index de713b3b..6ec878b0 100644 --- a/src/catch2/matchers/internal/catch_matchers_combined_tu.cpp +++ b/src/catch2/matchers/internal/catch_matchers_combined_tu.cpp @@ -43,7 +43,7 @@ namespace Catch { // vvv formerly catch_matchers_container_properties.cpp vvv // ////////////////////////////////////////////////////////////// #include <catch2/matchers/catch_matchers_container_properties.hpp> -#include <catch2/internal/catch_stream.hpp> +#include <catch2/internal/catch_reusable_string_stream.hpp> namespace Catch { namespace Matchers { diff --git a/src/catch2/reporters/catch_reporter_combined_tu.cpp b/src/catch2/reporters/catch_reporter_combined_tu.cpp index 23c738cd..77d2b52d 100644 --- a/src/catch2/reporters/catch_reporter_combined_tu.cpp +++ b/src/catch2/reporters/catch_reporter_combined_tu.cpp @@ -22,7 +22,7 @@ #include <catch2/internal/catch_console_width.hpp> #include <catch2/internal/catch_errno_guard.hpp> #include <catch2/internal/catch_textflow.hpp> -#include <catch2/internal/catch_stream.hpp> +#include <catch2/internal/catch_reusable_string_stream.hpp> #include <catch2/internal/catch_string_manip.hpp> #include <catch2/internal/catch_console_colour.hpp> #include <catch2/catch_tostring.hpp> diff --git a/src/catch2/reporters/catch_reporter_console.cpp b/src/catch2/reporters/catch_reporter_console.cpp index b8e64fb3..6b564b15 100644 --- a/src/catch2/reporters/catch_reporter_console.cpp +++ b/src/catch2/reporters/catch_reporter_console.cpp @@ -13,7 +13,7 @@ #include <catch2/internal/catch_string_manip.hpp> #include <catch2/catch_version.hpp> #include <catch2/internal/catch_textflow.hpp> -#include <catch2/internal/catch_stream.hpp> +#include <catch2/internal/catch_reusable_string_stream.hpp> #include <catch2/internal/catch_stringref.hpp> #include <catch2/catch_test_case_info.hpp> #include <catch2/internal/catch_console_width.hpp> diff --git a/tests/SelfTest/IntrospectiveTests/Xml.tests.cpp b/tests/SelfTest/IntrospectiveTests/Xml.tests.cpp index 678d8c87..226e737c 100644 --- a/tests/SelfTest/IntrospectiveTests/Xml.tests.cpp +++ b/tests/SelfTest/IntrospectiveTests/Xml.tests.cpp @@ -9,7 +9,7 @@ #include <catch2/catch_test_macros.hpp> #include <catch2/internal/catch_xmlwriter.hpp> -#include <catch2/internal/catch_stream.hpp> +#include <catch2/internal/catch_reusable_string_stream.hpp> #include <catch2/matchers/catch_matchers_string.hpp> #include <sstream> |