catchorg/Catch2
1
0
Fork 1
mirror of https://github.com/catchorg/Catch2.git synced 2025-11-04 00:51:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Made macroName and capturedExpression StringRefs

Browse Source
This commit is contained in:
Phil Nash
2017-08-08 01:22:21 +01:00
parent 59f9bcf1ed
commit f8148ebae1
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/internal/catch_result_builder.cpp
View File

@@ -30,9 +30,9 @@ namespace Catch {
}
ResultBuilder::ResultBuilder( char const* macroName,
ResultBuilder::ResultBuilder( StringRef macroName,
SourceLineInfo const& lineInfo,
char const* capturedExpression,
StringRef capturedExpression,
ResultDisposition::Flags resultDisposition )
: m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition }
{
@@ -99,7 +99,7 @@ namespace Catch {
assert( !isFalseTest( m_assertionInfo.resultDisposition ) );
AssertionResultData data = m_data;
data.resultType = ResultWas::Ok;
data.reconstructedExpression = m_assertionInfo.capturedExpression;
data.reconstructedExpression = m_assertionInfo.capturedExpression.c_str();
std::string actualMessage = Catch::translateActiveException();
if( !matcher.match( actualMessage ) ) {
@@ -166,7 +166,7 @@ namespace Catch {
}
void ResultBuilder::reconstructExpression( std::string& dest ) const {
dest = m_assertionInfo.capturedExpression;
dest = m_assertionInfo.capturedExpression.c_str();
}
void ResultBuilder::setExceptionGuard() {