git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@130 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2010-02-21 21:04:43 +00:00
parent f02dd801b5
commit d327700205

View file

@ -34,10 +34,10 @@ namespace detail
: c1_( c1 ) : c1_( c1 )
, c2_( c2 ) , c2_( c2 )
{} {}
template< typename Y > template< typename Actual >
bool operator()( const Y& y ) const bool operator()( const Actual& actual ) const
{ {
return c1_( y ) && c2_( y ); return c1_( actual ) && c2_( actual );
} }
private: private:
Constraint1 c1_; Constraint1 c1_;
@ -52,10 +52,10 @@ namespace detail
: c1_( c1 ) : c1_( c1 )
, c2_( c2 ) , c2_( c2 )
{} {}
template< typename Y > template< typename Actual >
bool operator()( const Y& y ) const bool operator()( const Actual& actual ) const
{ {
return c1_( y ) || c2_( y ); return c1_( actual ) || c2_( actual );
} }
private: private:
Constraint1 c1_; Constraint1 c1_;
@ -69,10 +69,10 @@ namespace detail
explicit not_( const Constraint& c ) explicit not_( const Constraint& c )
: c_( c ) : c_( c )
{} {}
template< typename Y > template< typename Actual >
bool operator()( const Y& y ) const bool operator()( const Actual& actual ) const
{ {
return ! c_( y ); return ! c_( actual );
} }
private: private:
Constraint c_; Constraint c_;