From f466d9a1edee9fe56b054a9aef33bf787f06fb61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Sat, 9 Dec 2017 20:48:29 +0100 Subject: [PATCH] Fix a7a9ee5 --- include/internal/catch_assertionhandler.cpp | 1 - include/internal/catch_assertionhandler.h | 5 +++-- include/internal/catch_common.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/internal/catch_assertionhandler.cpp b/include/internal/catch_assertionhandler.cpp index 91899d8f..c6818c14 100644 --- a/include/internal/catch_assertionhandler.cpp +++ b/include/internal/catch_assertionhandler.cpp @@ -8,7 +8,6 @@ #include "catch_assertionhandler.h" #include "catch_assertionresult.h" -#include "catch_interfaces_capture.h" #include "catch_interfaces_runner.h" #include "catch_interfaces_config.h" #include "catch_context.h" diff --git a/include/internal/catch_assertionhandler.h b/include/internal/catch_assertionhandler.h index 086b5058..cadc78f3 100644 --- a/include/internal/catch_assertionhandler.h +++ b/include/internal/catch_assertionhandler.h @@ -8,8 +8,9 @@ #ifndef TWOBLUECUBES_CATCH_ASSERTIONHANDLER_H_INCLUDED #define TWOBLUECUBES_CATCH_ASSERTIONHANDLER_H_INCLUDED -#include "catch_decomposer.h" #include "catch_assertioninfo.h" +#include "catch_decomposer.h" +#include "catch_interfaces_capture.h" namespace Catch { @@ -54,7 +55,7 @@ namespace Catch { ResultDisposition::Flags resultDisposition ); ~AssertionHandler() { if ( !m_completed ) { - m_resultCapture.handleIncomplete( m_assertionInfo ) + m_resultCapture.handleIncomplete( m_assertionInfo ); } } diff --git a/include/internal/catch_common.h b/include/internal/catch_common.h index 3bdde156..4aaf80c5 100644 --- a/include/internal/catch_common.h +++ b/include/internal/catch_common.h @@ -43,7 +43,7 @@ namespace Catch { struct SourceLineInfo { SourceLineInfo() = delete; - SourceLineInfo::SourceLineInfo( char const* _file, std::size_t _line ) noexcept + SourceLineInfo( char const* _file, std::size_t _line ) noexcept : file( _file ), line( _line ) {}