Skip to content

Commit 022b25d

Browse files
committed
odb: fix codegen check for _name to name_
Signed-off-by: Matt Liberty <[email protected]>
1 parent 06b97b3 commit 022b25d

25 files changed

+100
-1
lines changed

src/odb/src/codeGenerator/gen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def add_field_attributes(field, klass, flags_struct, schema):
202202

203203
# For fields that we need to free/destroy in the destructor
204204
if (
205-
field["name"] == "_name"
205+
field["name"] == "name_"
206206
and "no-destruct" not in field["flags"]
207207
or "table" in field
208208
):

src/odb/src/db/dbChipConn.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ void _dbChipConn::collectMemInfo(MemInfo& info)
8484
info.size += sizeof(*this);
8585
}
8686

87+
_dbChipConn::~_dbChipConn()
88+
{
89+
}
90+
8791
////////////////////////////////////////////////////////////////////
8892
//
8993
// dbChipConn - Methods

src/odb/src/db/dbChipConn.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ class _dbChipConn : public _dbObject
2424
public:
2525
_dbChipConn(_dbDatabase*);
2626

27+
~_dbChipConn();
28+
2729
bool operator==(const _dbChipConn& rhs) const;
2830
bool operator!=(const _dbChipConn& rhs) const { return !operator==(rhs); }
2931
bool operator<(const _dbChipConn& rhs) const;

src/odb/src/db/dbChipInst.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ void _dbChipInst::collectMemInfo(MemInfo& info)
9393
info.size += sizeof(*this);
9494
}
9595

96+
_dbChipInst::~_dbChipInst()
97+
{
98+
}
99+
96100
////////////////////////////////////////////////////////////////////
97101
//
98102
// dbChipInst - Methods

src/odb/src/db/dbChipInst.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ class _dbChipInst : public _dbObject
2828
public:
2929
_dbChipInst(_dbDatabase*);
3030

31+
~_dbChipInst();
32+
3133
bool operator==(const _dbChipInst& rhs) const;
3234
bool operator!=(const _dbChipInst& rhs) const { return !operator==(rhs); }
3335
bool operator<(const _dbChipInst& rhs) const;

src/odb/src/db/dbChipNet.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ void _dbChipNet::collectMemInfo(MemInfo& info)
6767
info.size += sizeof(*this);
6868
}
6969

70+
_dbChipNet::~_dbChipNet()
71+
{
72+
}
73+
7074
////////////////////////////////////////////////////////////////////
7175
//
7276
// dbChipNet - Methods

src/odb/src/db/dbChipNet.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class _dbChipNet : public _dbObject
2727
public:
2828
_dbChipNet(_dbDatabase*);
2929

30+
~_dbChipNet();
31+
3032
bool operator==(const _dbChipNet& rhs) const;
3133
bool operator!=(const _dbChipNet& rhs) const { return !operator==(rhs); }
3234
bool operator<(const _dbChipNet& rhs) const;

src/odb/src/db/dbGroup.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,13 @@ void _dbGroup::collectMemInfo(MemInfo& info)
150150
// User Code End collectMemInfo
151151
}
152152

153+
_dbGroup::~_dbGroup()
154+
{
155+
if (name_) {
156+
free((void*) name_);
157+
}
158+
}
159+
153160
////////////////////////////////////////////////////////////////////
154161
//
155162
// dbGroup - Methods

src/odb/src/db/dbGroup.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ class _dbGroup : public _dbObject
3232
public:
3333
_dbGroup(_dbDatabase*);
3434

35+
~_dbGroup();
36+
3537
bool operator==(const _dbGroup& rhs) const;
3638
bool operator!=(const _dbGroup& rhs) const { return !operator==(rhs); }
3739
bool operator<(const _dbGroup& rhs) const;

src/odb/src/db/dbIsolation.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,13 @@ void _dbIsolation::collectMemInfo(MemInfo& info)
105105
// User Code End collectMemInfo
106106
}
107107

108+
_dbIsolation::~_dbIsolation()
109+
{
110+
if (name_) {
111+
free((void*) name_);
112+
}
113+
}
114+
108115
////////////////////////////////////////////////////////////////////
109116
//
110117
// dbIsolation - Methods

0 commit comments

Comments
 (0)