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

Some more fixes for gcc 4.4.7 :)

This commit is contained in:
Matthias Koefferlein 2019-05-31 00:36:14 +02:00
parent 98207cb454
commit 9409cfce5c
2 changed files with 2 additions and 2 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;