From 9409cfce5c794eafb5b6df51a2a700a0faf60c3a Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Fri, 31 May 2019 00:36:14 +0200
Subject: [PATCH 1/2] 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<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;
 }
 
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<const db::Circuit *, const db::Circuit *> pair;
   db::NetlistCrossReference::Status status;

From 6f263211e20f6697f4f1599ef2cc41d0738b6932 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Fri, 31 May 2019 00:41:11 +0200
Subject: [PATCH 2/2] Some more fixes for picky gcc 4.4.7

---
 src/laybasic/laybasic/layNetlistBrowserModel.cc | 2 +-
 src/laybasic/laybasic/layNetlistBrowserModel.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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<const db::Net *, size_t>::iterator cc = m_net_index_by_object.find (net);
+    std::map<const db::Net *, size_t>::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<const db::Netlist *, const db::Netlist *> netlists () const
   {
-    return std::pair<const db::Netlist *, const db::Netlist *> (mp_l2ndb->netlist (), 0);
+    return std::pair<const db::Netlist *, const db::Netlist *> (mp_l2ndb->netlist (), (const db::Netlist *)0);
   }
 
   QIcon icon_for_nets (const std::pair<const db::Net *, const db::Net *> &net) const;