From 2810694971eea2d3cb45000a0617120578d1e3de Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Tue, 23 Apr 2013 22:48:35 +0000
Subject: [PATCH] Refactoring

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@627 860be788-9bd5-4423-9f1e-828f051e677b
---
 turtle/constraint.hpp  |  5 +++++
 turtle/constraints.hpp | 12 +++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/turtle/constraint.hpp b/turtle/constraint.hpp
index 34817ac..3c62576 100644
--- a/turtle/constraint.hpp
+++ b/turtle/constraint.hpp
@@ -153,6 +153,11 @@ namespace detail
             {} \
             template< typename Actual > \
             bool operator()( const Actual& actual ) const \
+            { \
+                return test( actual, boost::unwrap_ref( expected_ ) ); \
+            } \
+            template< typename Actual, typename T > \
+            bool test( const Actual& actual, const T& expected ) const \
             { \
                 return Expr; \
             } \
diff --git a/turtle/constraints.hpp b/turtle/constraints.hpp
index a13ebbe..6feafed 100644
--- a/turtle/constraints.hpp
+++ b/turtle/constraints.hpp
@@ -23,13 +23,11 @@ namespace mock
     MOCK_UNARY_CONSTRAINT( negate, ! actual )
     MOCK_UNARY_CONSTRAINT( evaluate, actual() )
 
-    MOCK_BINARY_CONSTRAINT( equal, actual == boost::unwrap_ref( expected_ ) )
-    MOCK_BINARY_CONSTRAINT( less, actual < boost::unwrap_ref( expected_ ) )
-    MOCK_BINARY_CONSTRAINT( greater, actual > boost::unwrap_ref( expected_ ) )
-    MOCK_BINARY_CONSTRAINT(
-        less_equal, actual <= boost::unwrap_ref( expected_ ) )
-    MOCK_BINARY_CONSTRAINT(
-        greater_equal, actual >= boost::unwrap_ref( expected_ ) )
+    MOCK_BINARY_CONSTRAINT( equal, actual == expected )
+    MOCK_BINARY_CONSTRAINT( less, actual < expected )
+    MOCK_BINARY_CONSTRAINT( greater, actual > expected )
+    MOCK_BINARY_CONSTRAINT( less_equal, actual <= expected )
+    MOCK_BINARY_CONSTRAINT( greater_equal, actual >= expected )
 
 namespace detail
 {