Fix compilation errors/warnings when using g++ 4.3 (snapshot).

This commit is contained in:
f3nix 2008-02-22 20:38:49 +00:00
parent 7559e1347c
commit ad55799485
2 changed files with 3 additions and 0 deletions

View File

@ -6,6 +6,7 @@
using namespace std; using namespace std;
#include <algorithm> // sort
#include <vector> #include <vector>
#include "common.h" #include "common.h"

View File

@ -130,11 +130,13 @@ void WinEDA_DrillFrame::InitDisplayParams( void )
for( D_PAD* pad = module->m_Pads; pad != NULL; pad = pad->Next() ) for( D_PAD* pad = module->m_Pads; pad != NULL; pad = pad->Next() )
{ {
if( pad->m_DrillShape == PAD_CIRCLE ) if( pad->m_DrillShape == PAD_CIRCLE )
{
if( pad->m_Drill.x != 0 ) if( pad->m_Drill.x != 0 )
m_PadsHoleCount++; m_PadsHoleCount++;
else else
if( MIN( pad->m_Drill.x, pad->m_Drill.y ) != 0 ) if( MIN( pad->m_Drill.x, pad->m_Drill.y ) != 0 )
m_PadsHoleCount++; m_PadsHoleCount++;
}
} }
} }