diff --git a/cvpcb/footprints_listbox.cpp b/cvpcb/footprints_listbox.cpp index 03e876f941..a30df9aaed 100644 --- a/cvpcb/footprints_listbox.cpp +++ b/cvpcb/footprints_listbox.cpp @@ -125,7 +125,7 @@ void FOOTPRINTS_LISTBOX::SetSelectedFootprint( const LIB_ID& aFPID ) GetChars( aFPID.GetLibNickname() ), GetChars( aFPID.GetLibItemName() ) ); - for( size_t i = 0; i < GetCount(); ++i ) + for( int i = 0; i < GetCount(); ++i ) { wxString candidate = m_footprintList.Item( i ).substr( 4 ); diff --git a/eeschema/component_references_lister.cpp b/eeschema/component_references_lister.cpp index 4aa4e8d276..613da3f3bc 100644 --- a/eeschema/component_references_lister.cpp +++ b/eeschema/component_references_lister.cpp @@ -835,7 +835,7 @@ wxString SCH_REFERENCE_LIST::Shorthand( std::vector aList ) while( i + range < aList.size() && aList[ i + range ].GetRef() == ref - && aList[ i + range ].m_NumRef == numRef + range ) + && aList[ i + range ].m_NumRef == int( numRef + range ) ) { range++; } diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp index b0bec2b27b..4db7279e57 100644 --- a/eeschema/dialogs/dialog_spice_model.cpp +++ b/eeschema/dialogs/dialog_spice_model.cpp @@ -80,7 +80,7 @@ static int getModelTypeIdx( char aPrimitive ) { const char prim = std::toupper( aPrimitive ); - for( int i = 0; i < modelTypes.size(); ++i ) + for( size_t i = 0; i < modelTypes.size(); ++i ) { if( modelTypes[i].type == prim ) return i; @@ -174,9 +174,8 @@ bool DIALOG_SPICE_MODEL::TransferDataFromWindow() return false; int modelIdx = m_modelType->GetSelection(); - wxASSERT( modelIdx < modelTypes.size() ); - if( modelIdx > 0 && modelIdx < modelTypes.size() ) + if( modelIdx > 0 && modelIdx < (int)modelTypes.size() ) m_fieldsTmp[SF_PRIMITIVE] = static_cast( modelTypes[modelIdx].type ); m_fieldsTmp[SF_MODEL] = m_modelName->GetValue(); @@ -185,7 +184,6 @@ bool DIALOG_SPICE_MODEL::TransferDataFromWindow() m_fieldsTmp[SF_LIB_FILE] = m_modelLibrary->GetValue(); } - // Power source else if( page == m_power ) {