Reduced AssertionInfo to a pure record type

This commit is contained in:
Phil Nash
2017-08-08 01:08:07 +01:00
parent 5e60050299
commit 59f9bcf1ed
4 changed files with 11 additions and 32 deletions

View File

@@ -39,16 +39,12 @@ namespace Catch {
struct AssertionInfo
{
AssertionInfo() = delete;
AssertionInfo( char const * _macroName,
SourceLineInfo const& _lineInfo,
char const * _capturedExpression,
ResultDisposition::Flags _resultDisposition);
char const * macroName = nullptr;
char const * macroName;
SourceLineInfo lineInfo;
char const * capturedExpression = nullptr;
ResultDisposition::Flags resultDisposition = ResultDisposition::Normal;
char const * capturedExpression;
ResultDisposition::Flags resultDisposition;
AssertionInfo() = delete;
};
struct AssertionResultData
@@ -66,13 +62,8 @@ namespace Catch {
class AssertionResult {
public:
AssertionResult() = delete;
AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
~AssertionResult();
AssertionResult( AssertionResult const& ) = default;
AssertionResult( AssertionResult && ) = default;
AssertionResult& operator = ( AssertionResult const& ) = default;
AssertionResult& operator = ( AssertionResult && ) = default;
bool isOk() const;
bool succeeded() const;