Allow { NULL <op> T }to work

Test/ConditionTests.cpp

@@ -224,7 +224,16 @@ TEST_CASE( "./succeeding/conditions/ptr", "Pointers can be compared to null" )
     
     TestData data;
     p = &data;
+    
     REQUIRE( p != NULL );
+
+    const TestData* cp = p;
+    REQUIRE( cp != NULL );
+
+    const TestData* const cpc = p;
+    REQUIRE( cpc != NULL );
+
+//    REQUIRE( NULL != p ); // gives warning, but should compile and run ok
 }
 
 // Not (!) tests

internal/catch_capture.hpp

@@ -395,10 +395,10 @@ private:
     const T& m_lhs;
 };
     
-    template<typename LhsT> 
-    class PtrExpression
-    {
-    public:
+template<typename LhsT> 
+class PtrExpression
+{
+public:
 
     ///////////////////////////////////////////////////////////////////////////
     PtrExpression
@@ -450,10 +450,10 @@ private:
         return m_result.captureExpression<Internal::IsNotEqualTo>( m_lhs, rhs );
     }
     
-    private:
+private:
     MutableResultInfo& m_result;
     const LhsT* m_lhs;
-    };
+};
     
 class ResultBuilder
 {

internal/catch_evaluate.hpp

@@ -217,6 +217,20 @@ namespace Internal
         return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs, testLhsSign( lhs ) );
     }
 
+    template<Operator Op, typename T>
+    bool compare( long lhs, const T* rhs )
+    {
+        return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( NULL ), rhs );
+
+    }
+    
+    template<Operator Op, typename T>
+    bool compare( long lhs, T* rhs )
+    {
+        return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
+        
+    }
+    
 } // end of namespace Internal
 } // end of namespace Catch