From 463981554debec6dea4e823a5dab8ebd1f39bff0 Mon Sep 17 00:00:00 2001
From: kentsangkm <kentsangkm@gmail.com>
Date: Thu, 26 Mar 2015 19:38:07 +0800
Subject: [PATCH] Revert "Resolved #359"

This reverts commit c97927f2428db18989c61b0516d83c0907aa4c10.
---
 include/internal/catch_capture.hpp      |  2 +-
 include/internal/catch_result_builder.h |  8 ++++----
 single_include/catch.hpp                | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp
index 628e4040..1285b31f 100644
--- a/include/internal/catch_capture.hpp
+++ b/include/internal/catch_capture.hpp
@@ -33,7 +33,7 @@
     do { \
         Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
         try { \
-            __catchResult.eval(expr).endExpression(); \
+            ( __catchResult->*expr ).endExpression(); \
         } \
         catch( ... ) { \
             __catchResult.useActiveException( Catch::ResultDisposition::Normal ); \
diff --git a/include/internal/catch_result_builder.h b/include/internal/catch_result_builder.h
index 1c89e2ac..3963c26d 100644
--- a/include/internal/catch_result_builder.h
+++ b/include/internal/catch_result_builder.h
@@ -41,8 +41,8 @@ namespace Catch {
                         ResultDisposition::Flags resultDisposition );
 
         template<typename T>
-        ExpressionLhs<T const&> eval( T const& operand );
-        ExpressionLhs<bool> eval( bool value );
+        ExpressionLhs<T const&> operator->* ( T const& operand );
+        ExpressionLhs<bool> operator->* ( bool value );
 
         template<typename T>
         ResultBuilder& operator << ( T const& value ) {
@@ -93,11 +93,11 @@ namespace Catch {
 namespace Catch {
 
     template<typename T>
-    inline ExpressionLhs<T const&> ResultBuilder::eval( T const& operand ) {
+    inline ExpressionLhs<T const&> ResultBuilder::operator->* ( T const& operand ) {
         return ExpressionLhs<T const&>( *this, operand );
     }
 
-    inline ExpressionLhs<bool> ResultBuilder::eval( bool value ) {
+    inline ExpressionLhs<bool> ResultBuilder::operator->* ( bool value ) {
         return ExpressionLhs<bool>( *this, value );
     }
 
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index 9fb5394f..6b8dfb5e 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -724,8 +724,8 @@ namespace Catch {
                         ResultDisposition::Flags resultDisposition );
 
         template<typename T>
-        ExpressionLhs<T const&> eval( T const& operand );
-        ExpressionLhs<bool> eval( bool value );
+        ExpressionLhs<T const&> operator->* ( T const& operand );
+        ExpressionLhs<bool> operator->* ( bool value );
 
         template<typename T>
         ResultBuilder& operator << ( T const& value ) {
@@ -1301,11 +1301,11 @@ private:
 namespace Catch {
 
     template<typename T>
-    inline ExpressionLhs<T const&> ResultBuilder::eval( T const& operand ) {
+    inline ExpressionLhs<T const&> ResultBuilder::operator->* ( T const& operand ) {
         return ExpressionLhs<T const&>( *this, operand );
     }
 
-    inline ExpressionLhs<bool> ResultBuilder::eval( bool value ) {
+    inline ExpressionLhs<bool> ResultBuilder::operator->* ( bool value ) {
         return ExpressionLhs<bool>( *this, value );
     }
 
@@ -1475,7 +1475,7 @@ namespace Catch {
     do { \
         Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
         try { \
-            __catchResult.eval(expr).endExpression(); \
+            ( __catchResult->*expr ).endExpression(); \
         } \
         catch( ... ) { \
             __catchResult.useActiveException( Catch::ResultDisposition::Normal ); \