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

Fix -Wshadow warning in sch_sheet_path.cpp 

Three instances of variables named "reference" shadow a typedef
within std::vector producing:

warning: declaration of ‘reference’ shadows a previous local [-Wshadow]
 note: shadowed declaration is here
           typedef typename _Alloc_traits::reference  reference;

This patch works around by renaming "reference" to "schReference".
This commit is contained in:
John Beard 2018-06-28 14:36:14 +01:00 committed by Wayne Stambaugh
parent 06ff56325c
commit 8181646794
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eeschema/sch_sheet_path.cpp
View File

@ -199,10 +199,10 @@ void SCH_SHEET_PATH::GetComponents( SCH_REFERENCE_LIST& aReferences, bool aInclu
if( part || aForceIncludeOrphanComponents ) if( part || aForceIncludeOrphanComponents )
{ {
SCH_REFERENCE reference( component, part, *this ); SCH_REFERENCE schReference( component, part, *this );
reference.SetSheetNumber( m_pageNumber ); schReference.SetSheetNumber( m_pageNumber );
aReferences.AddItem( reference ); aReferences.AddItem( schReference );
} }
} }
} }
@ -229,15 +229,15 @@ void SCH_SHEET_PATH::GetMultiUnitComponents( SCH_MULTI_UNIT_REFERENCE_MAP& aRefL
if( part && part->GetUnitCount() > 1 ) if( part && part->GetUnitCount() > 1 )
{ {
SCH_REFERENCE reference = SCH_REFERENCE( component, part, *this ); SCH_REFERENCE schReference = SCH_REFERENCE( component, part, *this );
reference.SetSheetNumber( m_pageNumber ); schReference.SetSheetNumber( m_pageNumber );
wxString reference_str = reference.GetRef(); wxString reference_str = schReference.GetRef();
// Never lock unassigned references // Never lock unassigned references
if( reference_str[reference_str.Len() - 1] == '?' ) if( reference_str[reference_str.Len() - 1] == '?' )
continue; continue;
aRefList[reference_str].AddItem( reference ); aRefList[reference_str].AddItem( schReference );
} }
} }
} }
@ -536,8 +536,8 @@ void SCH_SHEET_LIST::AnnotatePowerSymbols()
if( part ) if( part )
{ {
SCH_REFERENCE reference( component, part, spath ); SCH_REFERENCE schReference( component, part, spath );
references.AddItem( reference ); references.AddItem( schReference );
} }
} }
} }