From fbb3099de723afeff02fe8f29203b11539beab67 Mon Sep 17 00:00:00 2001 From: Felipe Garay Date: Tue, 21 Nov 2023 15:13:32 -0800 Subject: [PATCH] odb: generating a default constructor for classes without destructible fields Signed-off-by: Felipe Garay --- src/odb/src/codeGenerator/gen.py | 6 ++++ src/odb/src/codeGenerator/helper.py | 5 +++ src/odb/src/codeGenerator/templates/impl.cpp | 34 ++++++++++--------- src/odb/src/codeGenerator/templates/impl.h | 9 +++-- src/odb/src/db/dbAccessPoint.cpp | 6 +--- src/odb/src/db/dbAccessPoint.h | 3 +- src/odb/src/db/dbGCellGrid.cpp | 6 +--- src/odb/src/db/dbGCellGrid.h | 3 +- src/odb/src/db/dbGlobalConnect.cpp | 4 --- src/odb/src/db/dbGlobalConnect.h | 3 +- src/odb/src/db/dbGroup.cpp | 2 +- src/odb/src/db/dbGroup.h | 1 + src/odb/src/db/dbGuide.cpp | 4 --- src/odb/src/db/dbGuide.h | 3 +- src/odb/src/db/dbIsolation.h | 1 + src/odb/src/db/dbLogicPort.h | 1 + src/odb/src/db/dbMetalWidthViaMap.cpp | 4 --- src/odb/src/db/dbMetalWidthViaMap.h | 3 +- src/odb/src/db/dbModInst.cpp | 2 +- src/odb/src/db/dbModInst.h | 1 + src/odb/src/db/dbModule.cpp | 2 +- src/odb/src/db/dbModule.h | 1 + src/odb/src/db/dbNetTrack.cpp | 4 --- src/odb/src/db/dbNetTrack.h | 3 +- src/odb/src/db/dbPowerDomain.cpp | 2 +- src/odb/src/db/dbPowerDomain.h | 1 + src/odb/src/db/dbPowerSwitch.h | 1 + src/odb/src/db/dbTechLayer.h | 1 + src/odb/src/db/dbTechLayerAreaRule.cpp | 6 +--- src/odb/src/db/dbTechLayerAreaRule.h | 3 +- .../src/db/dbTechLayerArraySpacingRule.cpp | 4 --- src/odb/src/db/dbTechLayerArraySpacingRule.h | 3 +- .../src/db/dbTechLayerCornerSpacingRule.cpp | 6 +--- src/odb/src/db/dbTechLayerCornerSpacingRule.h | 3 +- src/odb/src/db/dbTechLayerCutClassRule.cpp | 2 +- src/odb/src/db/dbTechLayerCutClassRule.h | 1 + .../src/db/dbTechLayerCutEnclosureRule.cpp | 6 +--- src/odb/src/db/dbTechLayerCutEnclosureRule.h | 3 +- src/odb/src/db/dbTechLayerCutSpacingRule.cpp | 6 +--- src/odb/src/db/dbTechLayerCutSpacingRule.h | 3 +- .../db/dbTechLayerCutSpacingTableDefRule.cpp | 6 +--- .../db/dbTechLayerCutSpacingTableDefRule.h | 3 +- .../db/dbTechLayerCutSpacingTableOrthRule.cpp | 6 +--- .../db/dbTechLayerCutSpacingTableOrthRule.h | 3 +- .../src/db/dbTechLayerEolExtensionRule.cpp | 6 +--- src/odb/src/db/dbTechLayerEolExtensionRule.h | 3 +- src/odb/src/db/dbTechLayerEolKeepOutRule.cpp | 6 +--- src/odb/src/db/dbTechLayerEolKeepOutRule.h | 3 +- .../db/dbTechLayerForbiddenSpacingRule.cpp | 6 +--- .../src/db/dbTechLayerForbiddenSpacingRule.h | 3 +- src/odb/src/db/dbTechLayerKeepOutZoneRule.cpp | 4 --- src/odb/src/db/dbTechLayerKeepOutZoneRule.h | 3 +- src/odb/src/db/dbTechLayerMinCutRule.cpp | 4 --- src/odb/src/db/dbTechLayerMinCutRule.h | 3 +- src/odb/src/db/dbTechLayerMinStepRule.cpp | 6 +--- src/odb/src/db/dbTechLayerMinStepRule.h | 3 +- src/odb/src/db/dbTechLayerSpacingEolRule.cpp | 6 +--- src/odb/src/db/dbTechLayerSpacingEolRule.h | 3 +- .../src/db/dbTechLayerSpacingTablePrlRule.cpp | 6 +--- .../src/db/dbTechLayerSpacingTablePrlRule.h | 3 +- src/odb/src/db/dbTechLayerWidthTableRule.cpp | 4 --- src/odb/src/db/dbTechLayerWidthTableRule.h | 3 +- 62 files changed, 108 insertions(+), 147 deletions(-) diff --git a/src/odb/src/codeGenerator/gen.py b/src/odb/src/codeGenerator/gen.py index 8eeeb37e994..fca72c42fc9 100755 --- a/src/odb/src/codeGenerator/gen.py +++ b/src/odb/src/codeGenerator/gen.py @@ -264,6 +264,12 @@ def get_json_files(directory): else: field["setterArgumentType"] = field["getterReturnType"] = field["type"] + if field["name"] == '_name' and 'no-destruct' not in field["flags"]: + klass["has_destructible_fields"] = True + + if "table" in field: + klass["has_destructible_fields"] = True + klass["fields"] = [field for field in klass["fields"] if "bits" not in field] klass["hasBitFields"] = False diff --git a/src/odb/src/codeGenerator/helper.py b/src/odb/src/codeGenerator/helper.py index a83edef1605..0b3572429f5 100644 --- a/src/odb/src/codeGenerator/helper.py +++ b/src/odb/src/codeGenerator/helper.py @@ -168,3 +168,8 @@ def get_ref_type(type_name): return None return type_name[6:-1] + "*" + +def has_destructible_field(klass): + for field in klass["fields"]: + return True + return False diff --git a/src/odb/src/codeGenerator/templates/impl.cpp b/src/odb/src/codeGenerator/templates/impl.cpp index b2aa5592697..60148394f23 100755 --- a/src/odb/src/codeGenerator/templates/impl.cpp +++ b/src/odb/src/codeGenerator/templates/impl.cpp @@ -291,21 +291,23 @@ namespace odb { } {% endif %} - _{{klass.name}}::~_{{klass.name}}() - { - {% for field in klass.fields %} - {% if field.name == '_name' and 'no-destruct' not in field.flags %} - if (_name) { - free((void*) _name); - } - {% endif %} - {% if field.table %} - delete {{field.name}}; - {% endif %} - {% endfor %} - //User Code Begin Destructor - //User Code End Destructor - } + {% if klass.has_destructible_fields %} + _{{klass.name}}::~_{{klass.name}}() + { + {% for field in klass.fields %} + {% if field.name == '_name' and 'no-destruct' not in field.flags %} + if (_name) { + free((void*) _name); + } + {% endif %} + {% if field.table %} + delete {{field.name}}; + {% endif %} + {% endfor %} + //User Code Begin Destructor + //User Code End Destructor + } + {% endif %} //User Code Begin PrivateMethods //User Code End PrivateMethods @@ -404,5 +406,5 @@ namespace odb { //User Code Begin {{klass.name}}PublicMethods //User Code End {{klass.name}}PublicMethods -} +} // namespace odb // Generator Code End Cpp diff --git a/src/odb/src/codeGenerator/templates/impl.h b/src/odb/src/codeGenerator/templates/impl.h index c0b43c62284..cade01adf53 100755 --- a/src/odb/src/codeGenerator/templates/impl.h +++ b/src/odb/src/codeGenerator/templates/impl.h @@ -90,7 +90,12 @@ namespace odb { _{{klass.name}}(_dbDatabase*, const _{{klass.name}}& r); _{{klass.name}}(_dbDatabase*); - ~_{{klass.name}}(); + + {% if klass.has_destructible_fields %} + ~_{{klass.name}}(); + {% else %} + ~_{{klass.name}}() = default; + {% endif %} bool operator==(const _{{klass.name}}& rhs) const; bool operator!=(const _{{klass.name}}& rhs) const { return !operator==(rhs); } @@ -121,5 +126,5 @@ dbIStream& operator>>(dbIStream& stream, _{{klass.name}}& obj); dbOStream& operator<<(dbOStream& stream, const _{{klass.name}}& obj); // User Code Begin General // User Code End General -} +} // namespace odb //Generator Code End Header diff --git a/src/odb/src/db/dbAccessPoint.cpp b/src/odb/src/db/dbAccessPoint.cpp index 4d93331e100..3bfcfa0c677 100644 --- a/src/odb/src/db/dbAccessPoint.cpp +++ b/src/odb/src/db/dbAccessPoint.cpp @@ -198,10 +198,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbAccessPoint& obj) return stream; } -_dbAccessPoint::~_dbAccessPoint() -{ -} - // User Code Begin PrivateMethods void _dbAccessPoint::setMPin(_dbMPin* mpin) { @@ -483,4 +479,4 @@ void dbAccessPoint::destroy(dbAccessPoint* ap) } // User Code End dbAccessPointPublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbAccessPoint.h b/src/odb/src/db/dbAccessPoint.h index 09344c2191d..badc634997b 100644 --- a/src/odb/src/db/dbAccessPoint.h +++ b/src/odb/src/db/dbAccessPoint.h @@ -58,7 +58,8 @@ class _dbAccessPoint : public _dbObject public: _dbAccessPoint(_dbDatabase*, const _dbAccessPoint& r); _dbAccessPoint(_dbDatabase*); - ~_dbAccessPoint(); + + ~_dbAccessPoint() = default; bool operator==(const _dbAccessPoint& rhs) const; bool operator!=(const _dbAccessPoint& rhs) const { return !operator==(rhs); } diff --git a/src/odb/src/db/dbGCellGrid.cpp b/src/odb/src/db/dbGCellGrid.cpp index 547d1752619..67d99ceb692 100644 --- a/src/odb/src/db/dbGCellGrid.cpp +++ b/src/odb/src/db/dbGCellGrid.cpp @@ -200,10 +200,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbGCellGrid& obj) return stream; } -_dbGCellGrid::~_dbGCellGrid() -{ -} - // User Code Begin PrivateMethods dbIStream& operator>>(dbIStream& stream, dbGCellGrid::GCellData& obj) @@ -769,4 +765,4 @@ dbMatrix dbGCellGrid::getCongestionMap( } // User Code End dbGCellGridPublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbGCellGrid.h b/src/odb/src/db/dbGCellGrid.h index 7e37db038f6..b4a3635dfb3 100644 --- a/src/odb/src/db/dbGCellGrid.h +++ b/src/odb/src/db/dbGCellGrid.h @@ -66,7 +66,8 @@ class _dbGCellGrid : public _dbObject public: _dbGCellGrid(_dbDatabase*, const _dbGCellGrid& r); _dbGCellGrid(_dbDatabase*); - ~_dbGCellGrid(); + + ~_dbGCellGrid() = default; bool operator==(const _dbGCellGrid& rhs) const; bool operator!=(const _dbGCellGrid& rhs) const { return !operator==(rhs); } diff --git a/src/odb/src/db/dbGlobalConnect.cpp b/src/odb/src/db/dbGlobalConnect.cpp index d4ebe872d20..0af74930b56 100644 --- a/src/odb/src/db/dbGlobalConnect.cpp +++ b/src/odb/src/db/dbGlobalConnect.cpp @@ -144,10 +144,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbGlobalConnect& obj) return stream; } -_dbGlobalConnect::~_dbGlobalConnect() -{ -} - //////////////////////////////////////////////////////////////////// // // dbGlobalConnect - Methods diff --git a/src/odb/src/db/dbGlobalConnect.h b/src/odb/src/db/dbGlobalConnect.h index ee08eda7961..ec065bcd410 100644 --- a/src/odb/src/db/dbGlobalConnect.h +++ b/src/odb/src/db/dbGlobalConnect.h @@ -65,7 +65,8 @@ class _dbGlobalConnect : public _dbObject public: _dbGlobalConnect(_dbDatabase*, const _dbGlobalConnect& r); _dbGlobalConnect(_dbDatabase*); - ~_dbGlobalConnect(); + + ~_dbGlobalConnect() = default; bool operator==(const _dbGlobalConnect& rhs) const; bool operator!=(const _dbGlobalConnect& rhs) const diff --git a/src/odb/src/db/dbGroup.cpp b/src/odb/src/db/dbGroup.cpp index ba3520bf115..a62028e3399 100644 --- a/src/odb/src/db/dbGroup.cpp +++ b/src/odb/src/db/dbGroup.cpp @@ -573,4 +573,4 @@ dbGroup* dbGroup::getGroup(dbBlock* block_, uint dbid_) // User Code End dbGroupPublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbGroup.h b/src/odb/src/db/dbGroup.h index 2842271d44c..ca39b08aa48 100644 --- a/src/odb/src/db/dbGroup.h +++ b/src/odb/src/db/dbGroup.h @@ -61,6 +61,7 @@ class _dbGroup : public _dbObject public: _dbGroup(_dbDatabase*, const _dbGroup& r); _dbGroup(_dbDatabase*); + ~_dbGroup(); bool operator==(const _dbGroup& rhs) const; diff --git a/src/odb/src/db/dbGuide.cpp b/src/odb/src/db/dbGuide.cpp index 21219505777..acbfc59dae9 100644 --- a/src/odb/src/db/dbGuide.cpp +++ b/src/odb/src/db/dbGuide.cpp @@ -122,10 +122,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbGuide& obj) return stream; } -_dbGuide::~_dbGuide() -{ -} - //////////////////////////////////////////////////////////////////// // // dbGuide - Methods diff --git a/src/odb/src/db/dbGuide.h b/src/odb/src/db/dbGuide.h index a1aedee5747..259dd70fb32 100644 --- a/src/odb/src/db/dbGuide.h +++ b/src/odb/src/db/dbGuide.h @@ -49,7 +49,8 @@ class _dbGuide : public _dbObject public: _dbGuide(_dbDatabase*, const _dbGuide& r); _dbGuide(_dbDatabase*); - ~_dbGuide(); + + ~_dbGuide() = default; bool operator==(const _dbGuide& rhs) const; bool operator!=(const _dbGuide& rhs) const { return !operator==(rhs); } diff --git a/src/odb/src/db/dbIsolation.h b/src/odb/src/db/dbIsolation.h index cbf7fd0a025..18484f794f7 100644 --- a/src/odb/src/db/dbIsolation.h +++ b/src/odb/src/db/dbIsolation.h @@ -49,6 +49,7 @@ class _dbIsolation : public _dbObject public: _dbIsolation(_dbDatabase*, const _dbIsolation& r); _dbIsolation(_dbDatabase*); + ~_dbIsolation(); bool operator==(const _dbIsolation& rhs) const; diff --git a/src/odb/src/db/dbLogicPort.h b/src/odb/src/db/dbLogicPort.h index 5f8409622d8..480664e7d3a 100644 --- a/src/odb/src/db/dbLogicPort.h +++ b/src/odb/src/db/dbLogicPort.h @@ -48,6 +48,7 @@ class _dbLogicPort : public _dbObject public: _dbLogicPort(_dbDatabase*, const _dbLogicPort& r); _dbLogicPort(_dbDatabase*); + ~_dbLogicPort(); bool operator==(const _dbLogicPort& rhs) const; diff --git a/src/odb/src/db/dbMetalWidthViaMap.cpp b/src/odb/src/db/dbMetalWidthViaMap.cpp index 0e6d99a4523..2e8e41ee0b2 100644 --- a/src/odb/src/db/dbMetalWidthViaMap.cpp +++ b/src/odb/src/db/dbMetalWidthViaMap.cpp @@ -159,10 +159,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbMetalWidthViaMap& obj) return stream; } -_dbMetalWidthViaMap::~_dbMetalWidthViaMap() -{ -} - //////////////////////////////////////////////////////////////////// // // dbMetalWidthViaMap - Methods diff --git a/src/odb/src/db/dbMetalWidthViaMap.h b/src/odb/src/db/dbMetalWidthViaMap.h index d89e5bf41b4..3fe95eb3304 100644 --- a/src/odb/src/db/dbMetalWidthViaMap.h +++ b/src/odb/src/db/dbMetalWidthViaMap.h @@ -53,7 +53,8 @@ class _dbMetalWidthViaMap : public _dbObject public: _dbMetalWidthViaMap(_dbDatabase*, const _dbMetalWidthViaMap& r); _dbMetalWidthViaMap(_dbDatabase*); - ~_dbMetalWidthViaMap(); + + ~_dbMetalWidthViaMap() = default; bool operator==(const _dbMetalWidthViaMap& rhs) const; bool operator!=(const _dbMetalWidthViaMap& rhs) const diff --git a/src/odb/src/db/dbModInst.cpp b/src/odb/src/db/dbModInst.cpp index b940821fb35..ac6aa8f38c2 100644 --- a/src/odb/src/db/dbModInst.cpp +++ b/src/odb/src/db/dbModInst.cpp @@ -295,4 +295,4 @@ std::string dbModInst::getHierarchicalName() const } // User Code End dbModInstPublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbModInst.h b/src/odb/src/db/dbModInst.h index 48ad7244475..cd82e0e2812 100644 --- a/src/odb/src/db/dbModInst.h +++ b/src/odb/src/db/dbModInst.h @@ -49,6 +49,7 @@ class _dbModInst : public _dbObject public: _dbModInst(_dbDatabase*, const _dbModInst& r); _dbModInst(_dbDatabase*); + ~_dbModInst(); bool operator==(const _dbModInst& rhs) const; diff --git a/src/odb/src/db/dbModule.cpp b/src/odb/src/db/dbModule.cpp index 38e2f94272a..9d774958722 100644 --- a/src/odb/src/db/dbModule.cpp +++ b/src/odb/src/db/dbModule.cpp @@ -368,4 +368,4 @@ std::string dbModule::getHierarchicalName() const // User Code End dbModulePublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbModule.h b/src/odb/src/db/dbModule.h index a4cb0c75872..8a2727670f1 100644 --- a/src/odb/src/db/dbModule.h +++ b/src/odb/src/db/dbModule.h @@ -53,6 +53,7 @@ class _dbModule : public _dbObject public: _dbModule(_dbDatabase*, const _dbModule& r); _dbModule(_dbDatabase*); + ~_dbModule(); bool operator==(const _dbModule& rhs) const; diff --git a/src/odb/src/db/dbNetTrack.cpp b/src/odb/src/db/dbNetTrack.cpp index 82d8f543eb2..257ce4fb0e5 100644 --- a/src/odb/src/db/dbNetTrack.cpp +++ b/src/odb/src/db/dbNetTrack.cpp @@ -122,10 +122,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbNetTrack& obj) return stream; } -_dbNetTrack::~_dbNetTrack() -{ -} - //////////////////////////////////////////////////////////////////// // // dbNetTrack - Methods diff --git a/src/odb/src/db/dbNetTrack.h b/src/odb/src/db/dbNetTrack.h index a66bc90904f..9a17b352f34 100644 --- a/src/odb/src/db/dbNetTrack.h +++ b/src/odb/src/db/dbNetTrack.h @@ -49,7 +49,8 @@ class _dbNetTrack : public _dbObject public: _dbNetTrack(_dbDatabase*, const _dbNetTrack& r); _dbNetTrack(_dbDatabase*); - ~_dbNetTrack(); + + ~_dbNetTrack() = default; bool operator==(const _dbNetTrack& rhs) const; bool operator!=(const _dbNetTrack& rhs) const { return !operator==(rhs); } diff --git a/src/odb/src/db/dbPowerDomain.cpp b/src/odb/src/db/dbPowerDomain.cpp index 28ba04e7bf9..2ca820fe5a9 100644 --- a/src/odb/src/db/dbPowerDomain.cpp +++ b/src/odb/src/db/dbPowerDomain.cpp @@ -344,4 +344,4 @@ bool dbPowerDomain::getArea(int& _x1, int& _y1, int& _x2, int& _y2) // User Code End dbPowerDomainPublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbPowerDomain.h b/src/odb/src/db/dbPowerDomain.h index b55bab3990f..20ed6d5d3f9 100644 --- a/src/odb/src/db/dbPowerDomain.h +++ b/src/odb/src/db/dbPowerDomain.h @@ -51,6 +51,7 @@ class _dbPowerDomain : public _dbObject public: _dbPowerDomain(_dbDatabase*, const _dbPowerDomain& r); _dbPowerDomain(_dbDatabase*); + ~_dbPowerDomain(); bool operator==(const _dbPowerDomain& rhs) const; diff --git a/src/odb/src/db/dbPowerSwitch.h b/src/odb/src/db/dbPowerSwitch.h index 2e505cda284..f4d7f5df682 100644 --- a/src/odb/src/db/dbPowerSwitch.h +++ b/src/odb/src/db/dbPowerSwitch.h @@ -54,6 +54,7 @@ class _dbPowerSwitch : public _dbObject public: _dbPowerSwitch(_dbDatabase*, const _dbPowerSwitch& r); _dbPowerSwitch(_dbDatabase*); + ~_dbPowerSwitch(); bool operator==(const _dbPowerSwitch& rhs) const; diff --git a/src/odb/src/db/dbTechLayer.h b/src/odb/src/db/dbTechLayer.h index 58d1ca9fcf1..24e02e98f91 100644 --- a/src/odb/src/db/dbTechLayer.h +++ b/src/odb/src/db/dbTechLayer.h @@ -98,6 +98,7 @@ class _dbTechLayer : public _dbObject public: _dbTechLayer(_dbDatabase*, const _dbTechLayer& r); _dbTechLayer(_dbDatabase*); + ~_dbTechLayer(); bool operator==(const _dbTechLayer& rhs) const; diff --git a/src/odb/src/db/dbTechLayerAreaRule.cpp b/src/odb/src/db/dbTechLayerAreaRule.cpp index a1ddfe3c7d4..490e3dfeea3 100644 --- a/src/odb/src/db/dbTechLayerAreaRule.cpp +++ b/src/odb/src/db/dbTechLayerAreaRule.cpp @@ -166,10 +166,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbTechLayerAreaRule& obj) return stream; } -_dbTechLayerAreaRule::~_dbTechLayerAreaRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerAreaRule - Methods @@ -351,4 +347,4 @@ void dbTechLayerAreaRule::destroy(dbTechLayerAreaRule* rule) // User Code End dbTechLayerAreaRulePublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbTechLayerAreaRule.h b/src/odb/src/db/dbTechLayerAreaRule.h index 10540c736e2..89cfd151aa4 100644 --- a/src/odb/src/db/dbTechLayerAreaRule.h +++ b/src/odb/src/db/dbTechLayerAreaRule.h @@ -55,7 +55,8 @@ class _dbTechLayerAreaRule : public _dbObject public: _dbTechLayerAreaRule(_dbDatabase*, const _dbTechLayerAreaRule& r); _dbTechLayerAreaRule(_dbDatabase*); - ~_dbTechLayerAreaRule(); + + ~_dbTechLayerAreaRule() = default; bool operator==(const _dbTechLayerAreaRule& rhs) const; bool operator!=(const _dbTechLayerAreaRule& rhs) const diff --git a/src/odb/src/db/dbTechLayerArraySpacingRule.cpp b/src/odb/src/db/dbTechLayerArraySpacingRule.cpp index 314db2ec07b..9d35787641c 100644 --- a/src/odb/src/db/dbTechLayerArraySpacingRule.cpp +++ b/src/odb/src/db/dbTechLayerArraySpacingRule.cpp @@ -178,10 +178,6 @@ dbOStream& operator<<(dbOStream& stream, return stream; } -_dbTechLayerArraySpacingRule::~_dbTechLayerArraySpacingRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerArraySpacingRule - Methods diff --git a/src/odb/src/db/dbTechLayerArraySpacingRule.h b/src/odb/src/db/dbTechLayerArraySpacingRule.h index ce7b13d0083..c65944575e4 100644 --- a/src/odb/src/db/dbTechLayerArraySpacingRule.h +++ b/src/odb/src/db/dbTechLayerArraySpacingRule.h @@ -58,7 +58,8 @@ class _dbTechLayerArraySpacingRule : public _dbObject _dbTechLayerArraySpacingRule(_dbDatabase*, const _dbTechLayerArraySpacingRule& r); _dbTechLayerArraySpacingRule(_dbDatabase*); - ~_dbTechLayerArraySpacingRule(); + + ~_dbTechLayerArraySpacingRule() = default; bool operator==(const _dbTechLayerArraySpacingRule& rhs) const; bool operator!=(const _dbTechLayerArraySpacingRule& rhs) const diff --git a/src/odb/src/db/dbTechLayerCornerSpacingRule.cpp b/src/odb/src/db/dbTechLayerCornerSpacingRule.cpp index b0ee450cad9..ed430ba7627 100644 --- a/src/odb/src/db/dbTechLayerCornerSpacingRule.cpp +++ b/src/odb/src/db/dbTechLayerCornerSpacingRule.cpp @@ -252,10 +252,6 @@ dbOStream& operator<<(dbOStream& stream, return stream; } -_dbTechLayerCornerSpacingRule::~_dbTechLayerCornerSpacingRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerCornerSpacingRule - Methods @@ -573,4 +569,4 @@ void dbTechLayerCornerSpacingRule::destroy(dbTechLayerCornerSpacingRule* rule) } // User Code End dbTechLayerCornerSpacingRulePublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbTechLayerCornerSpacingRule.h b/src/odb/src/db/dbTechLayerCornerSpacingRule.h index b34478e7d4e..a80e9be3f01 100644 --- a/src/odb/src/db/dbTechLayerCornerSpacingRule.h +++ b/src/odb/src/db/dbTechLayerCornerSpacingRule.h @@ -70,7 +70,8 @@ class _dbTechLayerCornerSpacingRule : public _dbObject _dbTechLayerCornerSpacingRule(_dbDatabase*, const _dbTechLayerCornerSpacingRule& r); _dbTechLayerCornerSpacingRule(_dbDatabase*); - ~_dbTechLayerCornerSpacingRule(); + + ~_dbTechLayerCornerSpacingRule() = default; bool operator==(const _dbTechLayerCornerSpacingRule& rhs) const; bool operator!=(const _dbTechLayerCornerSpacingRule& rhs) const diff --git a/src/odb/src/db/dbTechLayerCutClassRule.cpp b/src/odb/src/db/dbTechLayerCutClassRule.cpp index c1504353412..0380864478d 100644 --- a/src/odb/src/db/dbTechLayerCutClassRule.cpp +++ b/src/odb/src/db/dbTechLayerCutClassRule.cpp @@ -282,4 +282,4 @@ void dbTechLayerCutClassRule::destroy(dbTechLayerCutClassRule* rule) } // User Code End dbTechLayerCutClassRulePublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbTechLayerCutClassRule.h b/src/odb/src/db/dbTechLayerCutClassRule.h index 7ddbb895a4e..259e3e05c29 100644 --- a/src/odb/src/db/dbTechLayerCutClassRule.h +++ b/src/odb/src/db/dbTechLayerCutClassRule.h @@ -54,6 +54,7 @@ class _dbTechLayerCutClassRule : public _dbObject public: _dbTechLayerCutClassRule(_dbDatabase*, const _dbTechLayerCutClassRule& r); _dbTechLayerCutClassRule(_dbDatabase*); + ~_dbTechLayerCutClassRule(); bool operator==(const _dbTechLayerCutClassRule& rhs) const; diff --git a/src/odb/src/db/dbTechLayerCutEnclosureRule.cpp b/src/odb/src/db/dbTechLayerCutEnclosureRule.cpp index cf2d25c3f60..5b48bf76f8d 100644 --- a/src/odb/src/db/dbTechLayerCutEnclosureRule.cpp +++ b/src/odb/src/db/dbTechLayerCutEnclosureRule.cpp @@ -413,10 +413,6 @@ dbOStream& operator<<(dbOStream& stream, return stream; } -_dbTechLayerCutEnclosureRule::~_dbTechLayerCutEnclosureRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerCutEnclosureRule - Methods @@ -1029,4 +1025,4 @@ void dbTechLayerCutEnclosureRule::destroy(dbTechLayerCutEnclosureRule* rule) } // User Code End dbTechLayerCutEnclosureRulePublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbTechLayerCutEnclosureRule.h b/src/odb/src/db/dbTechLayerCutEnclosureRule.h index 4383c7ab564..df4b82087dd 100644 --- a/src/odb/src/db/dbTechLayerCutEnclosureRule.h +++ b/src/odb/src/db/dbTechLayerCutEnclosureRule.h @@ -78,7 +78,8 @@ class _dbTechLayerCutEnclosureRule : public _dbObject _dbTechLayerCutEnclosureRule(_dbDatabase*, const _dbTechLayerCutEnclosureRule& r); _dbTechLayerCutEnclosureRule(_dbDatabase*); - ~_dbTechLayerCutEnclosureRule(); + + ~_dbTechLayerCutEnclosureRule() = default; bool operator==(const _dbTechLayerCutEnclosureRule& rhs) const; bool operator!=(const _dbTechLayerCutEnclosureRule& rhs) const diff --git a/src/odb/src/db/dbTechLayerCutSpacingRule.cpp b/src/odb/src/db/dbTechLayerCutSpacingRule.cpp index 40e8a32156c..640d729bc69 100644 --- a/src/odb/src/db/dbTechLayerCutSpacingRule.cpp +++ b/src/odb/src/db/dbTechLayerCutSpacingRule.cpp @@ -554,10 +554,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbTechLayerCutSpacingRule& obj) return stream; } -_dbTechLayerCutSpacingRule::~_dbTechLayerCutSpacingRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerCutSpacingRule - Methods @@ -1458,4 +1454,4 @@ void dbTechLayerCutSpacingRule::destroy(dbTechLayerCutSpacingRule* rule) } // User Code End dbTechLayerCutSpacingRulePublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbTechLayerCutSpacingRule.h b/src/odb/src/db/dbTechLayerCutSpacingRule.h index 95b29bb375a..05ea8a15c7c 100644 --- a/src/odb/src/db/dbTechLayerCutSpacingRule.h +++ b/src/odb/src/db/dbTechLayerCutSpacingRule.h @@ -93,7 +93,8 @@ class _dbTechLayerCutSpacingRule : public _dbObject public: _dbTechLayerCutSpacingRule(_dbDatabase*, const _dbTechLayerCutSpacingRule& r); _dbTechLayerCutSpacingRule(_dbDatabase*); - ~_dbTechLayerCutSpacingRule(); + + ~_dbTechLayerCutSpacingRule() = default; bool operator==(const _dbTechLayerCutSpacingRule& rhs) const; bool operator!=(const _dbTechLayerCutSpacingRule& rhs) const diff --git a/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.cpp b/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.cpp index 89b9daef0bd..d7aede96115 100644 --- a/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.cpp +++ b/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.cpp @@ -315,10 +315,6 @@ dbOStream& operator<<(dbOStream& stream, return stream; } -_dbTechLayerCutSpacingTableDefRule::~_dbTechLayerCutSpacingTableDefRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerCutSpacingTableDefRule - Methods @@ -1063,4 +1059,4 @@ void dbTechLayerCutSpacingTableDefRule::destroy( // User Code End dbTechLayerCutSpacingTableDefRulePublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.h b/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.h index 61cefe441bc..5de25673a3f 100644 --- a/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.h +++ b/src/odb/src/db/dbTechLayerCutSpacingTableDefRule.h @@ -82,7 +82,8 @@ class _dbTechLayerCutSpacingTableDefRule : public _dbObject _dbDatabase*, const _dbTechLayerCutSpacingTableDefRule& r); _dbTechLayerCutSpacingTableDefRule(_dbDatabase*); - ~_dbTechLayerCutSpacingTableDefRule(); + + ~_dbTechLayerCutSpacingTableDefRule() = default; bool operator==(const _dbTechLayerCutSpacingTableDefRule& rhs) const; bool operator!=(const _dbTechLayerCutSpacingTableDefRule& rhs) const diff --git a/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.cpp b/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.cpp index 74824677d96..41f95ccc515 100644 --- a/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.cpp +++ b/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.cpp @@ -98,10 +98,6 @@ dbOStream& operator<<(dbOStream& stream, return stream; } -_dbTechLayerCutSpacingTableOrthRule::~_dbTechLayerCutSpacingTableOrthRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerCutSpacingTableOrthRule - Methods @@ -154,4 +150,4 @@ void dbTechLayerCutSpacingTableOrthRule::destroy( // User Code End dbTechLayerCutSpacingTableOrthRulePublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.h b/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.h index 7b353d5a2ef..bd467c5c462 100644 --- a/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.h +++ b/src/odb/src/db/dbTechLayerCutSpacingTableOrthRule.h @@ -50,7 +50,8 @@ class _dbTechLayerCutSpacingTableOrthRule : public _dbObject _dbDatabase*, const _dbTechLayerCutSpacingTableOrthRule& r); _dbTechLayerCutSpacingTableOrthRule(_dbDatabase*); - ~_dbTechLayerCutSpacingTableOrthRule(); + + ~_dbTechLayerCutSpacingTableOrthRule() = default; bool operator==(const _dbTechLayerCutSpacingTableOrthRule& rhs) const; bool operator!=(const _dbTechLayerCutSpacingTableOrthRule& rhs) const diff --git a/src/odb/src/db/dbTechLayerEolExtensionRule.cpp b/src/odb/src/db/dbTechLayerEolExtensionRule.cpp index a332cf00a44..69813265307 100644 --- a/src/odb/src/db/dbTechLayerEolExtensionRule.cpp +++ b/src/odb/src/db/dbTechLayerEolExtensionRule.cpp @@ -128,10 +128,6 @@ dbOStream& operator<<(dbOStream& stream, return stream; } -_dbTechLayerEolExtensionRule::~_dbTechLayerEolExtensionRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerEolExtensionRule - Methods @@ -204,4 +200,4 @@ void dbTechLayerEolExtensionRule::destroy(dbTechLayerEolExtensionRule* rule) // User Code End dbTechLayerEolExtensionRulePublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbTechLayerEolExtensionRule.h b/src/odb/src/db/dbTechLayerEolExtensionRule.h index 31e63b810c0..d30f4fdb9d7 100644 --- a/src/odb/src/db/dbTechLayerEolExtensionRule.h +++ b/src/odb/src/db/dbTechLayerEolExtensionRule.h @@ -55,7 +55,8 @@ class _dbTechLayerEolExtensionRule : public _dbObject _dbTechLayerEolExtensionRule(_dbDatabase*, const _dbTechLayerEolExtensionRule& r); _dbTechLayerEolExtensionRule(_dbDatabase*); - ~_dbTechLayerEolExtensionRule(); + + ~_dbTechLayerEolExtensionRule() = default; bool operator==(const _dbTechLayerEolExtensionRule& rhs) const; bool operator!=(const _dbTechLayerEolExtensionRule& rhs) const diff --git a/src/odb/src/db/dbTechLayerEolKeepOutRule.cpp b/src/odb/src/db/dbTechLayerEolKeepOutRule.cpp index 6894c2cc3ce..8bc85797777 100644 --- a/src/odb/src/db/dbTechLayerEolKeepOutRule.cpp +++ b/src/odb/src/db/dbTechLayerEolKeepOutRule.cpp @@ -187,10 +187,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbTechLayerEolKeepOutRule& obj) return stream; } -_dbTechLayerEolKeepOutRule::~_dbTechLayerEolKeepOutRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerEolKeepOutRule - Methods @@ -358,4 +354,4 @@ void dbTechLayerEolKeepOutRule::destroy(dbTechLayerEolKeepOutRule* rule) // User Code End dbTechLayerEolKeepOutRulePublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbTechLayerEolKeepOutRule.h b/src/odb/src/db/dbTechLayerEolKeepOutRule.h index af60b4f674f..c6bd9a00cd1 100644 --- a/src/odb/src/db/dbTechLayerEolKeepOutRule.h +++ b/src/odb/src/db/dbTechLayerEolKeepOutRule.h @@ -59,7 +59,8 @@ class _dbTechLayerEolKeepOutRule : public _dbObject public: _dbTechLayerEolKeepOutRule(_dbDatabase*, const _dbTechLayerEolKeepOutRule& r); _dbTechLayerEolKeepOutRule(_dbDatabase*); - ~_dbTechLayerEolKeepOutRule(); + + ~_dbTechLayerEolKeepOutRule() = default; bool operator==(const _dbTechLayerEolKeepOutRule& rhs) const; bool operator!=(const _dbTechLayerEolKeepOutRule& rhs) const diff --git a/src/odb/src/db/dbTechLayerForbiddenSpacingRule.cpp b/src/odb/src/db/dbTechLayerForbiddenSpacingRule.cpp index 9272d4204ba..b816baf4f20 100644 --- a/src/odb/src/db/dbTechLayerForbiddenSpacingRule.cpp +++ b/src/odb/src/db/dbTechLayerForbiddenSpacingRule.cpp @@ -133,10 +133,6 @@ dbOStream& operator<<(dbOStream& stream, return stream; } -_dbTechLayerForbiddenSpacingRule::~_dbTechLayerForbiddenSpacingRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerForbiddenSpacingRule - Methods @@ -269,4 +265,4 @@ void dbTechLayerForbiddenSpacingRule::destroy( // User Code End dbTechLayerForbiddenSpacingRulePublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbTechLayerForbiddenSpacingRule.h b/src/odb/src/db/dbTechLayerForbiddenSpacingRule.h index b41ede89318..4a8760c8c47 100644 --- a/src/odb/src/db/dbTechLayerForbiddenSpacingRule.h +++ b/src/odb/src/db/dbTechLayerForbiddenSpacingRule.h @@ -48,7 +48,8 @@ class _dbTechLayerForbiddenSpacingRule : public _dbObject _dbTechLayerForbiddenSpacingRule(_dbDatabase*, const _dbTechLayerForbiddenSpacingRule& r); _dbTechLayerForbiddenSpacingRule(_dbDatabase*); - ~_dbTechLayerForbiddenSpacingRule(); + + ~_dbTechLayerForbiddenSpacingRule() = default; bool operator==(const _dbTechLayerForbiddenSpacingRule& rhs) const; bool operator!=(const _dbTechLayerForbiddenSpacingRule& rhs) const diff --git a/src/odb/src/db/dbTechLayerKeepOutZoneRule.cpp b/src/odb/src/db/dbTechLayerKeepOutZoneRule.cpp index fc1d31dd0b6..c9f59d6d4a7 100644 --- a/src/odb/src/db/dbTechLayerKeepOutZoneRule.cpp +++ b/src/odb/src/db/dbTechLayerKeepOutZoneRule.cpp @@ -224,10 +224,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbTechLayerKeepOutZoneRule& obj) return stream; } -_dbTechLayerKeepOutZoneRule::~_dbTechLayerKeepOutZoneRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerKeepOutZoneRule - Methods diff --git a/src/odb/src/db/dbTechLayerKeepOutZoneRule.h b/src/odb/src/db/dbTechLayerKeepOutZoneRule.h index 566f8070a22..7fccca698b8 100644 --- a/src/odb/src/db/dbTechLayerKeepOutZoneRule.h +++ b/src/odb/src/db/dbTechLayerKeepOutZoneRule.h @@ -58,7 +58,8 @@ class _dbTechLayerKeepOutZoneRule : public _dbObject _dbTechLayerKeepOutZoneRule(_dbDatabase*, const _dbTechLayerKeepOutZoneRule& r); _dbTechLayerKeepOutZoneRule(_dbDatabase*); - ~_dbTechLayerKeepOutZoneRule(); + + ~_dbTechLayerKeepOutZoneRule() = default; bool operator==(const _dbTechLayerKeepOutZoneRule& rhs) const; bool operator!=(const _dbTechLayerKeepOutZoneRule& rhs) const diff --git a/src/odb/src/db/dbTechLayerMinCutRule.cpp b/src/odb/src/db/dbTechLayerMinCutRule.cpp index 09cece180a2..d9d4e354a56 100644 --- a/src/odb/src/db/dbTechLayerMinCutRule.cpp +++ b/src/odb/src/db/dbTechLayerMinCutRule.cpp @@ -222,10 +222,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbTechLayerMinCutRule& obj) return stream; } -_dbTechLayerMinCutRule::~_dbTechLayerMinCutRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerMinCutRule - Methods diff --git a/src/odb/src/db/dbTechLayerMinCutRule.h b/src/odb/src/db/dbTechLayerMinCutRule.h index bd69e6c6884..7b60716e1d9 100644 --- a/src/odb/src/db/dbTechLayerMinCutRule.h +++ b/src/odb/src/db/dbTechLayerMinCutRule.h @@ -61,7 +61,8 @@ class _dbTechLayerMinCutRule : public _dbObject public: _dbTechLayerMinCutRule(_dbDatabase*, const _dbTechLayerMinCutRule& r); _dbTechLayerMinCutRule(_dbDatabase*); - ~_dbTechLayerMinCutRule(); + + ~_dbTechLayerMinCutRule() = default; bool operator==(const _dbTechLayerMinCutRule& rhs) const; bool operator!=(const _dbTechLayerMinCutRule& rhs) const diff --git a/src/odb/src/db/dbTechLayerMinStepRule.cpp b/src/odb/src/db/dbTechLayerMinStepRule.cpp index 6aa032e34ad..2be1355088e 100644 --- a/src/odb/src/db/dbTechLayerMinStepRule.cpp +++ b/src/odb/src/db/dbTechLayerMinStepRule.cpp @@ -203,10 +203,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbTechLayerMinStepRule& obj) return stream; } -_dbTechLayerMinStepRule::~_dbTechLayerMinStepRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerMinStepRule - Methods @@ -413,4 +409,4 @@ void dbTechLayerMinStepRule::destroy(dbTechLayerMinStepRule* rule) } // User Code End dbTechLayerMinStepRulePublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbTechLayerMinStepRule.h b/src/odb/src/db/dbTechLayerMinStepRule.h index 5d9f65e100a..b6fb27e31c5 100644 --- a/src/odb/src/db/dbTechLayerMinStepRule.h +++ b/src/odb/src/db/dbTechLayerMinStepRule.h @@ -59,7 +59,8 @@ class _dbTechLayerMinStepRule : public _dbObject public: _dbTechLayerMinStepRule(_dbDatabase*, const _dbTechLayerMinStepRule& r); _dbTechLayerMinStepRule(_dbDatabase*); - ~_dbTechLayerMinStepRule(); + + ~_dbTechLayerMinStepRule() = default; bool operator==(const _dbTechLayerMinStepRule& rhs) const; bool operator!=(const _dbTechLayerMinStepRule& rhs) const diff --git a/src/odb/src/db/dbTechLayerSpacingEolRule.cpp b/src/odb/src/db/dbTechLayerSpacingEolRule.cpp index ef524799de1..3e11636e048 100644 --- a/src/odb/src/db/dbTechLayerSpacingEolRule.cpp +++ b/src/odb/src/db/dbTechLayerSpacingEolRule.cpp @@ -697,10 +697,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbTechLayerSpacingEolRule& obj) return stream; } -_dbTechLayerSpacingEolRule::~_dbTechLayerSpacingEolRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerSpacingEolRule - Methods @@ -1755,4 +1751,4 @@ void dbTechLayerSpacingEolRule::destroy(dbTechLayerSpacingEolRule* rule) // User Code End dbTechLayerSpacingEolRulePublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbTechLayerSpacingEolRule.h b/src/odb/src/db/dbTechLayerSpacingEolRule.h index 56fe22c1e8d..8b4f39d88f8 100644 --- a/src/odb/src/db/dbTechLayerSpacingEolRule.h +++ b/src/odb/src/db/dbTechLayerSpacingEolRule.h @@ -96,7 +96,8 @@ class _dbTechLayerSpacingEolRule : public _dbObject public: _dbTechLayerSpacingEolRule(_dbDatabase*, const _dbTechLayerSpacingEolRule& r); _dbTechLayerSpacingEolRule(_dbDatabase*); - ~_dbTechLayerSpacingEolRule(); + + ~_dbTechLayerSpacingEolRule() = default; bool operator==(const _dbTechLayerSpacingEolRule& rhs) const; bool operator!=(const _dbTechLayerSpacingEolRule& rhs) const diff --git a/src/odb/src/db/dbTechLayerSpacingTablePrlRule.cpp b/src/odb/src/db/dbTechLayerSpacingTablePrlRule.cpp index 1880d279553..38609d639ee 100644 --- a/src/odb/src/db/dbTechLayerSpacingTablePrlRule.cpp +++ b/src/odb/src/db/dbTechLayerSpacingTablePrlRule.cpp @@ -149,10 +149,6 @@ dbOStream& operator<<(dbOStream& stream, return stream; } -_dbTechLayerSpacingTablePrlRule::~_dbTechLayerSpacingTablePrlRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerSpacingTablePrlRule - Methods @@ -336,4 +332,4 @@ std::pair dbTechLayerSpacingTablePrlRule::getExceptWithin( // User Code End dbTechLayerSpacingTablePrlRulePublicMethods } // namespace odb - // Generator Code End Cpp +// Generator Code End Cpp diff --git a/src/odb/src/db/dbTechLayerSpacingTablePrlRule.h b/src/odb/src/db/dbTechLayerSpacingTablePrlRule.h index 4dc9f87c188..6dd9c3ea4f5 100644 --- a/src/odb/src/db/dbTechLayerSpacingTablePrlRule.h +++ b/src/odb/src/db/dbTechLayerSpacingTablePrlRule.h @@ -61,7 +61,8 @@ class _dbTechLayerSpacingTablePrlRule : public _dbObject _dbTechLayerSpacingTablePrlRule(_dbDatabase*, const _dbTechLayerSpacingTablePrlRule& r); _dbTechLayerSpacingTablePrlRule(_dbDatabase*); - ~_dbTechLayerSpacingTablePrlRule(); + + ~_dbTechLayerSpacingTablePrlRule() = default; bool operator==(const _dbTechLayerSpacingTablePrlRule& rhs) const; bool operator!=(const _dbTechLayerSpacingTablePrlRule& rhs) const diff --git a/src/odb/src/db/dbTechLayerWidthTableRule.cpp b/src/odb/src/db/dbTechLayerWidthTableRule.cpp index dfbd105b9c8..f2b2ec152ed 100644 --- a/src/odb/src/db/dbTechLayerWidthTableRule.cpp +++ b/src/odb/src/db/dbTechLayerWidthTableRule.cpp @@ -120,10 +120,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbTechLayerWidthTableRule& obj) return stream; } -_dbTechLayerWidthTableRule::~_dbTechLayerWidthTableRule() -{ -} - //////////////////////////////////////////////////////////////////// // // dbTechLayerWidthTableRule - Methods diff --git a/src/odb/src/db/dbTechLayerWidthTableRule.h b/src/odb/src/db/dbTechLayerWidthTableRule.h index 74e24d97bdb..f517f4d3ed4 100644 --- a/src/odb/src/db/dbTechLayerWidthTableRule.h +++ b/src/odb/src/db/dbTechLayerWidthTableRule.h @@ -55,7 +55,8 @@ class _dbTechLayerWidthTableRule : public _dbObject public: _dbTechLayerWidthTableRule(_dbDatabase*, const _dbTechLayerWidthTableRule& r); _dbTechLayerWidthTableRule(_dbDatabase*); - ~_dbTechLayerWidthTableRule(); + + ~_dbTechLayerWidthTableRule() = default; bool operator==(const _dbTechLayerWidthTableRule& rhs) const; bool operator!=(const _dbTechLayerWidthTableRule& rhs) const