Skip to content
Snippets Groups Projects
Commit d7d09033 authored by Robert K's avatar Robert K
Browse files

Merge branch 'issue/boolean-operator-or' into 'master'

Use boolean | as binary operator between bools

See merge request !28
parents b4aba2f1 300d4963
No related branches found
No related tags found
1 merge request!28Use boolean | as binary operator between bools
Pipeline #61685 passed
......@@ -45,7 +45,7 @@ namespace Dune
{
return out << ((1 << dimension)-1);
}
template< class char_type, class traits >
friend std::basic_istream< char_type, traits > &
operator>> ( std::basic_istream< char_type, traits > &in, This &policy )
......@@ -431,7 +431,7 @@ namespace Dune
{
bool copy = true;
for( int i = 0; i < dimension; ++i )
copy &= (factor( i ) == 1) | ((id[ i ] & 3) == 0);
copy &= (factor( i ) == 1) || ((id[ i ] & 3) == 0);
return copy;
}
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment