From c81e462b60f0cdecf86dfb6131e0a8d28fed9334 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 31 Jul 2020 07:48:34 +0200 Subject: [PATCH 1/4] Another compiler specific fix --- src/laybasic/laybasic/layNetlistBrowserModel.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/laybasic/laybasic/layNetlistBrowserModel.cc b/src/laybasic/laybasic/layNetlistBrowserModel.cc index b69e2375a..c745dbe4c 100644 --- a/src/laybasic/laybasic/layNetlistBrowserModel.cc +++ b/src/laybasic/laybasic/layNetlistBrowserModel.cc @@ -2956,7 +2956,7 @@ NetlistBrowserModel::circuit_from_index (const QModelIndex &index, bool include_ { NetlistModelItemData *d = (NetlistModelItemData *) (index.internalPointer ()); if (! d) { - return std::pair (0, 0); + return std::pair ((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 (0, 0); + return std::pair ((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 (0, 0); + return std::pair ((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 (0, 0); + return std::pair ((const db::SubCircuit *) 0, (const db::SubCircuit *) 0); } else { return include_parents ? d->subcircuits () : d->subcircuits_of_this (); } From a7aa99e5e265af76d0b85e334598089dc97d3275 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 31 Jul 2020 07:51:23 +0200 Subject: [PATCH 2/4] Yet another compiler specific fix --- src/laybasic/laybasic/layIndexedNetlistModel.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/laybasic/laybasic/layIndexedNetlistModel.cc b/src/laybasic/laybasic/layIndexedNetlistModel.cc index 4dd2ea7c3..985e5df57 100644 --- a/src/laybasic/laybasic/layIndexedNetlistModel.cc +++ b/src/laybasic/laybasic/layIndexedNetlistModel.cc @@ -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 >::iterator i = m_subcircuit_pins_by_index.find (subcircuits); From cdcde2469a868312e11ea550df50e1b5e0335a21 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 31 Jul 2020 07:52:12 +0200 Subject: [PATCH 3/4] And another compiler specific fix ... --- src/laybasic/laybasic/layIndexedNetlistModel.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/laybasic/laybasic/layIndexedNetlistModel.cc b/src/laybasic/laybasic/layIndexedNetlistModel.cc index 985e5df57..c3063594c 100644 --- a/src/laybasic/laybasic/layIndexedNetlistModel.cc +++ b/src/laybasic/laybasic/layIndexedNetlistModel.cc @@ -372,7 +372,7 @@ SingleIndexedNetlistModel::subcircuit_pinref_from_index (const subcircuit_pair & m_synthetic_pinrefs.push_back (db::NetSubcircuitPinRef (const_cast (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)); } } From 79d3676257af62eca7b92360619676e626030310 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 31 Jul 2020 07:55:16 +0200 Subject: [PATCH 4/4] And one more ... --- src/laybasic/laybasic/layIndexedNetlistModel.cc | 2 +- src/laybasic/laybasic/layNetlistCrossReferenceModel.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/laybasic/laybasic/layIndexedNetlistModel.cc b/src/laybasic/laybasic/layIndexedNetlistModel.cc index c3063594c..7a47834c8 100644 --- a/src/laybasic/laybasic/layIndexedNetlistModel.cc +++ b/src/laybasic/laybasic/layIndexedNetlistModel.cc @@ -377,7 +377,7 @@ SingleIndexedNetlistModel::subcircuit_pinref_from_index (const subcircuit_pair & } - 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 diff --git a/src/laybasic/laybasic/layNetlistCrossReferenceModel.cc b/src/laybasic/laybasic/layNetlistCrossReferenceModel.cc index bf816b302..de67eba53 100644 --- a/src/laybasic/laybasic/layNetlistCrossReferenceModel.cc +++ b/src/laybasic/laybasic/layNetlistCrossReferenceModel.cc @@ -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 (0, n2)); + sc_data.nets_per_pins.push_back (std::pair ((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);