From 3b0f4b3d78923129588ee6824e38c2c04421b119 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 12 Jan 2019 00:24:31 +0100 Subject: [PATCH] WIP: fixed some compiler issues on certain systems. --- src/db/db/dbCircuit.cc | 2 +- src/db/db/dbDevice.cc | 2 +- src/db/db/dbDeviceClass.cc | 2 +- src/db/db/dbFlatRegion.h | 4 ++++ src/db/db/dbHierProcessor.cc | 6 ++++++ src/db/db/dbHierProcessor.h | 7 +++++++ src/db/db/dbNet.cc | 2 +- src/db/db/dbNetlist.cc | 2 +- src/db/db/dbSubCircuit.cc | 2 +- src/db/db/gsiDeclDbNetlist.cc | 2 +- src/db/db/gsiDeclDbNetlistDeviceExtractor.cc | 2 +- src/tl/tl/tlList.h | 3 ++- 12 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/db/db/dbCircuit.cc b/src/db/db/dbCircuit.cc index e0c85f08c..7acd9c544 100644 --- a/src/db/db/dbCircuit.cc +++ b/src/db/db/dbCircuit.cc @@ -45,7 +45,7 @@ Circuit::Circuit () } Circuit::Circuit (const Circuit &other) - : mp_netlist (0), + : gsi::ObjectBase (other), tl::Object (other), mp_netlist (0), m_device_by_id (this, &Circuit::begin_devices, &Circuit::end_devices), m_subcircuit_by_id (this, &Circuit::begin_subcircuits, &Circuit::end_subcircuits), m_net_by_cluster_id (this, &Circuit::begin_nets, &Circuit::end_nets), diff --git a/src/db/db/dbDevice.cc b/src/db/db/dbDevice.cc index dd9b8d8cf..add76bec0 100644 --- a/src/db/db/dbDevice.cc +++ b/src/db/db/dbDevice.cc @@ -52,7 +52,7 @@ Device::Device (DeviceClass *device_class, const std::string &name) } Device::Device (const Device &other) - : mp_device_class (0), m_id (0), mp_circuit (0) + : tl::Object (other), mp_device_class (0), m_id (0), mp_circuit (0) { operator= (other); } diff --git a/src/db/db/dbDeviceClass.cc b/src/db/db/dbDeviceClass.cc index 46a2c1a80..e21ff80ea 100644 --- a/src/db/db/dbDeviceClass.cc +++ b/src/db/db/dbDeviceClass.cc @@ -35,7 +35,7 @@ DeviceClass::DeviceClass () } DeviceClass::DeviceClass (const DeviceClass &other) - : mp_netlist (0) + : gsi::ObjectBase (other), tl::Object (other), tl::UniqueId (other), mp_netlist (0) { operator= (other); } diff --git a/src/db/db/dbFlatRegion.h b/src/db/db/dbFlatRegion.h index c3037080a..d4824fef4 100644 --- a/src/db/db/dbFlatRegion.h +++ b/src/db/db/dbFlatRegion.h @@ -114,6 +114,10 @@ public: virtual RegionDelegate *merged_in_place (); virtual RegionDelegate *merged_in_place (bool min_coherence, unsigned int min_wc); virtual RegionDelegate *merged () const; + virtual RegionDelegate *merged (bool min_coherence, unsigned int min_wc) const + { + return db::AsIfFlatRegion::merged (min_coherence, min_wc); + } virtual RegionDelegate *filter_in_place (const PolygonFilterBase &filter); diff --git a/src/db/db/dbHierProcessor.cc b/src/db/db/dbHierProcessor.cc index 87d95c4b3..c99b49440 100644 --- a/src/db/db/dbHierProcessor.cc +++ b/src/db/db/dbHierProcessor.cc @@ -185,6 +185,12 @@ LocalProcessorCellContext::LocalProcessorCellContext () // .. nothing yet .. } +LocalProcessorCellContext::LocalProcessorCellContext (const LocalProcessorCellContext &other) + : m_propagated (other.m_propagated), m_drops (other.m_drops) +{ + // .. nothing yet .. +} + void LocalProcessorCellContext::add (db::LocalProcessorCellContext *parent_context, db::Cell *parent, const db::ICplxTrans &cell_inst) { diff --git a/src/db/db/dbHierProcessor.h b/src/db/db/dbHierProcessor.h index 2918c4d95..866137bbc 100644 --- a/src/db/db/dbHierProcessor.h +++ b/src/db/db/dbHierProcessor.h @@ -141,6 +141,7 @@ public: typedef std::pair parent_inst_type; LocalProcessorCellContext (); + LocalProcessorCellContext (const LocalProcessorCellContext &other); void add (db::LocalProcessorCellContext *parent_context, db::Cell *parent, const db::ICplxTrans &cell_inst); void propagate (const std::unordered_set &res); @@ -212,6 +213,12 @@ public: // .. nothing yet .. } + LocalProcessorContexts (const LocalProcessorContexts &other) + : m_contexts_per_cell (other.m_contexts_per_cell), m_subject_layer (other.m_subject_layer), m_intruder_layer (other.m_intruder_layer) + { + // .. nothing yet .. + } + void clear () { m_contexts_per_cell.clear (); diff --git a/src/db/db/dbNet.cc b/src/db/db/dbNet.cc index 20733d442..69f085817 100644 --- a/src/db/db/dbNet.cc +++ b/src/db/db/dbNet.cc @@ -167,7 +167,7 @@ Net::Net (const std::string &name) } Net::Net (const Net &other) - : m_cluster_id (0), mp_circuit (0) + : tl::Object (other), m_cluster_id (0), mp_circuit (0) { operator= (other); } diff --git a/src/db/db/dbNetlist.cc b/src/db/db/dbNetlist.cc index 21dced73c..8a5135d05 100644 --- a/src/db/db/dbNetlist.cc +++ b/src/db/db/dbNetlist.cc @@ -40,7 +40,7 @@ Netlist::Netlist () } Netlist::Netlist (const Netlist &other) - : m_valid_topology (false), m_lock_count (0), + : gsi::ObjectBase (other), tl::Object (other), m_valid_topology (false), m_lock_count (0), m_circuit_by_name (this, &Netlist::begin_circuits, &Netlist::end_circuits), m_circuit_by_cell_index (this, &Netlist::begin_circuits, &Netlist::end_circuits) { diff --git a/src/db/db/dbSubCircuit.cc b/src/db/db/dbSubCircuit.cc index 8e6407326..9de235b97 100644 --- a/src/db/db/dbSubCircuit.cc +++ b/src/db/db/dbSubCircuit.cc @@ -51,7 +51,7 @@ SubCircuit::SubCircuit (Circuit *circuit, const std::string &name) } SubCircuit::SubCircuit (const SubCircuit &other) - : m_id (0), mp_circuit (0) + : tl::Object (other), m_id (0), mp_circuit (0) { operator= (other); } diff --git a/src/db/db/gsiDeclDbNetlist.cc b/src/db/db/gsiDeclDbNetlist.cc index 3d0bf45e7..c088750cd 100644 --- a/src/db/db/gsiDeclDbNetlist.cc +++ b/src/db/db/gsiDeclDbNetlist.cc @@ -509,7 +509,7 @@ public: virtual bool combine_devices (db::Device *a, db::Device *b) const { if (cb_combine_devices.can_issue ()) { - return cb_combine_devices.issue (&db::DeviceClass::combine_devices, a, b); + return cb_combine_devices.issue (&db::DeviceClass::combine_devices, a, b); } else { return db::DeviceClass::combine_devices (a, b); } diff --git a/src/db/db/gsiDeclDbNetlistDeviceExtractor.cc b/src/db/db/gsiDeclDbNetlistDeviceExtractor.cc index a201164a8..7ccacac19 100644 --- a/src/db/db/gsiDeclDbNetlistDeviceExtractor.cc +++ b/src/db/db/gsiDeclDbNetlistDeviceExtractor.cc @@ -80,7 +80,7 @@ public: virtual db::Connectivity get_connectivity (const db::Layout &layout, const std::vector &layers) const { if (cb_get_connectivity.can_issue ()) { - return cb_get_connectivity.issue &> (&GenericDeviceExtractor::get_connectivity_fb, layout, layers); + return cb_get_connectivity.issue &> (&GenericDeviceExtractor::get_connectivity_fb, layout, layers); } else { return db::NetlistDeviceExtractor::get_connectivity (layout, layers); } diff --git a/src/tl/tl/tlList.h b/src/tl/tl/tlList.h index 3d38dc95b..2d09e868e 100644 --- a/src/tl/tl/tlList.h +++ b/src/tl/tl/tlList.h @@ -303,6 +303,7 @@ public: list_impl () { } list_impl (const list_impl &other) + : list_impl (other) { operator= (other); } @@ -522,6 +523,6 @@ public: } }; -}; +} #endif