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

Add comma to MOCK_VARIADIC_ELEM_N calls

Browse source 
Avoids warning "must specify at least one argument for '...' parameter of
variadic macro" on e.g. Clang
This commit is contained in:
Alexander Grund 2018-12-11 16:38:02 +01:00
parent f0fb2a1d02
commit 45574d708b
1 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

43
include/turtle/mock.hpp
View file

@ -21,7 +21,6 @@
#include "detail/parameter.hpp" #include "detail/parameter.hpp"
#include <boost/preprocessor/repetition/repeat.hpp> #include <boost/preprocessor/repetition/repeat.hpp>
#include <boost/preprocessor/stringize.hpp> #include <boost/preprocessor/stringize.hpp>
#include <boost/preprocessor/variadic/elem.hpp>
#include <boost/utility/identity_type.hpp> #include <boost/utility/identity_type.hpp>
#include <boost/mpl/assert.hpp> #include <boost/mpl/assert.hpp>
@ -180,49 +179,53 @@
#ifdef MOCK_VARIADIC_MACROS #ifdef MOCK_VARIADIC_MACROS
#define MOCK_VARIADIC_ELEM_0(e0, ...) e0
#define MOCK_VARIADIC_ELEM_1(e0, e1, ...) e1
#define MOCK_VARIADIC_ELEM_2(e0, e1, e2, ...) e2
#define MOCK_METHOD(M, ...) \ #define MOCK_METHOD(M, ...) \
MOCK_METHOD_EXT(M, \ MOCK_METHOD_EXT(M, \
BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__ ), \ MOCK_VARIADIC_ELEM_0(__VA_ARGS__, ), \
BOOST_PP_VARIADIC_ELEM(1, __VA_ARGS__, MOCK_SIGNATURE(M)), \ MOCK_VARIADIC_ELEM_1(__VA_ARGS__, MOCK_SIGNATURE(M), ), \
BOOST_PP_VARIADIC_ELEM(2, __VA_ARGS__, M, M)) MOCK_VARIADIC_ELEM_2(__VA_ARGS__, M, M, ))
#define MOCK_CONST_METHOD(M, n, ...) \ #define MOCK_CONST_METHOD(M, n, ...) \
MOCK_CONST_METHOD_EXT(M, n, \ MOCK_CONST_METHOD_EXT(M, n, \
BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__), \ MOCK_VARIADIC_ELEM_0(__VA_ARGS__, ), \
BOOST_PP_VARIADIC_ELEM(1, __VA_ARGS__, M)) MOCK_VARIADIC_ELEM_1(__VA_ARGS__, M, ))
#define MOCK_NON_CONST_METHOD(M, n, ...) \ #define MOCK_NON_CONST_METHOD(M, n, ...) \
MOCK_NON_CONST_METHOD_EXT(M, n, \ MOCK_NON_CONST_METHOD_EXT(M, n, \
BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__), \ MOCK_VARIADIC_ELEM_0(__VA_ARGS__, ), \
BOOST_PP_VARIADIC_ELEM(1, __VA_ARGS__, M)) MOCK_VARIADIC_ELEM_1(__VA_ARGS__, M, ))
#define MOCK_METHOD_TPL(M, n, ...) \ #define MOCK_METHOD_TPL(M, n, ...) \
MOCK_METHOD_EXT_TPL(M, n, \ MOCK_METHOD_EXT_TPL(M, n, \
BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__), \ MOCK_VARIADIC_ELEM_0(__VA_ARGS__, ), \
BOOST_PP_VARIADIC_ELEM(1, __VA_ARGS__, M)) MOCK_VARIADIC_ELEM_1(__VA_ARGS__, M, ))
#define MOCK_CONST_METHOD_TPL(M, n, ...) \ #define MOCK_CONST_METHOD_TPL(M, n, ...) \
MOCK_CONST_METHOD_EXT_TPL(M, n, \ MOCK_CONST_METHOD_EXT_TPL(M, n, \
BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__), \ MOCK_VARIADIC_ELEM_0(__VA_ARGS__, ), \
BOOST_PP_VARIADIC_ELEM(1, __VA_ARGS__, M)) MOCK_VARIADIC_ELEM_1(__VA_ARGS__, M, ))
#define MOCK_NON_CONST_METHOD_TPL(M, n, ...) \ #define MOCK_NON_CONST_METHOD_TPL(M, n, ...) \
MOCK_NON_CONST_METHOD_EXT_TPL(M, n, \ MOCK_NON_CONST_METHOD_EXT_TPL(M, n, \
BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__), \ MOCK_VARIADIC_ELEM_0(__VA_ARGS__, ), \
BOOST_PP_VARIADIC_ELEM(1, __VA_ARGS__, M)) MOCK_VARIADIC_ELEM_1(__VA_ARGS__, M, ))
#define MOCK_FUNCTION(F, n, ...) \ #define MOCK_FUNCTION(F, n, ...) \
MOCK_FUNCTION_AUX(F, n, \ MOCK_FUNCTION_AUX(F, n, \
BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__), \ MOCK_VARIADIC_ELEM_0(__VA_ARGS__, ), \
BOOST_PP_VARIADIC_ELEM(1, __VA_ARGS__, F), \ MOCK_VARIADIC_ELEM_1(__VA_ARGS__, F, ), \
inline,) inline,)
#define MOCK_STATIC_METHOD(F, n, ...) \ #define MOCK_STATIC_METHOD(F, n, ...) \
MOCK_FUNCTION_AUX(F, n, \ MOCK_FUNCTION_AUX(F, n, \
BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__), \ MOCK_VARIADIC_ELEM_0(__VA_ARGS__, ), \
BOOST_PP_VARIADIC_ELEM(1, __VA_ARGS__, F), \ MOCK_VARIADIC_ELEM_1(__VA_ARGS__, F, ), \
static,) 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, \
BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__), \ MOCK_VARIADIC_ELEM_0(__VA_ARGS__, ), \
BOOST_PP_VARIADIC_ELEM(1, __VA_ARGS__, F), \ MOCK_VARIADIC_ELEM_1(__VA_ARGS__, F, ), \
static, typename) static, typename)
#else // MOCK_VARIADIC_MACROS #else // MOCK_VARIADIC_MACROS