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

Merge branch 'master' into lefdef-enhancments

This commit is contained in:
Matthias Koefferlein 2020-08-02 14:27:00 +02:00
parent 4e51664639 79d3676257
commit 471fefe79d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/laybasic/laybasic/layIndexedNetlistModel.cc
View File

@ -356,7 +356,7 @@ IndexedNetlistModel::net_subcircuit_pin_pair
SingleIndexedNetlistModel::subcircuit_pinref_from_index (const subcircuit_pair &subcircuits, size_t index) const
{
if (! subcircuits.first) {
return IndexedNetlistModel::net_subcircuit_pin_pair (0, 0);
return IndexedNetlistModel::net_subcircuit_pin_pair ((const db::NetSubcircuitPinRef *) 0, (const db::NetSubcircuitPinRef *) 0);
}
std::map<subcircuit_pair, std::vector<net_subcircuit_pin_pair> >::iterator i = m_subcircuit_pins_by_index.find (subcircuits);
@ -372,12 +372,12 @@ SingleIndexedNetlistModel::subcircuit_pinref_from_index (const subcircuit_pair &
m_synthetic_pinrefs.push_back (db::NetSubcircuitPinRef (const_cast<db::SubCircuit *> (subcircuits.first), p->id ()));
ref = & m_synthetic_pinrefs.back ();
}
refs.push_back (net_subcircuit_pin_pair (ref, 0));
refs.push_back (net_subcircuit_pin_pair (ref, (const db::NetSubcircuitPinRef *) 0));
}
}
return index < i->second.size () ? i->second [index] : IndexedNetlistModel::net_subcircuit_pin_pair (0, 0);
return index < i->second.size () ? i->second [index] : IndexedNetlistModel::net_subcircuit_pin_pair ((const db::NetSubcircuitPinRef *) 0, (const db::NetSubcircuitPinRef *) 0);
}
IndexedNetlistModel::net_terminal_pair

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

@ -2956,7 +2956,7 @@ NetlistBrowserModel::circuit_from_index (const QModelIndex &index, bool include_
{
NetlistModelItemData *d = (NetlistModelItemData *) (index.internalPointer ());
if (! d) {
return std::pair<const db::Circuit *, const db::Circuit *> (0, 0);
return std::pair<const db::Circuit *, const db::Circuit *> ((const db::Circuit *) 0, (const db::Circuit *) 0);
} else {
return include_parents ? d->circuits () : d->circuits_of_this ();
}
@ -2967,7 +2967,7 @@ NetlistBrowserModel::net_from_index (const QModelIndex &index, bool include_pare
{
NetlistModelItemData *d = (NetlistModelItemData *) (index.internalPointer ());
if (! d) {
return std::pair<const db::Net *, const db::Net *> (0, 0);
return std::pair<const db::Net *, const db::Net *> ((const db::Net *) 0, (const db::Net *) 0);
} else {
return include_parents ? d->nets () : d->nets_of_this ();
}
@ -2978,7 +2978,7 @@ NetlistBrowserModel::device_from_index (const QModelIndex &index, bool include_p
{
NetlistModelItemData *d = (NetlistModelItemData *) (index.internalPointer ());
if (! d) {
return std::pair<const db::Device *, const db::Device *> (0, 0);
return std::pair<const db::Device *, const db::Device *> ((const db::Device *) 0, (const db::Device *) 0);
} else {
return include_parents ? d->devices () : d->devices_of_this ();
}
@ -2989,7 +2989,7 @@ NetlistBrowserModel::subcircuit_from_index (const QModelIndex &index, bool inclu
{
NetlistModelItemData *d = (NetlistModelItemData *) (index.internalPointer ());
if (! d) {
return std::pair<const db::SubCircuit *, const db::SubCircuit *> (0, 0);
return std::pair<const db::SubCircuit *, const db::SubCircuit *> ((const db::SubCircuit *) 0, (const db::SubCircuit *) 0);
} else {
return include_parents ? d->subcircuits () : d->subcircuits_of_this ();
}

4
src/laybasic/laybasic/layNetlistCrossReferenceModel.cc
View File

@ -408,7 +408,7 @@ void NetlistCrossReferenceModel::ensure_subcircuit_data_built () const
if (n1) {
first_net_to_other_netref.insert (std::make_pair (n1, n2));
} else {
sc_data.nets_per_pins.push_back (std::pair<const db::NetSubcircuitPinRef *, const db::NetSubcircuitPinRef *> (0, n2));
sc_data.nets_per_pins.push_back (std::pair<const db::NetSubcircuitPinRef *, const db::NetSubcircuitPinRef *> ((const db::NetSubcircuitPinRef *) 0, n2));
}
}
}
@ -456,7 +456,7 @@ IndexedNetlistModel::net_subcircuit_pin_pair NetlistCrossReferenceModel::subcirc
if (index < sc->second.nets_per_pins.size ()) {
return sc->second.nets_per_pins [index];
} else {
return IndexedNetlistModel::net_subcircuit_pin_pair (0, 0);
return IndexedNetlistModel::net_subcircuit_pin_pair ((const db::NetSubcircuitPinRef *) 0, (const db::NetSubcircuitPinRef *) 0);
}
} else {
return IndexedNetlistModel::net_subcircuit_pin_pair (subcircuits.first ? subcircuits.first->netref_for_pin (index) : 0, subcircuits.second ? subcircuits.second->netref_for_pin (index) : 0);