From c75f80256f6b3b8079cb884bd1d75874ee0eac2b Mon Sep 17 00:00:00 2001 From: mat007 Date: Mon, 21 Mar 2011 22:19:18 +0000 Subject: [PATCH] Cleanup git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@279 860be788-9bd5-4423-9f1e-828f051e677b --- src/libraries/turtle/constraints.hpp | 12 ++++++++---- src/libraries/turtle/log.hpp | 3 ++- src/libraries/turtle/mock.hpp | 6 +++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/libraries/turtle/constraints.hpp b/src/libraries/turtle/constraints.hpp index 2cb8a92..4369e92 100644 --- a/src/libraries/turtle/constraints.hpp +++ b/src/libraries/turtle/constraints.hpp @@ -112,7 +112,8 @@ namespace detail template< typename Actual > bool operator()( Actual& actual, 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_; return true; @@ -120,7 +121,8 @@ namespace detail template< typename Actual > bool operator()( Actual* actual, 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_; return true; @@ -141,7 +143,8 @@ namespace detail template< typename Actual > bool operator()( const Actual& actual, 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; return true; @@ -149,7 +152,8 @@ namespace detail template< typename Actual > bool operator()( Actual& actual, 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; return true; diff --git a/src/libraries/turtle/log.hpp b/src/libraries/turtle/log.hpp index bbe979d..079f37b 100644 --- a/src/libraries/turtle/log.hpp +++ b/src/libraries/turtle/log.hpp @@ -244,7 +244,8 @@ namespace detail template< typename T > BOOST_DEDUCED_TYPENAME boost::enable_if< - boost::function_types::is_callable_builtin< T >, stream& + boost::function_types::is_callable_builtin< T >, + stream& >::type operator<<( stream& s, const T& ) { diff --git a/src/libraries/turtle/mock.hpp b/src/libraries/turtle/mock.hpp index 34f9ee9..467efa7 100644 --- a/src/libraries/turtle/mock.hpp +++ b/src/libraries/turtle/mock.hpp @@ -98,7 +98,7 @@ namespace detail void set_parent( E& e, const std::string& prefix, const std::string& name, const T&, 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 ) { e.tag( prefix + name ); @@ -158,7 +158,7 @@ namespace detail #define MOCK_CALL(z, n, d) \ template< typename E > \ 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 \ >::type \ 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) \ template< typename E > \ 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 \ >::type \ call( E BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM(n, MOCK_CALL_INVALID_TYPE, BOOST_PP_EMPTY) ) \