odb: avoid generating empty dtor

Signed-off-by: Matt Liberty <[email protected]>

Author: maliberty

src/odb/src/codeGenerator/gen.py

@@ -201,12 +201,16 @@ def add_field_attributes(field, klass, flags_struct, schema):
         field["setterArgumentType"] = field["getterReturnType"] = field["type"]
 
     # For fields that we need to free/destroy in the destructor
-    if (
+    needs_free = (
         field["name"] == "name_"
+        and field["type"] == "char *"
         and "no-destruct" not in field["flags"]
-        or "table" in field
-    ):
+    )
+
+    if needs_free or "table" in field:
         klass["needs_non_default_destructor"] = True
+        if needs_free:
+            klass["cpp_sys_includes"].extend(["cstdlib"])
     return flag_num_bits
 
 

src/odb/src/db/dbChipConn.cpp

@@ -84,10 +84,6 @@ void _dbChipConn::collectMemInfo(MemInfo& info)
   info.size += sizeof(*this);
 }
 
-_dbChipConn::~_dbChipConn()
-{
-}
-
 ////////////////////////////////////////////////////////////////////
 //
 // dbChipConn - Methods

src/odb/src/db/dbChipConn.h

@@ -24,8 +24,6 @@ class _dbChipConn : public _dbObject
  public:
   _dbChipConn(_dbDatabase*);
 
-  ~_dbChipConn();
-
   bool operator==(const _dbChipConn& rhs) const;
   bool operator!=(const _dbChipConn& rhs) const { return !operator==(rhs); }
   bool operator<(const _dbChipConn& rhs) const;

src/odb/src/db/dbChipInst.cpp

@@ -93,10 +93,6 @@ void _dbChipInst::collectMemInfo(MemInfo& info)
   info.size += sizeof(*this);
 }
 
-_dbChipInst::~_dbChipInst()
-{
-}
-
 ////////////////////////////////////////////////////////////////////
 //
 // dbChipInst - Methods

src/odb/src/db/dbChipInst.h

@@ -28,8 +28,6 @@ class _dbChipInst : public _dbObject
  public:
   _dbChipInst(_dbDatabase*);
 
-  ~_dbChipInst();
-
   bool operator==(const _dbChipInst& rhs) const;
   bool operator!=(const _dbChipInst& rhs) const { return !operator==(rhs); }
   bool operator<(const _dbChipInst& rhs) const;

src/odb/src/db/dbChipNet.cpp

@@ -67,10 +67,6 @@ void _dbChipNet::collectMemInfo(MemInfo& info)
   info.size += sizeof(*this);
 }
 
-_dbChipNet::~_dbChipNet()
-{
-}
-
 ////////////////////////////////////////////////////////////////////
 //
 // dbChipNet - Methods

src/odb/src/db/dbChipNet.h

@@ -27,8 +27,6 @@ class _dbChipNet : public _dbObject
  public:
   _dbChipNet(_dbDatabase*);
 
-  ~_dbChipNet();
-
   bool operator==(const _dbChipNet& rhs) const;
   bool operator!=(const _dbChipNet& rhs) const { return !operator==(rhs); }
   bool operator<(const _dbChipNet& rhs) const;