Merge remote-tracking branch 'upstream/devel' into devel. (see #2094)

tests/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp

@@ -8,11 +8,13 @@
 
 #include <catch2/catch_test_macros.hpp>
 
+#include <iostream>
+
 namespace Catch {
     [[noreturn]]
     void throw_exception(std::exception const& e) {
-        Catch::cerr() << "====== CUSTOM HANDLER ====== run terminates because an exception was thrown.\n"
-                      << "The message was: " << e.what() << '\n';
+        std::cerr << "====== CUSTOM HANDLER ====== run terminates because an exception was thrown.\n"
+                  << "The message was: " << e.what() << '\n';
         // Avoid abort and other exceptional exits -- there is no way
         // to tell CMake that abort is the desired outcome of a test.
         exit(1);

tests/SelfTest/IntrospectiveTests/ColourImpl.tests.cpp

@@ -8,6 +8,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/internal/catch_console_colour.hpp>
+#include <catch2/internal/catch_istream.hpp>
 
 #include <sstream>
 

tests/SelfTest/IntrospectiveTests/Reporters.tests.cpp

@@ -17,7 +17,7 @@
 #include <catch2/internal/catch_enforce.hpp>
 #include <catch2/internal/catch_list.hpp>
 #include <catch2/internal/catch_reporter_registry.hpp>
-#include <catch2/internal/catch_stream.hpp>
+#include <catch2/internal/catch_istream.hpp>
 #include <catch2/matchers/catch_matchers_string.hpp>
 #include <catch2/reporters/catch_reporter_helpers.hpp>
 #include <catch2/reporters/catch_reporter_event_listener.hpp>

tests/SelfTest/IntrospectiveTests/Stream.tests.cpp

@@ -8,7 +8,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <catch2/internal/catch_stream.hpp>
+#include <catch2/internal/catch_istream.hpp>
 
 TEST_CASE( "Cout stream properly declares it writes to stdout", "[streams]" ) {
     REQUIRE( Catch::makeStream( "-" )->isConsole() );

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>