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

Remove std:: aliasing

This commit is contained in:
Seth Hillbrand 2019-04-09 21:16:05 -07:00
parent 9ef442b3a3
commit a0981d06a7
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
eeschema/connection_graph.cpp
View File

@ -22,6 +22,7 @@
#include <thread> #include <thread>
#include <algorithm> #include <algorithm>
#include <future> #include <future>
#include <vector>
#include <unordered_map> #include <unordered_map>
#include <profile.h> #include <profile.h>
@ -39,21 +40,15 @@
#include <connection_graph.h> #include <connection_graph.h>
using std::map;
using std::unordered_map;
using std::unordered_set;
using std::vector;
bool CONNECTION_SUBGRAPH::ResolveDrivers( bool aCreateMarkers ) bool CONNECTION_SUBGRAPH::ResolveDrivers( bool aCreateMarkers )
{ {
int highest_priority = -1; int highest_priority = -1;
vector<SCH_ITEM*> candidates; std::vector<SCH_ITEM*> candidates;
std::vector<SCH_ITEM*> strong_drivers;
m_driver = nullptr; m_driver = nullptr;
vector<SCH_ITEM*> strong_drivers;
// Hierarchical labels are lower priority than local labels here, // Hierarchical labels are lower priority than local labels here,
// because on the first pass we want local labels to drive subgraphs // because on the first pass we want local labels to drive subgraphs
// so that we can identify same-sheet neighbors and link them together. // so that we can identify same-sheet neighbors and link them together.
@ -230,7 +225,7 @@ wxString CONNECTION_SUBGRAPH::GetNetName()
std::vector<SCH_ITEM*> CONNECTION_SUBGRAPH::GetBusLabels() std::vector<SCH_ITEM*> CONNECTION_SUBGRAPH::GetBusLabels()
{ {
vector<SCH_ITEM*> labels; std::vector<SCH_ITEM*> labels;
for( auto item : m_drivers ) for( auto item : m_drivers )
{ {
@ -347,13 +342,13 @@ void CONNECTION_GRAPH::Recalculate( SCH_SHEET_LIST aSheetList, bool aUncondition
void CONNECTION_GRAPH::updateItemConnectivity( SCH_SHEET_PATH aSheet, void CONNECTION_GRAPH::updateItemConnectivity( SCH_SHEET_PATH aSheet,
vector<SCH_ITEM*> aItemList ) std::vector<SCH_ITEM*> aItemList )
{ {
unordered_map< wxPoint, vector<SCH_ITEM*> > connection_map; std::unordered_map< wxPoint, std::vector<SCH_ITEM*> > connection_map;
for( auto item : aItemList ) for( auto item : aItemList )
{ {
vector< wxPoint > points; std::vector< wxPoint > points;
item->GetConnectionPoints( points ); item->GetConnectionPoints( points );
item->ConnectedItems().clear(); item->ConnectedItems().clear();