From 814e54af9bdaec212edaa182a54c7a0f45dab241 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 10 May 2024 18:54:32 +0200 Subject: [PATCH] Fix minor compil warnings --- 3d-viewer/3d_cache/sg/ifsg_api.cpp | 2 +- eeschema/sch_io/cadstar/sch_io_cadstar_archive.cpp | 8 ++++---- eeschema/sim/sim_model_raw_spice.cpp | 2 +- pcbnew/dialogs/panel_fp_lib_table.cpp | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/3d-viewer/3d_cache/sg/ifsg_api.cpp b/3d-viewer/3d_cache/sg/ifsg_api.cpp index 9c343cf9a3..b940c8cbac 100644 --- a/3d-viewer/3d_cache/sg/ifsg_api.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_api.cpp @@ -476,7 +476,7 @@ SGVECTOR S3D::CalcTriNorm( const SGPOINT& p1, const SGPOINT& p2, const SGPOINT& // normal tri = glm::cross( pts[1] - pts[0], pts[2] - pts[0] ); - glm::normalize( tri ); + (void)glm::normalize( tri ); return SGVECTOR( tri.x, tri.y, tri.z ); } diff --git a/eeschema/sch_io/cadstar/sch_io_cadstar_archive.cpp b/eeschema/sch_io/cadstar/sch_io_cadstar_archive.cpp index d880943aee..2501ae300e 100644 --- a/eeschema/sch_io/cadstar/sch_io_cadstar_archive.cpp +++ b/eeschema/sch_io/cadstar/sch_io_cadstar_archive.cpp @@ -98,8 +98,8 @@ SCH_SHEET* SCH_IO_CADSTAR_ARCHIVE::LoadSchematicFile( const wxString& aFi wxCHECK_MSG( libTable, nullptr, "Could not load symbol lib table." ); - wxFileName fn = aSchematic->Prj().GetProjectFullName(); - wxString libName = CADSTAR_SCH_ARCHIVE_LOADER::CreateLibName( fn, nullptr ); + wxFileName prj_fn = aSchematic->Prj().GetProjectFullName(); + wxString libName = CADSTAR_SCH_ARCHIVE_LOADER::CreateLibName( prj_fn, nullptr ); wxFileName libFileName( aSchematic->Prj().GetProjectPath(), libName, FILEEXT::KiCadSymbolLibFileExtension ); @@ -117,12 +117,12 @@ SCH_SHEET* SCH_IO_CADSTAR_ARCHIVE::LoadSchematicFile( const wxString& aFi new SYMBOL_LIB_TABLE_ROW( libName, libTableUri, wxString( "KiCad" ) ) ); // Save project symbol library table. - wxFileName fn( aSchematic->Prj().GetProjectPath(), + wxFileName libtab_fn( aSchematic->Prj().GetProjectPath(), SYMBOL_LIB_TABLE::GetSymbolLibTableFileName() ); // So output formatter goes out of scope and closes the file before reloading. { - FILE_OUTPUTFORMATTER formatter( fn.GetFullPath() ); + FILE_OUTPUTFORMATTER formatter( libtab_fn.GetFullPath() ); libTable->Format( &formatter, 0 ); } diff --git a/eeschema/sim/sim_model_raw_spice.cpp b/eeschema/sim/sim_model_raw_spice.cpp index 76e4f17d79..c504f12315 100644 --- a/eeschema/sim/sim_model_raw_spice.cpp +++ b/eeschema/sim/sim_model_raw_spice.cpp @@ -147,7 +147,7 @@ void SIM_MODEL_RAW_SPICE::AssignSymbolPinNumberToModelPin( const std::string& aM if( pinIndex > 0 ) { - while( m_modelPins.size() < pinIndex ) + while( (int)m_modelPins.size() < pinIndex ) m_modelPins.push_back( { fmt::format( "{}", m_modelPins.size() + 1 ), wxEmptyString } ); m_modelPins[ --pinIndex /* convert to 0-based */ ].symbolPinNumber = aSymbolPinNumber; diff --git a/pcbnew/dialogs/panel_fp_lib_table.cpp b/pcbnew/dialogs/panel_fp_lib_table.cpp index 4c49e89399..b3cfea67f2 100644 --- a/pcbnew/dialogs/panel_fp_lib_table.cpp +++ b/pcbnew/dialogs/panel_fp_lib_table.cpp @@ -304,12 +304,12 @@ void PANEL_FP_LIB_TABLE::setupGrid( WX_GRID* aGrid ) { PCBNEW_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings(); - auto autoSizeCol = [&]( WX_GRID* aGrid, int aCol ) + auto autoSizeCol = [&]( WX_GRID* aLocGrid, int aCol ) { - int prevWidth = aGrid->GetColSize( aCol ); + int prevWidth = aLocGrid->GetColSize( aCol ); - aGrid->AutoSizeColumn( aCol, false ); - aGrid->SetColSize( aCol, std::max( prevWidth, aGrid->GetColSize( aCol ) ) ); + aLocGrid->AutoSizeColumn( aCol, false ); + aLocGrid->SetColSize( aCol, std::max( prevWidth, aLocGrid->GetColSize( aCol ) ) ); }; // Give a bit more room for wxChoice editors