luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dvb' into dvb_enhancements

This commit is contained in:
Matthias Koefferlein 2019-05-31 23:00:40 +02:00
parent 7d6237a90a 6f263211e2
commit 9c898f536b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/db/db/dbNetlistCrossReference.cc
View File

@ -322,7 +322,7 @@ NetlistCrossReference::gen_end_circuit (const db::Circuit *, const db::Circuit *
std::stable_sort (mp_per_circuit_data->subcircuits.begin (), mp_per_circuit_data->subcircuits.end (), pair_data_compare<SubCircuitPairData, by_name_value_compare<db::SubCircuit> > ());
std::stable_sort (mp_per_circuit_data->nets.begin (), mp_per_circuit_data->nets.end (), pair_data_compare<NetPairData, by_name_value_compare<db::Net> > ());
m_current_circuits = std::pair<const db::Circuit *, const db::Circuit *> (0, 0);
m_current_circuits = std::make_pair((const db::Circuit *)0, (const db::Circuit *)0);
mp_per_circuit_data = 0;
}

2
src/db/db/gsiDeclDbNetlistCrossReference.cc
View File

@ -35,7 +35,7 @@ struct CircuitPairData
typedef db::Circuit object_type;
CircuitPairData (const db::Circuit *a, const db::Circuit *b, db::NetlistCrossReference::Status s) : pair (a, b), status (s) { }
CircuitPairData () : pair (0, 0), status (db::NetlistCrossReference::None) { }
CircuitPairData () : pair ((const db::Circuit *)0, (const db::Circuit *)0), status (db::NetlistCrossReference::None) { }
std::pair<const db::Circuit *, const db::Circuit *> pair;
db::NetlistCrossReference::Status status;

2
src/laybasic/laybasic/layNetlistBrowserModel.cc
View File

@ -135,7 +135,7 @@ NetColorizer::color_of_net (const db::Net *net) const
size_t index = 0;
typename std::map<const db::Net *, size_t>::iterator cc = m_net_index_by_object.find (net);
std::map<const db::Net *, size_t>::iterator cc = m_net_index_by_object.find (net);
if (cc == m_net_index_by_object.end ()) {
size_t i = 0;

2
src/laybasic/laybasic/layNetlistBrowserModel.h
View File

@ -207,7 +207,7 @@ private:
std::pair<const db::Netlist *, const db::Netlist *> netlists () const
{
return std::pair<const db::Netlist *, const db::Netlist *> (mp_l2ndb->netlist (), 0);
return std::pair<const db::Netlist *, const db::Netlist *> (mp_l2ndb->netlist (), (const db::Netlist *)0);
}
QIcon icon_for_nets (const std::pair<const db::Net *, const db::Net *> &net) const;