mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-25 23:06:10 +01:00
Merge branch 'warning-c4512' of https://github.com/gchudnov/Catch into gchudnov-warning-c4512
This commit is contained in:
parent
aa28196e8b
commit
44632c3d71
@ -27,6 +27,8 @@ class ExpressionLhs : public DecomposedExpression {
|
|||||||
public:
|
public:
|
||||||
ExpressionLhs( ResultBuilder& rb, T lhs ) : m_rb( rb ), m_lhs( lhs ), m_truthy(false) {}
|
ExpressionLhs( ResultBuilder& rb, T lhs ) : m_rb( rb ), m_lhs( lhs ), m_truthy(false) {}
|
||||||
|
|
||||||
|
ExpressionLhs& operator = ( const ExpressionLhs& );
|
||||||
|
|
||||||
template<typename RhsT>
|
template<typename RhsT>
|
||||||
BinaryExpression<T, Internal::IsEqualTo, RhsT const&>
|
BinaryExpression<T, Internal::IsEqualTo, RhsT const&>
|
||||||
operator == ( RhsT const& rhs ) {
|
operator == ( RhsT const& rhs ) {
|
||||||
@ -105,6 +107,8 @@ public:
|
|||||||
BinaryExpression( ResultBuilder& rb, LhsT lhs, RhsT rhs )
|
BinaryExpression( ResultBuilder& rb, LhsT lhs, RhsT rhs )
|
||||||
: m_rb( rb ), m_lhs( lhs ), m_rhs( rhs ) {}
|
: m_rb( rb ), m_lhs( lhs ), m_rhs( rhs ) {}
|
||||||
|
|
||||||
|
BinaryExpression& operator = ( BinaryExpression& );
|
||||||
|
|
||||||
void endExpression() const {
|
void endExpression() const {
|
||||||
m_rb
|
m_rb
|
||||||
.setResultType( Internal::compare<Op>( m_lhs, m_rhs ) )
|
.setResultType( Internal::compare<Op>( m_lhs, m_rhs ) )
|
||||||
|
Loading…
Reference in New Issue
Block a user