Removed unnecessary dependencies to boost::function

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@105 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2010-01-30 11:24:59 +00:00
parent a6a3639055
commit b9f352e2b0
3 changed files with 8 additions and 4 deletions

View file

@ -15,11 +15,12 @@
#include "sequence.hpp" #include "sequence.hpp"
#include "check.hpp" #include "check.hpp"
#include "constraint.hpp" #include "constraint.hpp"
#include <boost/function.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/preprocessor/repetition/repeat_from_to.hpp> #include <boost/preprocessor/repetition/repeat_from_to.hpp>
#include <boost/preprocessor/repetition/enum_params.hpp> #include <boost/preprocessor/repetition/enum_params.hpp>
#include <boost/preprocessor/repetition/enum_binary_params.hpp> #include <boost/preprocessor/repetition/enum_binary_params.hpp>
#include <boost/function_types/parameter_types.hpp>
#include <boost/mpl/at.hpp>
#include <ostream> #include <ostream>
#include <vector> #include <vector>
@ -166,7 +167,11 @@ namespace detail
#define MOCK_MATCHER_TYPEDEF(z, n, d) \ #define MOCK_MATCHER_TYPEDEF(z, n, d) \
typedef BOOST_DEDUCED_TYPENAME \ typedef BOOST_DEDUCED_TYPENAME \
boost::function< Signature >::BOOST_PP_CAT(BOOST_PP_CAT(arg, BOOST_PP_INC(n)), _type) arg##n##_type; \ boost::mpl::at_c< \
BOOST_DEDUCED_TYPENAME \
boost::function_types::parameter_types< Signature >::type, \
n \
>::type arg##n##_type; \
typedef detail::check< arg##n##_type > constraint##n##_type; typedef detail::check< arg##n##_type > constraint##n##_type;
#define MOCK_MATCHER_CONSTRUCTOR(z, n, d) BOOST_PP_COMMA_IF(n) c##n##_ ( any ) #define MOCK_MATCHER_CONSTRUCTOR(z, n, d) BOOST_PP_COMMA_IF(n) c##n##_ ( any )
#define MOCK_MATCHER_WITH(z, n, d) c##n##_ = constraint##n##_type( c##n ); #define MOCK_MATCHER_WITH(z, n, d) c##n##_ = constraint##n##_type( c##n );

View file

@ -13,7 +13,6 @@
#include "object.hpp" #include "object.hpp"
#include "expectation.hpp" #include "expectation.hpp"
#include "type_name.hpp" #include "type_name.hpp"
#include <boost/function.hpp>
#include <boost/preprocessor/cat.hpp> #include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/inc.hpp> #include <boost/preprocessor/inc.hpp>
#include <boost/preprocessor/repetition/repeat_from_to.hpp> #include <boost/preprocessor/repetition/repeat_from_to.hpp>

View file

@ -9,7 +9,7 @@
#ifndef MOCK_RESULT_HPP_INCLUDED #ifndef MOCK_RESULT_HPP_INCLUDED
#define MOCK_RESULT_HPP_INCLUDED #define MOCK_RESULT_HPP_INCLUDED
#include <boost/function.hpp> #include "config.hpp"
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/ref.hpp> #include <boost/ref.hpp>
#include <memory> #include <memory>