From 9409cfce5c794eafb5b6df51a2a700a0faf60c3a Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 31 May 2019 00:36:14 +0200 Subject: [PATCH] Some more fixes for gcc 4.4.7 :) --- src/db/db/dbNetlistCrossReference.cc | 2 +- src/db/db/gsiDeclDbNetlistCrossReference.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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;