Don't pollute namespace w/ using odb::dbITerm; in header files.

Signed-off-by: Henner Zeller <[email protected]>

Author: hzeller

src/est/src/OdbCallBack.cpp

@@ -88,7 +88,7 @@ void OdbCallBack::inDbNetDestroy(odb::dbNet* net)
   }
 }
 
-void OdbCallBack::inDbITermPostConnect(dbITerm* iterm)
+void OdbCallBack::inDbITermPostConnect(odb::dbITerm* iterm)
 {
   debugPrint(estimate_parasitics_->getLogger(),
              utl::EST,
@@ -102,7 +102,7 @@ void OdbCallBack::inDbITermPostConnect(dbITerm* iterm)
   }
 }
 
-void OdbCallBack::inDbITermPostDisconnect(dbITerm* iterm, odb::dbNet* net)
+void OdbCallBack::inDbITermPostDisconnect(odb::dbITerm* iterm, odb::dbNet* net)
 {
   debugPrint(estimate_parasitics_->getLogger(),
              utl::EST,

src/est/src/OdbCallBack.h

@@ -12,7 +12,6 @@ namespace est {
 class EstimateParasitics;
 
 using odb::dbBlockCallBackObj;
-using odb::dbITerm;
 using sta::dbNetwork;
 using sta::Network;
 
@@ -26,8 +25,8 @@ class OdbCallBack : public dbBlockCallBackObj
   void inDbInstCreate(odb::dbInst* inst) override;
   void inDbNetCreate(odb::dbNet* net) override;
   void inDbNetDestroy(odb::dbNet* net) override;
-  void inDbITermPostConnect(dbITerm* iterm) override;
-  void inDbITermPostDisconnect(dbITerm* iterm, odb::dbNet* net) override;
+  void inDbITermPostConnect(odb::dbITerm* iterm) override;
+  void inDbITermPostDisconnect(odb::dbITerm* iterm, odb::dbNet* net) override;
   void inDbInstSwapMasterAfter(odb::dbInst* inst) override;
 
  private:

src/rcx/include/rcx/dbUtil.h

@@ -20,7 +20,6 @@ class Logger;
 
 namespace rcx {
 
-using odb::dbITerm;
 using odb::dbMatrix;
 using odb::dbObject;
 using odb::dbSBox;

src/rcx/include/rcx/extRCap.h

@@ -1774,7 +1774,7 @@ class extMain
   uint makeNetRCsegs_v2(odb::dbNet* net, bool skipStartWarning = false);
   uint resetMapNodes_v2(odb::dbWire* wire);
 
-  uint getCapNodeId_v2(dbITerm* iterm, const uint junction);
+  uint getCapNodeId_v2(odb::dbITerm* iterm, const uint junction);
   uint getCapNodeId_v2(odb::dbBTerm* bterm, const uint junction);
   uint getCapNodeId_v2(odb::dbNet* net, const int junction, const bool branch);
   uint getCapNodeId_v2(odb::dbNet* net,

src/rcx/src/extFlow_v2.cpp

@@ -1561,7 +1561,7 @@ void extMain::addItermShapesOnPlanes(dbInst* inst,
                                      const bool rotatedFlag,
                                      const bool swap_coords)
 {
-  for (dbITerm* iterm : inst->getITerms()) {
+  for (odb::dbITerm* iterm : inst->getITerms()) {
     dbShape s;
     dbITermShapeItr term_shapes;
     for (term_shapes.begin(iterm); term_shapes.next(s);) {

src/rcx/src/extSpef.cpp

@@ -300,7 +300,7 @@ void extSpef::writeNameNode(dbCapNode* node)
 
 void extSpef::writeITermNode(const uint node)
 {
-  dbITerm* iterm = dbITerm::getITerm(_block, node);
+  odb::dbITerm* iterm = odb::dbITerm::getITerm(_block, node);
   dbInst* inst = iterm->getInst();
   if (inst->getMaster()->isMarked()) {
     return;
@@ -341,7 +341,7 @@ void extSpef::writeITermNode(const uint node)
 
 void extSpef::writeITerm(const uint node)
 {
-  dbITerm* iterm = dbITerm::getITerm(_block, node);
+  odb::dbITerm* iterm = odb::dbITerm::getITerm(_block, node);
   if (iterm->getInst()->getMaster()->isMarked()) {
     return;
   }
@@ -442,7 +442,10 @@ void extSpef::writeCapNode(dbCapNode* capNode, uint netId)
 
 void extSpef::writeCapITerm(const uint node, const uint capIndex)
 {
-  if ((dbITerm::getITerm(_block, node))->getInst()->getMaster()->isMarked()) {
+  if ((odb::dbITerm::getITerm(_block, node))
+          ->getInst()
+          ->getMaster()
+          ->isMarked()) {
     return;
   }
   writeCNodeNumber();
@@ -1362,7 +1365,7 @@ void extSpef::writeNetMap(dbSet<dbNet>& nets)
       continue;
     }
     net->setMark_1(true);
-    for (dbITerm* iterm : net->getITerms()) {
+    for (odb::dbITerm* iterm : net->getITerms()) {
       iterm->getInst()->setUserFlag1();
     }
     for (odb::dbBTerm* bterm : net->getBTerms()) {