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

Conflicts:
	single_include/catch.hpp
This commit is contained in:
Matt Wozniski
2012-09-26 21:42:44 -04:00
19 changed files with 800 additions and 200 deletions

View File

@@ -31,10 +31,21 @@ namespace Catch
fullConfig( _fullConfig )
{}
ReporterConfig( const ReporterConfig& other )
: name( other.name ),
stream( other.stream ),
includeSuccessfulResults( other.includeSuccessfulResults ),
fullConfig( other.fullConfig )
{}
std::string name;
std::ostream& stream;
bool includeSuccessfulResults;
ConfigData fullConfig;
private:
void operator=(const ReporterConfig&);
};
class TestCaseInfo;