From 28cd2a203e44897b82def98c8cbcab219f62bc2d Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Thu, 16 May 2024 15:50:57 +0100 Subject: [PATCH] Fix compiler version issues. --- pcbnew/pcbnew_jobs_handler.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pcbnew/pcbnew_jobs_handler.cpp b/pcbnew/pcbnew_jobs_handler.cpp index 73fc6d3413..71b10543a4 100644 --- a/pcbnew/pcbnew_jobs_handler.cpp +++ b/pcbnew/pcbnew_jobs_handler.cpp @@ -300,13 +300,13 @@ int PCBNEW_JOBS_HANDLER::JobExportDxf( JOB* aJob ) layerName = brd->GetLayerName( layer ); } - if( aJob->GetVarOverrides().contains( wxT( "LAYER" ) ) ) + if( aJob->GetVarOverrides().count( wxT( "LAYER" ) ) > 0 ) layerName = aJob->GetVarOverrides().at( wxT( "LAYER" ) ); - if( aJob->GetVarOverrides().contains( wxT( "SHEETNAME" ) ) ) + if( aJob->GetVarOverrides().count( wxT( "SHEETNAME" ) ) > 0 ) sheetName = aJob->GetVarOverrides().at( wxT( "SHEETNAME" ) ); - if( aJob->GetVarOverrides().contains( wxT( "SHEETPATH" ) ) ) + if( aJob->GetVarOverrides().count( wxT( "SHEETPATH" ) ) > 0 ) sheetPath = aJob->GetVarOverrides().at( wxT( "SHEETPATH" ) ); DXF_PLOTTER* plotter = (DXF_PLOTTER*) StartPlotBoard( brd, &plotOpts, layer, layerName, @@ -390,13 +390,13 @@ int PCBNEW_JOBS_HANDLER::JobExportPdf( JOB* aJob ) layerName = brd->GetLayerName( layer ); } - if( aPdfJob->GetVarOverrides().contains( wxT( "LAYER" ) ) ) + if( aPdfJob->GetVarOverrides().count( wxT( "LAYER" ) ) > 0 ) layerName = aPdfJob->GetVarOverrides().at( wxT( "LAYER" ) ); - if( aPdfJob->GetVarOverrides().contains( wxT( "SHEETNAME" ) ) ) + if( aPdfJob->GetVarOverrides().count( wxT( "SHEETNAME" ) ) > 0 ) sheetName = aPdfJob->GetVarOverrides().at( wxT( "SHEETNAME" ) ); - if( aPdfJob->GetVarOverrides().contains( wxT( "SHEETPATH" ) ) ) + if( aPdfJob->GetVarOverrides().count( wxT( "SHEETPATH" ) ) > 0 ) sheetPath = aPdfJob->GetVarOverrides().at( wxT( "SHEETPATH" ) ); PDF_PLOTTER* plotter = (PDF_PLOTTER*) StartPlotBoard( brd, &plotOpts, layer, layerName, @@ -498,13 +498,13 @@ int PCBNEW_JOBS_HANDLER::JobExportGerbers( JOB* aJob ) jobfile_writer.AddGbrFile( layer, fullname ); - if( aJob->GetVarOverrides().contains( wxT( "LAYER" ) ) ) + if( aJob->GetVarOverrides().count( wxT( "LAYER" ) ) > 0 ) layerName = aJob->GetVarOverrides().at( wxT( "LAYER" ) ); - if( aJob->GetVarOverrides().contains( wxT( "SHEETNAME" ) ) ) + if( aJob->GetVarOverrides().count( wxT( "SHEETNAME" ) ) > 0 ) sheetName = aJob->GetVarOverrides().at( wxT( "SHEETNAME" ) ); - if( aJob->GetVarOverrides().contains( wxT( "SHEETPATH" ) ) ) + if( aJob->GetVarOverrides().count( wxT( "SHEETPATH" ) ) > 0 ) sheetPath = aJob->GetVarOverrides().at( wxT( "SHEETPATH" ) ); // We are feeding it one layer at the start here to silence a logic check @@ -602,13 +602,13 @@ int PCBNEW_JOBS_HANDLER::JobExportGerber( JOB* aJob ) layerName = brd->GetLayerName( layer ); } - if( aJob->GetVarOverrides().contains( wxT( "LAYER" ) ) ) + if( aJob->GetVarOverrides().count( wxT( "LAYER" ) ) > 0 ) layerName = aJob->GetVarOverrides().at( wxT( "LAYER" ) ); - if( aJob->GetVarOverrides().contains( wxT( "SHEETNAME" ) ) ) + if( aJob->GetVarOverrides().count( wxT( "SHEETNAME" ) ) > 0 ) sheetName = aJob->GetVarOverrides().at( wxT( "SHEETNAME" ) ); - if( aJob->GetVarOverrides().contains( wxT( "SHEETPATH" ) ) ) + if( aJob->GetVarOverrides().count( wxT( "SHEETPATH" ) ) > 0 ) sheetPath = aJob->GetVarOverrides().at( wxT( "SHEETPATH" ) ); // We are feeding it one layer at the start here to silence a logic check