Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2/internal
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-04-16 15:00:41 +0200
committerMartin Hořeňovský2022-04-16 16:34:08 +0200
commit7b93a2014cb417d277339e3d679cac64bfac237b (patch)
treef5ec8d2454f911a52059ff6207050b288dc43b33 /src/catch2/internal
parent98bb638fb2e3f1af7ef87bc483faff35076c6c51 (diff)
downloadcatch3-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).
Diffstat (limited to 'src/catch2/internal')
-rw-r--r--src/catch2/internal/catch_debug_console.cpp3
-rw-r--r--src/catch2/internal/catch_debugger.cpp1
-rw-r--r--src/catch2/internal/catch_enforce.hpp2
-rw-r--r--src/catch2/internal/catch_enum_values_registry.cpp1
-rw-r--r--src/catch2/internal/catch_output_redirect.hpp2
-rw-r--r--src/catch2/internal/catch_reusable_string_stream.cpp (renamed from src/catch2/internal/catch_stream.cpp)2
-rw-r--r--src/catch2/internal/catch_reusable_string_stream.hpp (renamed from src/catch2/internal/catch_stream.hpp)6
-rw-r--r--src/catch2/internal/catch_to_string.hpp2
-rw-r--r--src/catch2/internal/catch_xmlwriter.hpp2
9 files changed, 10 insertions, 11 deletions
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>