From f0dd37cb391b6c67d8c507f5760007804deca12a Mon Sep 17 00:00:00 2001 From: mat007 Date: Fri, 18 Mar 2011 21:50:41 +0000 Subject: [PATCH] Fix git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@263 860be788-9bd5-4423-9f1e-828f051e677b --- src/libraries/turtle/log.hpp | 16 +++++++------- .../turtle_test/log_with_conversions_test.cpp | 22 +++++++++---------- .../log_without_conversions_test.cpp | 22 +++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/libraries/turtle/log.hpp b/src/libraries/turtle/log.hpp index 077b562..91d29a7 100644 --- a/src/libraries/turtle/log.hpp +++ b/src/libraries/turtle/log.hpp @@ -232,14 +232,14 @@ namespace detail2 return s << ')'; } - template< typename T > - BOOST_DEDUCED_TYPENAME boost::enable_if< - boost::function_types::is_callable_builtin< T >, stream& - >::type - operator<<( stream& s, const T* ) - { - return s << '?'; - } + //template< typename T > + //BOOST_DEDUCED_TYPENAME boost::enable_if< + // boost::function_types::is_callable_builtin< T >, stream& + //>::type + //operator<<( stream& s, const T& ) + //{ + // return s << '?'; + //} } #endif // #ifndef MOCK_LOG_HPP_INCLUDED diff --git a/src/tests/turtle_test/log_with_conversions_test.cpp b/src/tests/turtle_test/log_with_conversions_test.cpp index 83707e3..9471608 100644 --- a/src/tests/turtle_test/log_with_conversions_test.cpp +++ b/src/tests/turtle_test/log_with_conversions_test.cpp @@ -429,17 +429,17 @@ BOOST_AUTO_TEST_CASE( false_positive_container_serialization_can_still_be_overri BOOST_CHECK_EQUAL( "false_positive_container", to_string( false_positive_container() ) ); } -namespace -{ - void callable_builtin() - {} -} - -BOOST_AUTO_TEST_CASE( callable_builtin_yields_an_interrogation_mark_when_serialized_with_conversions ) -{ - BOOST_CHECK_EQUAL( "?", to_string( callable_builtin ) ); - BOOST_CHECK_EQUAL( "?", to_string( &callable_builtin ) ); -} +//namespace +//{ +// void callable_builtin() +// {} +//} +// +//BOOST_AUTO_TEST_CASE( callable_builtin_yields_an_interrogation_mark_when_serialized_with_conversions ) +//{ +// BOOST_CHECK_EQUAL( "?", to_string( callable_builtin ) ); +// BOOST_CHECK_EQUAL( "?", to_string( &callable_builtin ) ); +//} namespace { diff --git a/src/tests/turtle_test/log_without_conversions_test.cpp b/src/tests/turtle_test/log_without_conversions_test.cpp index 42e664d..f25ebab 100644 --- a/src/tests/turtle_test/log_without_conversions_test.cpp +++ b/src/tests/turtle_test/log_without_conversions_test.cpp @@ -425,17 +425,17 @@ BOOST_AUTO_TEST_CASE( false_positive_container_serialization_can_still_be_overri BOOST_CHECK_EQUAL( "false_positive_container", to_string( false_positive_container() ) ); } -namespace -{ - void callable_builtin() - {} -} - -BOOST_AUTO_TEST_CASE( callable_builtin_yields_an_interrogation_mark_when_serialized_without_conversions ) -{ - BOOST_CHECK_EQUAL( "?", to_string( callable_builtin ) ); - BOOST_CHECK_EQUAL( "?", to_string( &callable_builtin ) ); -} +//namespace +//{ +// void callable_builtin() +// {} +//} +// +//BOOST_AUTO_TEST_CASE( callable_builtin_yields_an_interrogation_mark_when_serialized_without_conversions ) +//{ +// BOOST_CHECK_EQUAL( "?", to_string( callable_builtin ) ); +// BOOST_CHECK_EQUAL( "?", to_string( &callable_builtin ) ); +//} namespace {