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

Added virtual inheritance for mock::object in MOCK_BASE_CLASS macro

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@694 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2013-11-10 13:21:25 +00:00
parent f77cac0103
commit 2de2bf1072
2 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
turtle/mock.hpp
View file

@ -33,7 +33,7 @@
#ifdef MOCK_VARIADIC_MACROS
#define MOCK_BASE_CLASS(T, ...) \
struct T : __VA_ARGS__, mock::object, mock::detail::base< __VA_ARGS__ >
struct T : __VA_ARGS__, virtual mock::object, mock::detail::base< __VA_ARGS__ >
#define MOCK_FUNCTOR(f, ...) \
mock::detail::functor< MOCK_FUNCTION_TYPE((__VA_ARGS__),) > f, f##_mock
@ -44,7 +44,7 @@
#else // MOCK_VARIADIC_MACROS
#define MOCK_BASE_CLASS(T, I) \
struct T : I, mock::object, mock::detail::base< I >
struct T : I, virtual mock::object, mock::detail::base< I >
#define MOCK_FUNCTOR(f, S) \
mock::detail::functor< MOCK_FUNCTION_TYPE(S,) > f, f##_mock