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

Eeschema: fix a name collision with a Windows header. 

the member ERROR of the class PIN_ERROR was colliding: changed to PP_ERROR
This commit is contained in:
jean-pierre charras 2020-07-04 17:51:00 +02:00
parent f3f17401dc
commit 9e669db5b4
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/dialogs/panel_setup_pinmap.cpp
View File

@ -197,7 +197,7 @@ void PANEL_SETUP_PINMAP::setDRCMatrixButtonState( wxBitmapButton *aButton, PIN_E
tooltip = _( "Generate warning" ); tooltip = _( "Generate warning" );
break; break;
case PIN_ERROR::ERROR: case PIN_ERROR::PP_ERROR:
bitmap_butt = ercerr_xpm; bitmap_butt = ercerr_xpm;
tooltip = _( "Generate error" ); tooltip = _( "Generate error" );
break; break;

2
eeschema/erc.cpp
View File

@ -377,7 +377,7 @@ void ERC_TESTER::diagnose( NETLIST_OBJECT* aNetItemRef, NETLIST_OBJECT* aNetItem
if( settings.GetSeverity( ERCE_PIN_TO_PIN_WARNING ) != RPT_SEVERITY_IGNORE ) if( settings.GetSeverity( ERCE_PIN_TO_PIN_WARNING ) != RPT_SEVERITY_IGNORE )
{ {
ERC_ITEM* ercItem = ERC_ITEM::Create( ERC_ITEM* ercItem = ERC_ITEM::Create(
aDiag == PIN_ERROR::ERROR ? ERCE_PIN_TO_PIN_ERROR : ERCE_PIN_TO_PIN_WARNING ); aDiag == PIN_ERROR::PP_ERROR ? ERCE_PIN_TO_PIN_ERROR : ERCE_PIN_TO_PIN_WARNING );
ercItem->SetItems( pin, static_cast<SCH_PIN*>( aNetItemTst->m_Comp ) ); ercItem->SetItems( pin, static_cast<SCH_PIN*>( aNetItemTst->m_Comp ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, aNetItemRef->m_Start ); SCH_MARKER* marker = new SCH_MARKER( ercItem, aNetItemRef->m_Start );

2
eeschema/erc_settings.cpp
View File

@ -31,7 +31,7 @@ const int ercSettingsSchemaVersion = 0;
#define OK PIN_ERROR::OK #define OK PIN_ERROR::OK
#define ERR PIN_ERROR::ERROR #define ERR PIN_ERROR::PP_ERROR
#define WAR PIN_ERROR::WARNING #define WAR PIN_ERROR::WARNING
/** /**

2
eeschema/erc_settings.h
View File

@ -67,7 +67,7 @@ enum class PIN_ERROR
{ {
OK, OK,
WARNING, WARNING,
ERROR, PP_ERROR,
UNCONNECTED UNCONNECTED
}; };