Commit 91f4135e authored by Christoph Schwarzmeier's avatar Christoph Schwarzmeier
Browse files

Merge branch 'Fix_errors_boost-type-traits' into 'master'

Fix errors introduced with replacing boost::type_traits

See merge request walberla/walberla!190
parents 9bc30e26 3b7eff3a
......@@ -160,7 +160,7 @@ void AdvectionDiffusionSweep< LM_AdvDiff, VelocityAdapter_T, FlagField_T, Vector
LM_AdvDiff::CollisionModel::constant &&
LM_AdvDiff::compressible &&
std::is_same< typename LM_AdvDiff::ForceModel::tag, force_model::None_tag >::value &&
! ( std::is_same< typename LM_AdvDiff::Stencil, stencil::D3Q19 >::value && LM_AdvDiff::equilibriumAccuracyOrder > == 1 )
! ( std::is_same< typename LM_AdvDiff::Stencil, stencil::D3Q19 >::value && LM_AdvDiff::equilibriumAccuracyOrder == 1 )
>::type
> ::stream( IBlock * const block, const uint_t numberOfGhostLayersToInclude )
{
......@@ -282,7 +282,7 @@ void AdvectionDiffusionSweep< LM_AdvDiff, VelocityAdapter_T, FlagField_T, Vector
! LM_AdvDiff::CollisionModel::constant &&
LM_AdvDiff::compressible &&
std::is_same< typename LM_AdvDiff::ForceModel::tag, force_model::None_tag >::value &&
!( std::is_same< typename LM_AdvDiff::Stencil, stencil::D3Q19 > && LM_AdvDiff::equilibriumAccuracyOrder == 1 )
!( std::is_same< typename LM_AdvDiff::Stencil, stencil::D3Q19 >::value && LM_AdvDiff::equilibriumAccuracyOrder == 1 )
>::type
> ::operator() ( IBlock * block )
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment