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

Merge branch 'master' into dev-modernize

Browse Source 
This includes the performance commits done recently
This commit is contained in:
Martin Hořeňovský
2017-06-26 19:08:42 +02:00
parent 1e7000ed55 8a14af701e
commit c5bac73cad
7 changed files with 62 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/internal/catch_assertionresult.h
View File

@@ -40,15 +40,17 @@ namespace Catch {
struct AssertionInfo
{
AssertionInfo() {}
AssertionInfo( std::string const& _macroName,
AssertionInfo( char const * _macroName,
SourceLineInfo const& _lineInfo,
std::string const& _capturedExpression,
ResultDisposition::Flags _resultDisposition );
char const * _capturedExpression,
ResultDisposition::Flags _resultDisposition,
char const * _secondArg = "");
std::string macroName;
char const * macroName;
SourceLineInfo lineInfo;
std::string capturedExpression;
char const * capturedExpression;
ResultDisposition::Flags resultDisposition;
char const * secondArg;
};
struct AssertionResultData