odb: fix code generator for _name to name_ change

The free call got lost.

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

Author: maliberty

src/odb/src/codeGenerator/templates/impl.cpp

@@ -158,9 +158,9 @@ namespace odb {
     _{{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);
+        {% if field.name == 'name_' and field.type == "char *" %}
+          if (name_) {
+            free((void*) name_);
           }
         {% endif %}
         {% if field.table %}

src/odb/src/db/dbChip.cpp

@@ -22,6 +22,8 @@
 #include "odb/db.h"
 #include "odb/dbSet.h"
 // User Code Begin Includes
+#include <cstdlib>
+
 #include "dbChipConnItr.h"
 #include "dbChipInst.h"
 #include "dbChipInstItr.h"
@@ -329,6 +331,9 @@ void _dbChip::collectMemInfo(MemInfo& info)
 
 _dbChip::~_dbChip()
 {
+  if (name_) {
+    free((void*) name_);
+  }
   delete prop_tbl_;
   delete chip_region_tbl_;
   delete marker_categories_tbl_;

src/odb/src/db/dbMarkerCategory.cpp

@@ -132,6 +132,9 @@ void _dbMarkerCategory::collectMemInfo(MemInfo& info)
 
 _dbMarkerCategory::~_dbMarkerCategory()
 {
+  if (name_) {
+    free((void*) name_);
+  }
   delete marker_tbl_;
   delete categories_tbl_;
 }

src/odb/src/db/dbModBTerm.cpp

@@ -145,6 +145,9 @@ void _dbModBTerm::collectMemInfo(MemInfo& info)
 
 _dbModBTerm::~_dbModBTerm()
 {
+  if (name_) {
+    free((void*) name_);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////

src/odb/src/db/dbModITerm.cpp

@@ -133,6 +133,9 @@ void _dbModITerm::collectMemInfo(MemInfo& info)
 
 _dbModITerm::~_dbModITerm()
 {
+  if (name_) {
+    free((void*) name_);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////

src/odb/src/db/dbModule.cpp

@@ -129,6 +129,9 @@ void _dbModule::collectMemInfo(MemInfo& info)
 
 _dbModule::~_dbModule()
 {
+  if (name_) {
+    free((void*) name_);
+  }
   // User Code Begin Destructor
   delete _port_iter;
   // User Code End Destructor