odb: fix naming in dbTechVia.h & dbTechViaLayerRule.h

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

Author: maliberty

src/odb/src/db/dbBox.cpp

@@ -950,8 +950,8 @@ dbBox* dbBox::create(dbTechVia* via_,
   }
 
   // link box to via
-  box->next_box_ = via->_boxes;
-  via->_boxes = box->getOID();
+  box->next_box_ = via->boxes_;
+  via->boxes_ = box->getOID();
   return (dbBox*) box;
 }
 

src/odb/src/db/dbBoxItr.cpp

@@ -113,7 +113,7 @@ void dbBoxItr<page_size>::reverse(dbObject* parent)
 
     case dbTechViaObj: {
       _dbTechVia* via = (_dbTechVia*) parent;
-      uint id = via->_boxes;
+      uint id = via->boxes_;
       uint list = 0;
 
       while (id != 0) {
@@ -124,7 +124,7 @@ void dbBoxItr<page_size>::reverse(dbObject* parent)
         id = n;
       }
 
-      via->_boxes = list;
+      via->boxes_ = list;
       break;
     }
 
@@ -237,7 +237,7 @@ uint dbBoxItr<page_size>::begin(dbObject* parent) const
 
     case dbTechViaObj: {
       _dbTechVia* via = (_dbTechVia*) parent;
-      return via->_boxes;
+      return via->boxes_;
     }
 
     case dbBPinObj: {

src/odb/src/db/dbTechVia.cpp

@@ -66,7 +66,7 @@ bool _dbTechVia::operator==(const _dbTechVia& rhs) const
     return false;
   }
 
-  if (_boxes != rhs._boxes) {
+  if (boxes_ != rhs.boxes_) {
     return false;
   }
 
@@ -109,7 +109,7 @@ _dbTechVia::_dbTechVia(_dbDatabase*, const _dbTechVia& v)
       name_(nullptr),
       pattern_(nullptr),
       bbox_(v.bbox_),
-      _boxes(v._boxes),
+      boxes_(v.boxes_),
       top_(v.top_),
       bottom_(v.bottom_),
       non_default_rule_(v.non_default_rule_),
@@ -155,7 +155,7 @@ dbOStream& operator<<(dbOStream& stream, const _dbTechVia& via)
   stream << via.resistance_;
   stream << via.name_;
   stream << via.bbox_;
-  stream << via._boxes;
+  stream << via.boxes_;
   stream << via.top_;
   stream << via.bottom_;
   stream << via.non_default_rule_;
@@ -173,7 +173,7 @@ dbIStream& operator>>(dbIStream& stream, _dbTechVia& via)
   stream >> via.resistance_;
   stream >> via.name_;
   stream >> via.bbox_;
-  stream >> via._boxes;
+  stream >> via.boxes_;
   stream >> via.top_;
   stream >> via.bottom_;
   stream >> via.non_default_rule_;
@@ -365,7 +365,7 @@ void dbTechVia::setViaParams(const dbViaParams& params)
     tech->box_tbl_->destroy(box);
   }
 
-  via->_boxes = 0U;
+  via->boxes_ = 0U;
   via->via_params_ = params;
   via->top_ = params.top_layer_;
   via->bottom_ = params.bot_layer_;
@@ -421,7 +421,7 @@ dbTechVia* dbTechVia::clone(dbTechNonDefaultRule* rule_,
   via->flags_ = _invia->flags_;
   via->resistance_ = _invia->resistance_;
   via->bbox_ = _invia->bbox_;
-  via->_boxes = _invia->_boxes;
+  via->boxes_ = _invia->boxes_;
   via->top_ = _invia->top_;
   via->bottom_ = _invia->bottom_;
   via->non_default_rule_ = (rule) ? rule->getOID() : 0;

src/odb/src/db/dbTechVia.h

@@ -44,7 +44,7 @@ class _dbTechVia : public _dbObject
   char* name_;
   char* pattern_;
   dbId<_dbBox> bbox_;  // Caching the bbox speeds up defin imports.
-  dbId<_dbBox> _boxes;
+  dbId<_dbBox> boxes_;
   dbId<_dbTechLayer> top_;     // Caching the layer speeds up defin imports.
   dbId<_dbTechLayer> bottom_;  // Caching the layer speeds up defin imports.
   dbId<_dbTechNonDefaultRule> non_default_rule_;

src/odb/src/db/dbTechViaLayerRule.cpp

@@ -93,7 +93,7 @@ bool _dbTechViaLayerRule::operator==(const _dbTechViaLayerRule& rhs) const
     return false;
   }
 
-  if (_resistance != rhs._resistance) {
+  if (resistance_ != rhs.resistance_) {
     return false;
   }
 
@@ -119,7 +119,7 @@ _dbTechViaLayerRule::_dbTechViaLayerRule(_dbDatabase*,
       metal_overhang_(v.metal_overhang_),
       spacing_x_(v.spacing_x_),
       spacing_y_(v.spacing_y_),
-      _resistance(v._resistance),
+      resistance_(v.resistance_),
       rect_(v.rect_),
       layer_(v.layer_)
 {
@@ -144,7 +144,7 @@ _dbTechViaLayerRule::_dbTechViaLayerRule(_dbDatabase*)
   metal_overhang_ = 0;
   spacing_x_ = 0;
   spacing_y_ = 0;
-  _resistance = 0.0;
+  resistance_ = 0.0;
 }
 
 _dbTechViaLayerRule::~_dbTechViaLayerRule()
@@ -163,7 +163,7 @@ dbOStream& operator<<(dbOStream& stream, const _dbTechViaLayerRule& v)
   stream << v.metal_overhang_;
   stream << v.spacing_x_;
   stream << v.spacing_y_;
-  stream << v._resistance;
+  stream << v.resistance_;
   stream << v.rect_;
   stream << v.layer_;
   return stream;
@@ -181,7 +181,7 @@ dbIStream& operator>>(dbIStream& stream, _dbTechViaLayerRule& v)
   stream >> v.metal_overhang_;
   stream >> v.spacing_x_;
   stream >> v.spacing_y_;
-  stream >> v._resistance;
+  stream >> v.resistance_;
   stream >> v.rect_;
   stream >> v.layer_;
   return stream;
@@ -348,13 +348,13 @@ void dbTechViaLayerRule::setResistance(double r)
 {
   _dbTechViaLayerRule* rule = (_dbTechViaLayerRule*) this;
   rule->flags_.has_resistance = 1;
-  rule->_resistance = r;
+  rule->resistance_ = r;
 }
 
 double dbTechViaLayerRule::getResistance()
 {
   _dbTechViaLayerRule* rule = (_dbTechViaLayerRule*) this;
-  return rule->_resistance;
+  return rule->resistance_;
 }
 
 dbTechViaLayerRule* dbTechViaLayerRule::create(dbTech* tech_,

src/odb/src/db/dbTechViaLayerRule.h

@@ -57,7 +57,7 @@ class _dbTechViaLayerRule : public _dbObject
   int metal_overhang_;
   int spacing_x_;
   int spacing_y_;
-  double _resistance;
+  double resistance_;
   Rect rect_;
   dbId<_dbTechLayer> layer_;
 };