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

Merge branch 'dev-second-string-argument-removal' into dev-modernize

Browse Source 
It is no longer true that an assertion macro has either 1 or 2 args,
so...
This commit is contained in:
Martin Hořeňovský
2017-06-26 20:48:41 +02:00
parent c5bac73cad 0eb101e165
commit fae0fa4ec1
6 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/internal/catch_assertionresult.h
View File

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