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

Cleanup

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@279 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2011-03-21 22:19:18 +00:00
parent 29975de820
commit c75f80256f
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libraries/turtle/constraints.hpp
View file

@ -112,7 +112,8 @@ namespace detail
template< typename Actual > template< typename Actual >
bool operator()( Actual& actual, bool operator()( Actual& actual,
BOOST_DEDUCED_TYPENAME boost::disable_if< BOOST_DEDUCED_TYPENAME boost::disable_if<
boost::is_convertible< Expected*, Actual >, Actual >::type* = 0 ) const boost::is_convertible< Expected*, Actual >
>::type* = 0 ) const
{ {
actual = expected_; actual = expected_;
return true; return true;
@ -120,7 +121,8 @@ namespace detail
template< typename Actual > template< typename Actual >
bool operator()( Actual* actual, bool operator()( Actual* actual,
BOOST_DEDUCED_TYPENAME boost::enable_if< BOOST_DEDUCED_TYPENAME boost::enable_if<
boost::is_convertible< Expected, Actual >, Actual >::type* = 0 ) const boost::is_convertible< Expected, Actual >
>::type* = 0 ) const
{ {
*actual = expected_; *actual = expected_;
return true; return true;
@ -141,7 +143,8 @@ namespace detail
template< typename Actual > template< typename Actual >
bool operator()( const Actual& actual, bool operator()( const Actual& actual,
BOOST_DEDUCED_TYPENAME boost::disable_if< BOOST_DEDUCED_TYPENAME boost::disable_if<
boost::is_convertible< const Actual*, Expected >, Actual >::type* = 0 ) const boost::is_convertible< const Actual*, Expected >
>::type* = 0 ) const
{ {
*expected_ = actual; *expected_ = actual;
return true; return true;
@ -149,7 +152,8 @@ namespace detail
template< typename Actual > template< typename Actual >
bool operator()( Actual& actual, bool operator()( Actual& actual,
BOOST_DEDUCED_TYPENAME boost::enable_if< BOOST_DEDUCED_TYPENAME boost::enable_if<
boost::is_convertible< Actual*, Expected >, Actual >::type* = 0 ) const boost::is_convertible< Actual*, Expected >
>::type* = 0 ) const
{ {
*expected_ = &actual; *expected_ = &actual;
return true; return true;

3
src/libraries/turtle/log.hpp
View file

@ -244,7 +244,8 @@ namespace detail
template< typename T > template< typename T >
BOOST_DEDUCED_TYPENAME boost::enable_if< BOOST_DEDUCED_TYPENAME boost::enable_if<
boost::function_types::is_callable_builtin< T >, stream& boost::function_types::is_callable_builtin< T >,
stream&
>::type >::type
operator<<( stream& s, const T& ) operator<<( stream& s, const T& )
{ {

6
src/libraries/turtle/mock.hpp
View file

@ -98,7 +98,7 @@ namespace detail
void set_parent( E& e, const std::string& prefix, void set_parent( E& e, const std::string& prefix,
const std::string& name, const T&, const std::string& name, const T&,
BOOST_DEDUCED_TYPENAME boost::disable_if< BOOST_DEDUCED_TYPENAME boost::disable_if<
BOOST_DEDUCED_TYPENAME boost::is_base_of< object, T >::type BOOST_DEDUCED_TYPENAME boost::is_base_of< object, T >
>::type* = 0 ) >::type* = 0 )
{ {
e.tag( prefix + name ); e.tag( prefix + name );
@ -158,7 +158,7 @@ namespace detail
#define MOCK_CALL(z, n, d) \ #define MOCK_CALL(z, n, d) \
template< typename E > \ template< typename E > \
BOOST_DEDUCED_TYPENAME boost::enable_if< \ BOOST_DEDUCED_TYPENAME boost::enable_if< \
BOOST_DEDUCED_TYPENAME has_arity< E, n >::type, \ BOOST_DEDUCED_TYPENAME has_arity< E, n >, \
BOOST_DEDUCED_TYPENAME E::result_type \ BOOST_DEDUCED_TYPENAME E::result_type \
>::type \ >::type \
call( E e BOOST_PP_COMMA_IF(n) MOCK_ARGS(n, BOOST_DEDUCED_TYPENAME E::signature_type, BOOST_DEDUCED_TYPENAME ) ) \ call( E e BOOST_PP_COMMA_IF(n) MOCK_ARGS(n, BOOST_DEDUCED_TYPENAME E::signature_type, BOOST_DEDUCED_TYPENAME ) ) \
@ -256,7 +256,7 @@ namespace detail
#define MOCK_CALL(z, n, d) \ #define MOCK_CALL(z, n, d) \
template< typename E > \ template< typename E > \
BOOST_DEDUCED_TYPENAME boost::disable_if< \ BOOST_DEDUCED_TYPENAME boost::disable_if< \
BOOST_DEDUCED_TYPENAME has_arity< E, n >::type, \ BOOST_DEDUCED_TYPENAME has_arity< E, n >, \
BOOST_DEDUCED_TYPENAME E::result_type \ BOOST_DEDUCED_TYPENAME E::result_type \
>::type \ >::type \
call( E BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM(n, MOCK_CALL_INVALID_TYPE, BOOST_PP_EMPTY) ) \ call( E BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM(n, MOCK_CALL_INVALID_TYPE, BOOST_PP_EMPTY) ) \