From 823fd994ff88fb0a6f4fbba28ded8e8c51cd7ab3 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sun, 12 Jul 2020 13:44:24 +0200 Subject: [PATCH] Remove some Boost.PP stuff --- include/turtle/config.hpp | 14 -------------- test/test_integration.cpp | 4 +++- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/include/turtle/config.hpp b/include/turtle/config.hpp index 8ca1464..28cfb68 100644 --- a/include/turtle/config.hpp +++ b/include/turtle/config.hpp @@ -12,8 +12,6 @@ #define MOCK_CONFIG_HPP_INCLUDED #include -#include -#include #ifndef MOCK_ERROR_POLICY # define MOCK_ERROR_POLICY mock::error @@ -28,18 +26,6 @@ # define MOCK_MAX_SEQUENCES 10 #endif -#ifndef BOOST_FUNCTION_MAX_ARGS -# define BOOST_FUNCTION_MAX_ARGS MOCK_MAX_ARGS -#elif BOOST_PP_LESS(BOOST_FUNCTION_MAX_ARGS, MOCK_MAX_ARGS) -# error BOOST_FUNCTION_MAX_ARGS must be set to MOCK_MAX_ARGS or higher -#endif - -#ifndef BOOST_FT_MAX_ARITY -# define BOOST_FT_MAX_ARITY BOOST_PP_INC(MOCK_MAX_ARGS) -#elif BOOST_PP_LESS_EQUAL(BOOST_FT_MAX_ARITY, MOCK_MAX_ARGS) -# error BOOST_FT_MAX_ARITY must be set to MOCK_MAX_ARGS + 1 or higher -#endif - #if !defined(BOOST_NO_CXX11_HDR_MUTEX) && !defined(BOOST_NO_0X_HDR_MUTEX) # ifndef MOCK_NO_HDR_MUTEX # define MOCK_HDR_MUTEX diff --git a/test/test_integration.cpp b/test/test_integration.cpp index f517a6a..c988dc0 100644 --- a/test/test_integration.cpp +++ b/test/test_integration.cpp @@ -593,7 +593,9 @@ namespace template< typename T1, typename T2 > struct my_base {}; - MOCK_BASE_CLASS( my_comma_mock, my_base< int BOOST_PP_COMMA() int > ) + MOCK_BASE_CLASS( my_comma_mock, my_base< int, int > ) + {}; + MOCK_BASE_CLASS( my_boost_pp_comma_mock, my_base< int BOOST_PP_COMMA() int > ) {}; }