diff --git a/src/db/db/dbNetlistCrossReference.cc b/src/db/db/dbNetlistCrossReference.cc index 6142b652e..4a0c43166 100644 --- a/src/db/db/dbNetlistCrossReference.cc +++ b/src/db/db/dbNetlistCrossReference.cc @@ -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 > ()); std::stable_sort (mp_per_circuit_data->nets.begin (), mp_per_circuit_data->nets.end (), pair_data_compare > ()); - m_current_circuits = std::pair (0, 0); + m_current_circuits = std::make_pair((const db::Circuit *)0, (const db::Circuit *)0); mp_per_circuit_data = 0; } diff --git a/src/db/db/gsiDeclDbNetlistCrossReference.cc b/src/db/db/gsiDeclDbNetlistCrossReference.cc index ec18e35cc..6d34a09ba 100644 --- a/src/db/db/gsiDeclDbNetlistCrossReference.cc +++ b/src/db/db/gsiDeclDbNetlistCrossReference.cc @@ -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 pair; db::NetlistCrossReference::Status status; diff --git a/src/laybasic/laybasic/layNetlistBrowserModel.cc b/src/laybasic/laybasic/layNetlistBrowserModel.cc index 03131cabe..82cd7b1a6 100644 --- a/src/laybasic/laybasic/layNetlistBrowserModel.cc +++ b/src/laybasic/laybasic/layNetlistBrowserModel.cc @@ -135,7 +135,7 @@ NetColorizer::color_of_net (const db::Net *net) const size_t index = 0; - typename std::map::iterator cc = m_net_index_by_object.find (net); + std::map::iterator cc = m_net_index_by_object.find (net); if (cc == m_net_index_by_object.end ()) { size_t i = 0; diff --git a/src/laybasic/laybasic/layNetlistBrowserModel.h b/src/laybasic/laybasic/layNetlistBrowserModel.h index ff930d658..07ea3dd12 100644 --- a/src/laybasic/laybasic/layNetlistBrowserModel.h +++ b/src/laybasic/laybasic/layNetlistBrowserModel.h @@ -207,7 +207,7 @@ private: std::pair netlists () const { - return std::pair (mp_l2ndb->netlist (), 0); + return std::pair (mp_l2ndb->netlist (), (const db::Netlist *)0); } QIcon icon_for_nets (const std::pair &net) const;