From 88921a1bf3f9a68de281a80b44e77f67f121a667 Mon Sep 17 00:00:00 2001
From: Konstantin Baumann <konstantin.baumann@autodesk.com>
Date: Thu, 31 Jan 2013 11:27:15 +0100
Subject: [PATCH] additional fix for nullptr support

---
 include/internal/catch_evaluate.hpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/internal/catch_evaluate.hpp b/include/internal/catch_evaluate.hpp
index ca301079..1e0da2f1 100644
--- a/include/internal/catch_evaluate.hpp
+++ b/include/internal/catch_evaluate.hpp
@@ -37,7 +37,7 @@ namespace Internal {
     inline T& catch_const_cast(const T& t) { return const_cast<T&>(t); }
 
 #ifdef CATCH_CONFIG_CPP11_NULLPTR
-    inline std::nullptr_t catch_const_cast(const std::nullptr_t&) { return nullptr; }
+    inline std::nullptr_t catch_const_cast(std::nullptr_t) { return nullptr; }
 #endif // CATCH_CONFIG_CPP11_NULLPTR
 
     // So the compare overloads can be operator agnostic we convey the operator as a template
@@ -48,37 +48,37 @@ namespace Internal {
     template<typename T1, typename T2>
     struct Evaluator<T1, T2, IsEqualTo> {
         static bool evaluate( const T1& lhs, const T2& rhs) {
-            return catch_const_cast<T1>( lhs ) ==  catch_const_cast<T2>( rhs );
+            return catch_const_cast( lhs ) ==  catch_const_cast( rhs );
         }
     };
     template<typename T1, typename T2>
     struct Evaluator<T1, T2, IsNotEqualTo> {
         static bool evaluate( const T1& lhs, const T2& rhs ) {
-            return catch_const_cast<T1>( lhs ) != catch_const_cast<T2>( rhs );
+            return catch_const_cast( lhs ) != catch_const_cast( rhs );
         }
     };
     template<typename T1, typename T2>
     struct Evaluator<T1, T2, IsLessThan> {
         static bool evaluate( const T1& lhs, const T2& rhs ) {
-            return catch_const_cast<T1>( lhs ) < catch_const_cast<T2>( rhs );
+            return catch_const_cast( lhs ) < catch_const_cast( rhs );
         }
     };
     template<typename T1, typename T2>
     struct Evaluator<T1, T2, IsGreaterThan> {
         static bool evaluate( const T1& lhs, const T2& rhs ) {
-            return catch_const_cast<T1>( lhs ) > catch_const_cast<T2>( rhs );
+            return catch_const_cast( lhs ) > catch_const_cast( rhs );
         }
     };
     template<typename T1, typename T2>
     struct Evaluator<T1, T2, IsGreaterThanOrEqualTo> {
         static bool evaluate( const T1& lhs, const T2& rhs ) {
-            return catch_const_cast<T1>( lhs ) >= catch_const_cast<T2>( rhs );
+            return catch_const_cast( lhs ) >= catch_const_cast( rhs );
         }
     };
     template<typename T1, typename T2>
     struct Evaluator<T1, T2, IsLessThanOrEqualTo> {
         static bool evaluate( const T1& lhs, const T2& rhs ) {
-            return catch_const_cast<T1>( lhs ) <= catch_const_cast<T2>( rhs );
+            return catch_const_cast( lhs ) <= catch_const_cast( rhs );
         }
     };