haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Proper OPT_OBSTACLE casting.

This commit is contained in:
Jan Dubiec 2015-07-22 10:46:45 +02:00 committed by Maciej Suminski
parent ba32ccbbb2
commit 7f1f436a4e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcbnew/router/pns_diff_pair_placer.cpp
View File

@ -117,8 +117,8 @@ bool PNS_DIFF_PAIR_PLACER::rhMarkObstacles( const VECTOR2I& aP )
if( !routeHead( aP ) ) if( !routeHead( aP ) )
return false; return false;
bool collP = m_currentNode->CheckColliding( &m_currentTrace.PLine() ); bool collP = static_cast<bool>( m_currentNode->CheckColliding( &m_currentTrace.PLine() ) );
bool collN = m_currentNode->CheckColliding( &m_currentTrace.NLine() ); bool collN = static_cast<bool>( m_currentNode->CheckColliding( &m_currentTrace.NLine() ) );
m_fitOk = !( collP || collN ) ; m_fitOk = !( collP || collN ) ;
return m_fitOk; return m_fitOk;

2
pcbnew/router/pns_line_placer.cpp
View File

@ -421,7 +421,7 @@ bool PNS_LINE_PLACER::rhMarkObstacles( const VECTOR2I& aP, PNS_LINE& aNewHead )
{ {
buildInitialLine( aP, m_head ); buildInitialLine( aP, m_head );
aNewHead = m_head; aNewHead = m_head;
return m_currentNode->CheckColliding( &m_head ); return static_cast<bool>( m_currentNode->CheckColliding( &m_head ) );
} }

4
pcbnew/router/pns_optimizer.cpp
View File

@ -383,7 +383,7 @@ bool PNS_OPTIMIZER::checkColliding( PNS_ITEM* aItem, bool aUpdateCache )
{ {
CACHE_VISITOR v( aItem, m_world, m_collisionKindMask ); CACHE_VISITOR v( aItem, m_world, m_collisionKindMask );
return m_world->CheckColliding( aItem ); return static_cast<bool>( m_world->CheckColliding( aItem ) );
// something is wrong with the cache, need to investigate. // something is wrong with the cache, need to investigate.
m_cache.Query( aItem->Shape(), m_world->GetMaxClearance(), v, false ); m_cache.Query( aItem->Shape(), m_world->GetMaxClearance(), v, false );
@ -1103,7 +1103,7 @@ bool checkDpColliding( PNS_NODE* aNode, PNS_DIFF_PAIR* aPair, bool aIsP, const S
{ {
PNS_LINE tmp ( aIsP ? aPair->PLine() : aPair->NLine(), aPath ); PNS_LINE tmp ( aIsP ? aPair->PLine() : aPair->NLine(), aPath );
return aNode->CheckColliding( &tmp ); return static_cast<bool>( aNode->CheckColliding( &tmp ) );
} }

2
pcbnew/router/pns_walkaround.cpp
View File

@ -89,7 +89,7 @@ PNS_WALKAROUND::WALKAROUND_STATUS PNS_WALKAROUND::singleStep( PNS_LINE& aPath,
PNS_LINE walk_path( aPath, path_walk[1] ); PNS_LINE walk_path( aPath, path_walk[1] );
bool alt_collides = m_world->CheckColliding( &walk_path, m_itemMask ); bool alt_collides = static_cast<bool>( m_world->CheckColliding( &walk_path, m_itemMask ) );
SHAPE_LINE_CHAIN pnew; SHAPE_LINE_CHAIN pnew;