mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-06-22 12:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reverted 419

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@420 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2012-03-05 23:10:16 +00:00
parent 3fa0d17785
commit 076ca8e084
2 changed files with 2 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libraries/turtle/mock.hpp
View file

@ -49,10 +49,7 @@ namespace detail
{};
template< typename T >
struct base;
template< typename T >
struct base< void( T ) > : T
struct base
{
typedef T base_type;
};
@ -81,7 +78,7 @@ namespace detail
}
#define MOCK_BASE_CLASS(T, I) \
struct T : mock::detail::base< void( I ) >, mock::object
struct T : I, mock::object, mock::detail::base< I >
#define MOCK_CLASS(T) \
struct T : mock::object
#define MOCK_FUNCTOR(f, S) \

17
src/tests/turtle_test/mock_test.cpp
View file

@ -319,20 +319,3 @@ BOOST_AUTO_TEST_CASE( mock_static_function_is_named )
{
BOOST_CHECK_EQUAL( "static_function_class::mock_static_function", to_string( MOCK_MOCKER( static_function_class::mock_static_function ) ) );
}
namespace
{
template< typename T1, typename T2 >
struct base_template_class
{};
MOCK_BASE_CLASS( mock_instanciated_template_class, (base_template_class< int, int >) )
{};
template< typename T >
MOCK_BASE_CLASS( mock_template_class, (base_template_class< T, T >) )
{};
}
BOOST_AUTO_TEST_CASE( mock_template_class_can_be_instanciated )
{
mock_template_class< int > c;
}