Skip to content

Commit c04b952

Browse files
authored
Merge pull request #7809 from Faholan/defin_units
Remove useless _update field and add CHECKBLOCK for units
2 parents 7349d56 + ff4f403 commit c04b952

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

src/odb/src/defin/definReader.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,6 @@ void definReader::init()
250250
make(_non_default_ruleR);
251251
make(_prop_defsR);
252252
make(_pin_propsR);
253-
254-
_update = false;
255253
}
256254

257255
void definReader::setTech(dbTech* tech)
@@ -1491,6 +1489,7 @@ int definReader::unitsCallback(DefParser::defrCallbackType_e type,
14911489
DefParser::defiUserData data)
14921490
{
14931491
definReader* reader = (definReader*) data;
1492+
CHECKBLOCK
14941493

14951494
// Truncation error
14961495
if (d > reader->_tech->getDbUnitsPerMicron()) {
@@ -1509,9 +1508,7 @@ int definReader::unitsCallback(DefParser::defrCallbackType_e type,
15091508
(*itr)->units(d);
15101509
}
15111510

1512-
if (!reader->_update) {
1513-
reader->_block->setDefUnits(d);
1514-
}
1511+
reader->_block->setDefUnits(d);
15151512
return PARSE_OK;
15161513
}
15171514

src/odb/src/defin/definReader.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ class definReader : public definBase
242242
std::unique_ptr<definPropDefs> _prop_defsR;
243243
std::unique_ptr<definPinProps> _pin_propsR;
244244
std::vector<definBase*> _interfaces;
245-
bool _update{false};
246245
bool _continue_on_errors{false};
247246
std::string _block_name;
248247
std::string version_;

0 commit comments

Comments
 (0)