From 1f767bc1a483e8abf644be3ec80b82423a0bf1ea Mon Sep 17 00:00:00 2001 From: mat007 Date: Thu, 11 Apr 2013 16:23:09 +0000 Subject: [PATCH] Removed MOCK_METHOD_EXT from disambiguation helper git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@617 860be788-9bd5-4423-9f1e-828f051e677b --- turtle/detail/signature.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/turtle/detail/signature.hpp b/turtle/detail/signature.hpp index 8a45c9f..2f7985d 100644 --- a/turtle/detail/signature.hpp +++ b/turtle/detail/signature.hpp @@ -45,16 +45,17 @@ namespace detail }; // if an error is generated by the line below it means - // the method is ambiguous : use MOCK_METHOD_EXT instead + // the method is ambiguous : specify its signature to + // disambiguate template< typename T > - T& ambiguous_method_name_use_MOCK_METHOD_EXT_instead( const T& ); + T& ambiguous_method_requires_to_specify_signature( const T& ); } } // mock #define MOCK_SIGNATURE(M) \ mock::detail::signature< \ BOOST_TYPEOF( \ - mock::detail::ambiguous_method_name_use_MOCK_METHOD_EXT_instead( \ + mock::detail::ambiguous_method_requires_to_specify_signature( \ &base_type::M ) ) \ >::type