3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 13:26:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a potential ordering issue with output streambufs

Browse Source
This commit is contained in:
Phil Nash 2011-05-31 18:47:30 +01:00
parent 6b6143ccd4
commit 48112c2700
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/catch.hpp
View File

@ -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)
*/

17
include/internal/catch_config.hpp
View File

@ -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;
}
///////////////////////////////////////////////////////////////////////////

18
single_include/catch.hpp
View File

@ -20,7 +20,6 @@
Later:
Finish command line parser (list as xml, specify FP tolerance)
Revisit Approx()
Tags?
Finish macros, listed here, later (just CHECK_NOFAIL now)
*/
@ -3163,15 +3162,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;
}
///////////////////////////////////////////////////////////////////////////
@ -3313,18 +3313,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;
}
///////////////////////////////////////////////////////////////////////////