Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2012-10-16 08:33:13 +0100
committerPhil Nash2012-10-16 08:33:13 +0100
commita5fa78284d6d95770cd647a2ec10df09d378ba46 (patch)
tree6ff9a37e7dc39a63d0f8286c91e4106341ac0858 /include
parentc597a893fa95462b8d2d5029547d4054eda1839f (diff)
downloadcatch3-a5fa78284d6d95770cd647a2ec10df09d378ba46.tar.gz
ResultData -> AssertionResultData
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_assertionresult.h8
-rw-r--r--include/internal/catch_assertionresult.hpp2
-rw-r--r--include/internal/catch_assertionresult_builder.h2
-rw-r--r--include/internal/catch_assertionresult_builder.hpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/include/internal/catch_assertionresult.h b/include/internal/catch_assertionresult.h
index f6d244f6..f3256510 100644
--- a/include/internal/catch_assertionresult.h
+++ b/include/internal/catch_assertionresult.h
@@ -13,9 +13,9 @@
namespace Catch {
- struct ResultData
+ struct AssertionResultData
{
- ResultData() : resultType( ResultWas::Unknown ) {}
+ AssertionResultData() : resultType( ResultWas::Unknown ) {}
std::string macroName;
SourceLineInfo lineInfo;
@@ -28,7 +28,7 @@ namespace Catch {
class AssertionResult {
public:
AssertionResult();
- AssertionResult( const ResultData& data );
+ AssertionResult( const AssertionResultData& data );
~AssertionResult();
bool ok() const;
@@ -44,7 +44,7 @@ namespace Catch {
std::string getTestMacroName() const;
protected:
- ResultData m_data;
+ AssertionResultData m_data;
};
} // end namespace Catch
diff --git a/include/internal/catch_assertionresult.hpp b/include/internal/catch_assertionresult.hpp
index 20c25005..ba46adc2 100644
--- a/include/internal/catch_assertionresult.hpp
+++ b/include/internal/catch_assertionresult.hpp
@@ -14,7 +14,7 @@ namespace Catch {
AssertionResult::AssertionResult() {}
- AssertionResult::AssertionResult( const ResultData& data ) : m_data( data ) {}
+ AssertionResult::AssertionResult( const AssertionResultData& data ) : m_data( data ) {}
AssertionResult::~AssertionResult() {}
diff --git a/include/internal/catch_assertionresult_builder.h b/include/internal/catch_assertionresult_builder.h
index 9f1f2d82..8987242c 100644
--- a/include/internal/catch_assertionresult_builder.h
+++ b/include/internal/catch_assertionresult_builder.h
@@ -48,7 +48,7 @@ public:
}
private:
- ResultData m_data;
+ AssertionResultData m_data;
std::string m_lhs, m_rhs, m_op;
bool m_isFalse;
};
diff --git a/include/internal/catch_assertionresult_builder.hpp b/include/internal/catch_assertionresult_builder.hpp
index 6e5af250..1c34b918 100644
--- a/include/internal/catch_assertionresult_builder.hpp
+++ b/include/internal/catch_assertionresult_builder.hpp
@@ -65,7 +65,7 @@ namespace Catch {
AssertionResult AssertionResultBuilder::build() const
{
- ResultData data = m_data;
+ AssertionResultData data = m_data;
data.reconstructedExpression = reconstructExpression();
if( m_isFalse ) {
if( m_op == "" ) {