From be838671ab210a2ec192aa3d6f1b8b39e651394f Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Thu, 24 May 2012 08:27:09 +0100
Subject: [PATCH] Removed special handling for pointer comparisons

These all seem to be handled by the general case now
---
 include/internal/catch_expression.hpp         | 38 -------------------
 include/internal/catch_expression_builder.hpp | 17 ---------
 2 files changed, 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;