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

Removed is_comparable which is sometimes ambiguous

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@250 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2011-02-21 18:23:31 +00:00
parent cf221b928f
commit 39ccffb881
4 changed files with 4 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libraries/turtle/check.hpp
View file

@ -10,7 +10,6 @@
#define MOCK_CHECK_HPP_INCLUDED
#include "is_functor.hpp"
#include "is_comparable.hpp"
#include "constraints.hpp"
#include "operators.hpp"
#include "format.hpp"
@ -122,12 +121,7 @@ namespace detail
template< typename Actual, typename Functor >
class check< Actual, Functor,
BOOST_DEDUCED_TYPENAME boost::enable_if<
boost::mpl::or_<
detail::is_functor< Functor >,
boost::mpl::not_<
detail::is_comparable< Actual, Functor >
>
>
detail::is_functor< Functor >
>::type
> : public check_base< Actual >
{

6
src/tests/turtle_test/integration_test.cpp
View file

@ -335,7 +335,7 @@ namespace
struct custom_argument
{
friend std::ostream& operator<<( std::ostream& s, const custom_argument& )
friend std::ostream& operator<<( std::ostream& s, custom_argument )
{
serialized = true;
return s;
@ -344,11 +344,11 @@ namespace
struct custom_constraint
{
template< typename Actual >
bool operator()( Actual ) const
friend bool operator==( Actual, custom_constraint )
{
return true;
}
friend std::ostream& operator<<( std::ostream& s, const custom_constraint& )
friend std::ostream& operator<<( std::ostream& s, custom_constraint )
{
serialized = true;
return s;