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

Fix a compile error in Linux 

Operands to the ternary operator cannot have different types under g++
(linux)
This commit is contained in:
Seth Hillbrand 2019-05-24 12:12:10 -07:00
parent 32f25cf8b4
commit f0352176ec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/page_layout/worksheet_dataitem.cpp
View File

@ -92,7 +92,7 @@ void WORKSHEET_DATAITEM::SyncDrawItems( WS_DRAW_ITEM_LIST* aCollector, KIGFX::VI
std::map<int, STATUS_FLAGS> itemFlags; std::map<int, STATUS_FLAGS> itemFlags;
WS_DRAW_ITEM_BASE* item = nullptr; WS_DRAW_ITEM_BASE* item = nullptr;
for( int ii = 0; ii < m_drawItems.size(); ++ii ) for( size_t ii = 0; ii < m_drawItems.size(); ++ii )
{ {
item = m_drawItems[ ii ]; item = m_drawItems[ ii ];
itemFlags[ ii ] = item->GetFlags(); itemFlags[ ii ] = item->GetFlags();
@ -404,7 +404,7 @@ void WORKSHEET_DATAITEM_POLYPOLYGON::SyncDrawItems( WS_DRAW_ITEM_LIST* aCollecto
std::map<int, STATUS_FLAGS> itemFlags; std::map<int, STATUS_FLAGS> itemFlags;
WS_DRAW_ITEM_BASE* item = nullptr; WS_DRAW_ITEM_BASE* item = nullptr;
for( int ii = 0; ii < m_drawItems.size(); ++ii ) for( size_t ii = 0; ii < m_drawItems.size(); ++ii )
{ {
item = m_drawItems[ ii ]; item = m_drawItems[ ii ];
itemFlags[ ii ] = item->GetFlags(); itemFlags[ ii ] = item->GetFlags();
@ -546,7 +546,7 @@ void WORKSHEET_DATAITEM_TEXT::SyncDrawItems( WS_DRAW_ITEM_LIST* aCollector, KIGF
m_FullText = m_TextBase; m_FullText = m_TextBase;
else else
{ {
m_FullText = aCollector ? aCollector->BuildFullText( m_TextBase ) : wxEmptyString; m_FullText = aCollector ? aCollector->BuildFullText( m_TextBase ) : wxString();
multilines = ReplaceAntiSlashSequence(); multilines = ReplaceAntiSlashSequence();
} }
@ -565,7 +565,7 @@ void WORKSHEET_DATAITEM_TEXT::SyncDrawItems( WS_DRAW_ITEM_LIST* aCollector, KIGF
std::map<int, STATUS_FLAGS> itemFlags; std::map<int, STATUS_FLAGS> itemFlags;
WS_DRAW_ITEM_TEXT* text = nullptr; WS_DRAW_ITEM_TEXT* text = nullptr;
for( int ii = 0; ii < m_drawItems.size(); ++ii ) for( size_t ii = 0; ii < m_drawItems.size(); ++ii )
{ {
text = (WS_DRAW_ITEM_TEXT*) m_drawItems[ ii ]; text = (WS_DRAW_ITEM_TEXT*) m_drawItems[ ii ];
itemFlags[ ii ] = text->GetFlags(); itemFlags[ ii ] = text->GetFlags();
@ -710,7 +710,7 @@ void WORKSHEET_DATAITEM_BITMAP::SyncDrawItems( WS_DRAW_ITEM_LIST* aCollector, KI
std::map<int, STATUS_FLAGS> itemFlags; std::map<int, STATUS_FLAGS> itemFlags;
WS_DRAW_ITEM_BASE* item = nullptr; WS_DRAW_ITEM_BASE* item = nullptr;
for( int ii = 0; ii < m_drawItems.size(); ++ii ) for( size_t ii = 0; ii < m_drawItems.size(); ++ii )
{ {
item = m_drawItems[ ii ]; item = m_drawItems[ ii ];
itemFlags[ ii ] = item->GetFlags(); itemFlags[ ii ] = item->GetFlags();