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

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-08-02 18:50:56 +0200
committerMartin Hořeňovský2020-08-03 22:59:09 +0200
commit9d591f19ff6b0dfe4469e1d4b6a60f92f2357c06 (patch)
tree08dbb56e38e8bed6941aa5be0cd129b6f238a4fe /src
parenta4ac07d1049e8cafdd5b9ab551055a6bddcc132d (diff)
downloadcatch3-9d591f19ff6b0dfe4469e1d4b6a60f92f2357c06.tar.gz
Allow explicitly setting ReusableStringStream's serialized data
Diffstat (limited to 'src')
-rw-r--r--src/catch2/internal/catch_stream.cpp6
-rw-r--r--src/catch2/internal/catch_stream.hpp5
2 files changed, 9 insertions, 2 deletions
diff --git a/src/catch2/internal/catch_stream.cpp b/src/catch2/internal/catch_stream.cpp
index ec1179d3..1a723aad 100644
--- a/src/catch2/internal/catch_stream.cpp
+++ b/src/catch2/internal/catch_stream.cpp
@@ -173,10 +173,14 @@ namespace Detail {
Singleton<StringStreams>::getMutable().release( m_index );
}
- auto ReusableStringStream::str() const -> std::string {
+ std::string ReusableStringStream::str() const {
return static_cast<std::ostringstream*>( m_oss )->str();
}
+ void ReusableStringStream::str( std::string const& str ) {
+ static_cast<std::ostringstream*>( m_oss )->str( str );
+ }
+
///////////////////////////////////////////////////////////////////////////
diff --git a/src/catch2/internal/catch_stream.hpp b/src/catch2/internal/catch_stream.hpp
index 557797ae..51d32e62 100644
--- a/src/catch2/internal/catch_stream.hpp
+++ b/src/catch2/internal/catch_stream.hpp
@@ -37,7 +37,10 @@ namespace Catch {
ReusableStringStream();
~ReusableStringStream();
- auto str() const -> std::string;
+ //! Returns the serialized state
+ std::string str() const;
+ //! Sets internal state to `str`
+ void str(std::string const& str);
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic push