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 inline to generated MOCK_FUNCTION

Browse source
This commit is contained in:
Mathieu Champlon 2015-04-07 07:52:37 +02:00
parent b92314ec07
commit 712653eb99
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
doc/changelog.qbk
View file

@ -12,6 +12,7 @@ Not yet released
* Dropped support for obsolete Boost.Phoenix V2 * Dropped support for obsolete Boost.Phoenix V2
* Added support for multiple parameters constraints * Added support for multiple parameters constraints
* Added inline to generated MOCK_FUNCTION
[section 1.2.6] [section 1.2.6]
Released 24 May 2014 Released 24 May 2014

5
include/turtle/mock.hpp
View file

@ -163,7 +163,7 @@
#define MOCK_FUNCTION_AUX(F, n, S, t, s, tpn) \ #define MOCK_FUNCTION_AUX(F, n, S, t, s, tpn) \
MOCK_FUNCTION_HELPER(S, t, s, tpn) \ MOCK_FUNCTION_HELPER(S, t, s, tpn) \
s MOCK_DECL(F, n, S,,tpn) \ s inline MOCK_DECL(F, n, S,,tpn) \
{ \ { \
BOOST_MPL_ASSERT_RELATION( n, ==, \ BOOST_MPL_ASSERT_RELATION( n, ==, \
boost::function_types::function_arity< \ boost::function_types::function_arity< \
@ -212,7 +212,8 @@
#define MOCK_STATIC_METHOD(F, n, ...) \ #define MOCK_STATIC_METHOD(F, n, ...) \
MOCK_FUNCTION_AUX(F, n, \ MOCK_FUNCTION_AUX(F, n, \
MOCK_VARIADIC_ELEM_0(__VA_ARGS__), \ MOCK_VARIADIC_ELEM_0(__VA_ARGS__), \
MOCK_VARIADIC_ELEM_1(__VA_ARGS__, F), static,) MOCK_VARIADIC_ELEM_1(__VA_ARGS__, F), \
static,)
#define MOCK_STATIC_METHOD_TPL(F, n, ...) \ #define MOCK_STATIC_METHOD_TPL(F, n, ...) \
MOCK_FUNCTION_AUX(F, n, \ MOCK_FUNCTION_AUX(F, n, \