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

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2012-05-24 08:27:09 +0100
committerPhil Nash2012-05-24 08:27:09 +0100
commitbe838671ab210a2ec192aa3d6f1b8b39e651394f (patch)
tree3415c10b29ddd2a0a0aa954afdd308a1acdf44f8 /include
parent73e1bc20bc66df3d0ffbef610ce1e8a472e8e1b5 (diff)
downloadcatch3-be838671ab210a2ec192aa3d6f1b8b39e651394f.tar.gz
Removed special handling for pointer comparisons
These all seem to be handled by the general case now
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_expression.hpp38
-rw-r--r--include/internal/catch_expression_builder.hpp17
2 files changed, 0 insertions, 55 deletions
diff --git a/include/internal/catch_expression.hpp b/include/internal/catch_expression.hpp
index 4fe147f6..f7c570ea 100644
--- a/include/internal/catch_expression.hpp
+++ b/include/internal/catch_expression.hpp
@@ -75,44 +75,6 @@ private:
ResultInfoBuilder& m_result;
T m_lhs;
};
-
-template<typename LhsT>
-class PtrExpression {
-public:
-
- PtrExpression ( ResultInfoBuilder& result, const LhsT* lhs )
- : m_result( &result ),
- m_lhs( lhs )
- {}
-
- template<typename RhsT>
- ResultInfoBuilder& operator == ( const RhsT* rhs ) {
- return m_result->captureExpression<Internal::IsEqualTo>( m_lhs, rhs );
- }
-
- // This catches NULL
- ResultInfoBuilder& operator == ( LhsT* rhs ) {
- return m_result->captureExpression<Internal::IsEqualTo>( m_lhs, rhs );
- }
-
- template<typename RhsT>
- ResultInfoBuilder& operator != ( const RhsT* rhs ) {
- return m_result->captureExpression<Internal::IsNotEqualTo>( m_lhs, rhs );
- }
-
- // This catches NULL
- ResultInfoBuilder& operator != ( LhsT* rhs ) {
- return m_result->captureExpression<Internal::IsNotEqualTo>( m_lhs, rhs );
- }
-
- operator ResultInfoBuilder& () {
- return m_result->captureBoolExpression( m_lhs );
- }
-
-private:
- ResultInfoBuilder* m_result;
- const LhsT* m_lhs;
-};
} // end namespace Catch
diff --git a/include/internal/catch_expression_builder.hpp b/include/internal/catch_expression_builder.hpp
index 3d5a9ef8..97f9c214 100644
--- a/include/internal/catch_expression_builder.hpp
+++ b/include/internal/catch_expression_builder.hpp
@@ -36,23 +36,6 @@ public:
return expr;
}
- Expression<const char*> operator->* ( const char* const& operand ) {
- Expression<const char*> expr( m_result, operand );
- return expr;
- }
-
- template<typename T>
- PtrExpression<T> operator->* ( const T* operand ) {
- PtrExpression<T> expr( m_result, operand );
- return expr;
- }
-
- template<typename T>
- PtrExpression<T> operator->* ( T* operand ) {
- PtrExpression<T> expr( m_result, operand );
- return expr;
- }
-
Expression<bool> operator->* ( bool value ) {
Expression<bool> expr( m_result, value );
return expr;