3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-09-18 19:05:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'phil' into include-guard-fixes

Browse Source 
Conflicts:
	single_include/catch.hpp
This commit is contained in:
Matt Wozniski
2012-09-26 21:42:44 -04:00
parent f29c898443 67ec8709ea
commit 07e20aa706
19 changed files with 800 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/internal/catch_config.hpp
View File

@@ -11,6 +11,7 @@
#include "catch_test_spec.h"
#include "catch_context.h"
#include "catch_interfaces_config.h"
#include "catch_stream.hpp"
#include <memory>
#include <vector>
@@ -79,19 +80,17 @@ namespace Catch {
public:
Config()
: m_streambuf( NULL ),
m_os( std::cout.rdbuf() )
: m_os( std::cout.rdbuf() )
{}
Config( const ConfigData& data )
: m_data( data ),
m_streambuf( NULL ),
m_os( std::cout.rdbuf() )
{}
virtual ~Config() {
m_os.rdbuf( std::cout.rdbuf() );
delete m_streambuf;
m_stream.release();
}
void setFilename( const std::string& filename ) {
@@ -131,10 +130,10 @@ namespace Catch {
}
void useStream( const std::string& streamName ) {
std::streambuf* newBuf = createStreamBuf( streamName );
setStreamBuf( newBuf );
delete m_streambuf;
m_streambuf = newBuf;
Stream stream = createStream( streamName );
setStreamBuf( stream.streamBuf );
m_stream.release();
m_stream = stream;
}
void addTestSpec( const std::string& testSpec ) {
@@ -166,7 +165,7 @@ namespace Catch {
ConfigData m_data;
// !TBD Move these out of here
std::streambuf* m_streambuf;
Stream m_stream;
mutable std::ostream m_os;
};