Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/odb/include/odb/dbStream.h
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ class dbIStream
T2 val;
*this >> key;
*this >> val;
m[key] = val;
m[key] = std::move(val);
}
return *this;
}
Expand All @@ -405,7 +405,7 @@ class dbIStream
T2 val;
*this >> key;
*this >> val;
m[key] = val;
m[key] = std::move(val);
}
return *this;
}
Expand All @@ -420,7 +420,7 @@ class dbIStream
T2 val;
*this >> key;
*this >> val;
m[key] = val;
m[key] = std::move(val);
}
return *this;
}
Expand All @@ -435,7 +435,7 @@ class dbIStream
for (uint i = 0; i < sz; i++) {
T1 val;
*this >> val;
m.push_back(val);
m.push_back(std::move(val));
}
return *this;
}
Expand Down Expand Up @@ -501,7 +501,7 @@ class dbIStream
if (I == index) {
std::variant_alternative_t<I, std::variant<Ts...>> val;
*this >> val;
v = val;
v = std::move(val);
}
return (*this).variantHelper<I + 1>(index, v);
}
Expand Down
2 changes: 1 addition & 1 deletion src/odb/src/codeGenerator/schema/chip/dbChipConn.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "dbObject",
"fields": [
{ "name": "name_", "type": "std::string", "flags": ["no-set"] },
{ "name": "thickness_", "type": "int", "flags": [] },
{ "name": "thickness_", "type": "int", "flags": [], "default": 0 },
{ "name": "chip_", "type": "dbId<_dbChip>", "flags": ["private"] },
{ "name": "chip_conn_next_", "type": "dbId<_dbChipConn>", "flags": ["private"] },
{ "name": "top_region_", "type": "dbId<_dbChipRegionInst>", "flags": ["private"] },
Expand Down
3 changes: 2 additions & 1 deletion src/odb/src/codeGenerator/schema/chip/dbChipInst.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
{
"name": "orient_",
"type": "dbOrientType::Value",
"flags": ["private" ,"cmpgt", "no-serial"]
"flags": ["private" ,"cmpgt", "no-serial"],
"default": "dbOrientType::R0"
},
{
"name": "master_chip_",
Expand Down
2 changes: 1 addition & 1 deletion src/odb/src/codeGenerator/schema/chip/dbChipRegion.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
],
"fields": [
{ "name": "name_", "type": "std::string", "flags": ["no-set"]},
{ "name": "side_", "type": "uint8_t", "flags": ["private"] },
{ "name": "side_", "type": "uint8_t", "flags": ["private"] , "default": "static_cast<uint8_t>(dbChipRegion::Side::FRONT)"},
{ "name": "layer_", "type": "dbId<_dbTechLayer>", "flags": ["private"] },
{ "name": "box_", "type": "Rect", "flags": ["set-const-ref"]}
],
Expand Down
1 change: 1 addition & 0 deletions src/odb/src/db/dbChipConn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ bool _dbChipConn::operator<(const _dbChipConn& rhs) const

_dbChipConn::_dbChipConn(_dbDatabase* db)
{
thickness_ = 0;
}

dbIStream& operator>>(dbIStream& stream, _dbChipConn& obj)
Expand Down
1 change: 1 addition & 0 deletions src/odb/src/db/dbChipInst.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ bool _dbChipInst::operator<(const _dbChipInst& rhs) const

_dbChipInst::_dbChipInst(_dbDatabase* db)
{
orient_ = dbOrientType::R0;
}

dbIStream& operator>>(dbIStream& stream, _dbChipInst& obj)
Expand Down
1 change: 1 addition & 0 deletions src/odb/src/db/dbChipRegion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ bool _dbChipRegion::operator<(const _dbChipRegion& rhs) const

_dbChipRegion::_dbChipRegion(_dbDatabase* db)
{
side_ = static_cast<uint8_t>(dbChipRegion::Side::FRONT);
chip_bump_tbl_ = new dbTable<_dbChipBump>(
db, this, (GetObjTbl_t) &_dbChipRegion::getObjectTable, dbChipBumpObj);
}
Expand Down