3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-10-30 19:57:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move templates around to avoid linkage errors when CATCH_CONFIG_MAIN isn't defined

Browse Source
This commit is contained in:
Ryan Gonzalez
2016-01-22 12:49:42 -06:00
parent 2beec11153
commit f08e5ff915
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/internal/catch_result_builder.h
View File

@@ -79,9 +79,15 @@ namespace Catch {
ResultBuilder& setResultType( ResultWas::OfType result ); ResultBuilder& setResultType( ResultWas::OfType result );
ResultBuilder& setResultType( bool result ); ResultBuilder& setResultType( bool result );
template <typename T> template <typename T>
ResultBuilder& setLhs( T const& lhs ); ResultBuilder& setLhs( T const& lhs ) {
m_exprComponents.lhs = new AnyTypeHolder<T>( lhs );
return *this;
}
template <typename T> template <typename T>
ResultBuilder& setRhs( T const& rhs ); ResultBuilder& setRhs( T const& rhs ) {
m_exprComponents.rhs = new AnyTypeHolder<T>( rhs );
return *this;
}
ResultBuilder& setOp( std::string const& op ); ResultBuilder& setOp( std::string const& op );
void endExpression(); void endExpression();

10
include/internal/catch_result_builder.hpp
View File

@@ -41,16 +41,6 @@ namespace Catch {
m_data.resultType = result ? ResultWas::Ok : ResultWas::ExpressionFailed; m_data.resultType = result ? ResultWas::Ok : ResultWas::ExpressionFailed;
return *this; return *this;
} }
template <typename T>
ResultBuilder& ResultBuilder::setLhs( T const& lhs ) {
m_exprComponents.lhs = new AnyTypeHolder<T>( lhs );
return *this;
}
template <typename T>
ResultBuilder& ResultBuilder::setRhs( T const& rhs ) {
m_exprComponents.rhs = new AnyTypeHolder<T>( rhs );
return *this;
}
ResultBuilder& ResultBuilder::setOp( std::string const& op ) { ResultBuilder& ResultBuilder::setOp( std::string const& op ) {
m_exprComponents.op = op; m_exprComponents.op = op;
return *this; return *this;