* All tools:
- Change: Correction to suppress all g++ warnings. Except thoses comming from bad Python system includes...
This commit is contained in:
parent
605eeff9e4
commit
a4b9fdd82f
|
@ -648,8 +648,12 @@ void Graph::UpdateConnexComp ( VertexList reachedVertexes, Vertex* firstVertex )
|
||||||
|
|
||||||
//cerr << " gonna erase : " << toErase << endl;
|
//cerr << " gonna erase : " << toErase << endl;
|
||||||
// on veut updater toute la composante connexe représenter par le currentVertex
|
// on veut updater toute la composante connexe représenter par le currentVertex
|
||||||
|
#ifndef NDEBUG
|
||||||
unsigned deleteVertex = _vertexes_to_route.erase ( toErase );
|
unsigned deleteVertex = _vertexes_to_route.erase ( toErase );
|
||||||
assert ( deleteVertex == 1 );
|
assert ( deleteVertex == 1 );
|
||||||
|
#else
|
||||||
|
_vertexes_to_route.erase ( toErase );
|
||||||
|
#endif
|
||||||
// the connexe component corresponding to the vertex must be initialize with the firstConnexID
|
// the connexe component corresponding to the vertex must be initialize with the firstConnexID
|
||||||
initConnexComp ( currentVertex, firstConnexID );
|
initConnexComp ( currentVertex, firstConnexID );
|
||||||
|
|
||||||
|
@ -806,9 +810,11 @@ void Graph::popMaxFromSTuplePQ()
|
||||||
{
|
{
|
||||||
if ( _stuplePriorityQueue.begin() != STuple::_stuplePQEnd ) {
|
if ( _stuplePriorityQueue.begin() != STuple::_stuplePQEnd ) {
|
||||||
STuple* stuple = *(_stuplePriorityQueue.begin());
|
STuple* stuple = *(_stuplePriorityQueue.begin());
|
||||||
|
#ifndef NDEBUG
|
||||||
STuple::CostProperty* costProperty = stuple->getCostProperty();
|
STuple::CostProperty* costProperty = stuple->getCostProperty();
|
||||||
assert ( costProperty );
|
assert ( costProperty );
|
||||||
assert ( (*costProperty->getPQIter()) == stuple );
|
assert ( (*costProperty->getPQIter()) == stuple );
|
||||||
|
#endif
|
||||||
stuple->destroy();
|
stuple->destroy();
|
||||||
_stuplePriorityQueue.erase ( _stuplePriorityQueue.begin());
|
_stuplePriorityQueue.erase ( _stuplePriorityQueue.begin());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue