diff options
| author | Phil Nash | 2011-05-31 18:47:30 +0100 |
|---|---|---|
| committer | Phil Nash | 2011-05-31 18:47:30 +0100 |
| commit | 48112c2700cff97b2c078a59b2d8e7094702ae12 (patch) | |
| tree | e6f2d1ad38b9068c360cf7318993735a2b1341ef /include | |
| parent | 6b6143ccd4a5c38acf64f06e24967e8e96aecb38 (diff) | |
| download | catch3-48112c2700cff97b2c078a59b2d8e7094702ae12.tar.gz | |
Fixed a potential ordering issue with output streambufs
Diffstat (limited to 'include')
| -rw-r--r-- | include/catch.hpp | 1 | ||||
| -rw-r--r-- | include/internal/catch_config.hpp | 17 |
2 files changed, 8 insertions, 10 deletions
diff --git a/include/catch.hpp b/include/catch.hpp index 49109da6..4925e334 100644 --- a/include/catch.hpp +++ b/include/catch.hpp @@ -16,7 +16,6 @@ Later: Finish command line parser (list as xml, specify FP tolerance) - Revisit Approx() Tags? Finish macros, listed here, later (just CHECK_NOFAIL now) */ diff --git a/include/internal/catch_config.hpp b/include/internal/catch_config.hpp index e577cacb..e23f40b8 100644 --- a/include/internal/catch_config.hpp +++ b/include/internal/catch_config.hpp @@ -60,15 +60,16 @@ namespace Catch m_listSpec( List::None ), m_shouldDebugBreak( false ), m_showHelp( false ), - m_streambuf( std::cout.rdbuf() ), - m_os( m_streambuf ), + m_streambuf( NULL ), + m_os( std::cout.rdbuf() ), m_includeWhat( Include::FailedOnly ) {} /////////////////////////////////////////////////////////////////////////// ~Config() { - setStreamBuf( NULL ); + m_os.rdbuf( std::cout.rdbuf() ); + delete m_streambuf; } /////////////////////////////////////////////////////////////////////////// @@ -210,18 +211,16 @@ namespace Catch /////////////////////////////////////////////////////////////////////////// void setStreamBuf( std::streambuf* buf ) { - // Delete previous stream buf if we own it - if( m_streambuf && dynamic_cast<StreamBufBase*>( m_streambuf ) ) - delete m_streambuf; - - m_streambuf = buf; m_os.rdbuf( buf ? buf : std::cout.rdbuf() ); } /////////////////////////////////////////////////////////////////////////// void useStream( const std::string& streamName ) { - setStreamBuf( Hub::createStreamBuf( streamName ) ); + std::streambuf* newBuf = Hub::createStreamBuf( streamName ); + setStreamBuf( newBuf ); + delete m_streambuf; + m_streambuf = newBuf; } /////////////////////////////////////////////////////////////////////////// |