Merge remote-tracking branch 'phil' into include-guard-fixes
Conflicts: single_include/catch.hpp
This commit is contained in:
commit
07e20aa706
19 files changed
+800
-200
No files matched your search
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user