diff options
| author | Phil Nash | 2012-04-28 04:11:32 -0700 |
|---|---|---|
| committer | Phil Nash | 2012-04-28 04:11:32 -0700 |
| commit | 5e82dcd62f7804d0fc7eee7a3c5fd43fa7fab1fc (patch) | |
| tree | 127c9da1f6e23d866cd56627ac56868ad0cc5346 | |
| parent | 7ec6d27000cac5cf6fa1cc6a1560668485234bb9 (diff) | |
| parent | 11dca663365d64343dadcafb1c93aed4e01524b4 (diff) | |
| download | catch3-5e82dcd62f7804d0fc7eee7a3c5fd43fa7fab1fc.tar.gz | |
Merge pull request #79 from jweyrich/master
Fix missing parameter for comparisons between long and unsigned X.
| -rw-r--r-- | include/internal/catch_evaluate.hpp | 6 | ||||
| -rw-r--r-- | single_include/catch.hpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/internal/catch_evaluate.hpp b/include/internal/catch_evaluate.hpp index e4f2fe5e..90acad26 100644 --- a/include/internal/catch_evaluate.hpp +++ b/include/internal/catch_evaluate.hpp @@ -160,15 +160,15 @@ namespace Internal // long to unsigned X template<Operator Op> bool compare( long lhs, unsigned int rhs ) { - return applyEvaluator<Op>( static_cast<unsigned long>( lhs ) ); + return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs ); } template<Operator Op> bool compare( long lhs, unsigned long rhs ) { - return applyEvaluator<Op>( static_cast<unsigned long>( lhs ) ); + return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs ); } template<Operator Op> bool compare( long lhs, unsigned char rhs ) { - return applyEvaluator<Op>( static_cast<unsigned long>( lhs ) ); + return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs ); } template<Operator Op, typename T> diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 045f10f4..e51e1897 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1265,15 +1265,15 @@ namespace Internal // long to unsigned X template<Operator Op> bool compare( long lhs, unsigned int rhs ) { - return applyEvaluator<Op>( static_cast<unsigned long>( lhs ) ); + return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs ); } template<Operator Op> bool compare( long lhs, unsigned long rhs ) { - return applyEvaluator<Op>( static_cast<unsigned long>( lhs ) ); + return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs ); } template<Operator Op> bool compare( long lhs, unsigned char rhs ) { - return applyEvaluator<Op>( static_cast<unsigned long>( lhs ) ); + return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs ); } template<Operator Op, typename T> |