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

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2021-08-10 00:14:18 +0200
committerMartin Hořeňovský2021-08-11 22:51:57 +0200
commit3ec63324a823c19697720fda3eab1f18d297210c (patch)
treeaf53aef5eca236dbc735c62772406e9379cd24e5
parent7d0770adf28737ec681bec40e4c3fdb650a4f6ad (diff)
downloadcatch3-3ec63324a823c19697720fda3eab1f18d297210c.tar.gz
Replace owning naked IStream pointers with unique_ptrs
-rw-r--r--src/catch2/catch_config.cpp6
-rw-r--r--src/catch2/catch_config.hpp2
-rw-r--r--src/catch2/internal/catch_stream.cpp8
-rw-r--r--src/catch2/internal/catch_stream.hpp3
4 files changed, 7 insertions, 12 deletions
diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp
index 7a4a0bda..0a3f83a2 100644
--- a/src/catch2/catch_config.cpp
+++ b/src/catch2/catch_config.cpp
@@ -18,7 +18,7 @@ namespace Catch {
Config::Config( ConfigData const& data )
: m_data( data ),
- m_stream( openStream() )
+ m_stream( Catch::makeStream(m_data.outputFilename) )
{
// We need to trim filter specs to avoid trouble with superfluous
// whitespace (esp. important for bdd macros, as those are manually
@@ -86,8 +86,4 @@ namespace Catch {
unsigned int Config::benchmarkResamples() const { return m_data.benchmarkResamples; }
std::chrono::milliseconds Config::benchmarkWarmupTime() const { return std::chrono::milliseconds(m_data.benchmarkWarmupTime); }
- IStream const* Config::openStream() {
- return Catch::makeStream(m_data.outputFilename);
- }
-
} // end namespace Catch
diff --git a/src/catch2/catch_config.hpp b/src/catch2/catch_config.hpp
index 10d0487a..2f44518c 100644
--- a/src/catch2/catch_config.hpp
+++ b/src/catch2/catch_config.hpp
@@ -110,8 +110,6 @@ namespace Catch {
std::chrono::milliseconds benchmarkWarmupTime() const override;
private:
-
- IStream const* openStream();
ConfigData m_data;
Detail::unique_ptr<IStream const> m_stream;
diff --git a/src/catch2/internal/catch_stream.cpp b/src/catch2/internal/catch_stream.cpp
index 38919f8f..c1e0d1dc 100644
--- a/src/catch2/internal/catch_stream.cpp
+++ b/src/catch2/internal/catch_stream.cpp
@@ -123,17 +123,17 @@ namespace Detail {
///////////////////////////////////////////////////////////////////////////
- auto makeStream( std::string const& filename ) -> IStream const* {
+ auto makeStream( std::string const& filename ) -> Detail::unique_ptr<IStream const> {
if( filename.empty() )
- return new Detail::CoutStream();
+ return Detail::make_unique<Detail::CoutStream>();
else if( filename[0] == '%' ) {
if( filename == "%debug" )
- return new Detail::DebugOutStream();
+ return Detail::make_unique<Detail::DebugOutStream>();
else
CATCH_ERROR( "Unrecognised stream: '" << filename << "'" );
}
else
- return new Detail::FileStream( filename );
+ return Detail::make_unique<Detail::FileStream>( filename );
}
diff --git a/src/catch2/internal/catch_stream.hpp b/src/catch2/internal/catch_stream.hpp
index b764f825..39a4c0c8 100644
--- a/src/catch2/internal/catch_stream.hpp
+++ b/src/catch2/internal/catch_stream.hpp
@@ -9,6 +9,7 @@
#define CATCH_STREAM_HPP_INCLUDED
#include <catch2/internal/catch_noncopyable.hpp>
+#include <catch2/internal/catch_unique_ptr.hpp>
#include <iosfwd>
#include <cstddef>
@@ -26,7 +27,7 @@ namespace Catch {
virtual std::ostream& stream() const = 0;
};
- auto makeStream( std::string const& filename ) -> IStream const*;
+ auto makeStream( std::string const& filename ) -> Detail::unique_ptr<IStream const>;
class ReusableStringStream : Detail::NonCopyable {
std::size_t m_index;