Commit ad557994 authored by f3nix's avatar f3nix

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

parent 7559e134
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
using namespace std; using namespace std;
#include <algorithm> // sort
#include <vector> #include <vector>
#include "common.h" #include "common.h"
......
...@@ -130,11 +130,13 @@ void WinEDA_DrillFrame::InitDisplayParams( void ) ...@@ -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++;
}
} }
} }
......
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