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

Replaced all file/ line pairings with SourceLineInfo

Browse Source
This commit is contained in:
Phil Nash
2012-05-08 19:16:18 +01:00
parent 81a122e66a
commit 5d1c8f2c6d
9 changed files with 73 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/internal/catch_resultinfo.hpp
View File

@@ -25,8 +25,6 @@ namespace Catch
ResultInfo
()
: m_macroName(),
m_filename(),
m_line( 0 ),
m_expr(),
m_lhs(),
m_rhs(),
@@ -41,15 +39,13 @@ namespace Catch
(
const char* expr,
ResultWas::OfType result,
bool isNot,
const char* filename,
std::size_t line,
bool isNot,
const SourceLineInfo& lineInfo,
const char* macroName,
const char* message
)
: m_macroName( macroName ),
m_filename( filename ),
m_line( line ),
m_lineInfo( lineInfo ),
m_expr( expr ),
m_lhs(),
m_rhs(),
@@ -137,7 +133,7 @@ namespace Catch
()
const
{
return m_filename;
return m_lineInfo.file;
}
///////////////////////////////////////////////////////////////////////////
@@ -145,7 +141,7 @@ namespace Catch
()
const
{
return m_line;
return m_lineInfo.line;
}
///////////////////////////////////////////////////////////////////////////
@@ -191,8 +187,7 @@ namespace Catch
protected:
std::string m_macroName;
std::string m_filename;
std::size_t m_line;
SourceLineInfo m_lineInfo;
std::string m_expr, m_lhs, m_rhs, m_op;
std::string m_message;
ResultWas::OfType m_result;