Merge pull request The-OpenROAD-Project#8659 from hzeller/feature-20251015-using-odb

Fix remaining `using odb::<sometype>` in header files that were polluting the namespace

Author: maliberty

src/drt/src/TritonRoute.cpp

@@ -44,6 +44,7 @@
 #include "odb/db.h"
 #include "odb/dbId.h"
 #include "odb/dbShape.h"
+#include "odb/dbTypes.h"
 #include "pa/AbstractPAGraphics.h"
 #include "pa/FlexPA.h"
 #include "rp/FlexRP.h"
@@ -55,6 +56,8 @@
 #include "utl/Logger.h"
 #include "utl/ScopedTemporaryFile.h"
 
+using odb::dbTechLayerType;
+
 namespace drt {
 
 TritonRoute::TritonRoute(odb::dbDatabase* db,

src/drt/src/db/obj/frNet.h

@@ -20,6 +20,7 @@
 #include "db/obj/frVia.h"
 #include "frBaseTypes.h"
 #include "global.h"
+#include "odb/dbTypes.h"
 
 namespace drt {
 class frInstTerm;
@@ -188,8 +189,8 @@ class frNet : public frBlockObject
     vias_.clear();
     pwires_.clear();
   }
-  dbSigType getType() const { return type_; }
-  void setType(const dbSigType& in) { type_ = in; }
+  odb::dbSigType getType() const { return type_; }
+  void setType(const odb::dbSigType& in) { type_ = in; }
   frBlockObjectEnum typeId() const override { return frcNet; }
   void updateNondefaultRule(frNonDefaultRule* n)
   {
@@ -251,7 +252,7 @@ class frNet : public frBlockObject
   std::vector<std::unique_ptr<frRPin>> rpins_;
   std::vector<std::unique_ptr<frGuide>> guides_;
   std::vector<frRect> orig_guides_;
-  dbSigType type_{dbSigType::SIGNAL};
+  odb::dbSigType type_{odb::dbSigType::SIGNAL};
   bool modified_{false};
   bool isFakeNet_{false};  // indicate floating PG nets
   frNonDefaultRule* ndr_{nullptr};

src/drt/src/db/obj/frTerm.h

@@ -10,6 +10,7 @@
 #include "db/obj/frBlockObject.h"
 #include "db/obj/frNet.h"
 #include "frBaseTypes.h"
+#include "odb/dbTypes.h"
 #include "odb/geom.h"
 
 namespace drt {
@@ -21,10 +22,10 @@ class frTerm : public frBlockObject
   virtual frNet* getNet() const = 0;
   const frString& getName() const { return name_; }
   // setters
-  void setType(const dbSigType& in) { type_ = in; }
-  dbSigType getType() const { return type_; }
-  void setDirection(const dbIoType& in) { direction_ = in; }
-  dbIoType getDirection() const { return direction_; }
+  void setType(const odb::dbSigType& in) { type_ = in; }
+  odb::dbSigType getType() const { return type_; }
+  void setDirection(const odb::dbIoType& in) { direction_ = in; }
+  odb::dbIoType getDirection() const { return direction_; }
   // others
   void setIndexInOwner(int value) { index_in_owner_ = value; }
   int getIndexInOwner() { return index_in_owner_; }
@@ -47,8 +48,8 @@ class frTerm : public frBlockObject
 
   frString name_;        // A, B, Z, VSS, VDD
   frNet* net_{nullptr};  // set later, term in instTerm does not have net
-  dbSigType type_{dbSigType::SIGNAL};
-  dbIoType direction_{dbIoType::INPUT};
+  odb::dbSigType type_{odb::dbSigType::SIGNAL};
+  odb::dbIoType direction_{odb::dbIoType::INPUT};
   int index_in_owner_{0};
   odb::Rect bbox_;
 };

src/drt/src/db/tech/frLayer.h

@@ -109,7 +109,7 @@ class frLayer
   {
     return (fakeCut_ || fakeMasterslice_)
                ? false
-               : db_layer_->getType() == dbTechLayerType::ROUTING;
+               : db_layer_->getType() == odb::dbTechLayerType::ROUTING;
   }
   bool isUnidirectional() const
   {
@@ -137,14 +137,14 @@ class frLayer
   {
     return viaDefs_;
   }
-  dbTechLayerType getType() const
+  odb::dbTechLayerType getType() const
   {
     if (fakeCut_) {
-      return dbTechLayerType::CUT;
+      return odb::dbTechLayerType::CUT;
     }
 
     if (fakeMasterslice_) {
-      return dbTechLayerType::MASTERSLICE;
+      return odb::dbTechLayerType::MASTERSLICE;
     }
 
     return db_layer_->getType();

src/drt/src/db/tech/frTechObject.h

@@ -244,9 +244,9 @@ class frTechObject
     logger->report("Reporting layer properties.");
     for (auto& layer : layers_) {
       auto type = layer->getType();
-      if (type == dbTechLayerType::CUT) {
+      if (type == odb::dbTechLayerType::CUT) {
         logger->report("Cut layer {}.", layer->getName());
-      } else if (type == dbTechLayerType::ROUTING) {
+      } else if (type == odb::dbTechLayerType::ROUTING) {
         logger->report("Routing layer {}.", layer->getName());
       }
       layer->printAllConstraints(logger);
@@ -257,7 +257,7 @@ class frTechObject
   {
     logger->info(DRT, 167, "List of default vias:");
     for (auto& layer : layers_) {
-      if (layer->getType() == dbTechLayerType::CUT
+      if (layer->getType() == odb::dbTechLayerType::CUT
           && layer->getLayerNum() >= router_cfg->BOTTOM_ROUTING_LAYER) {
         logger->report("  Layer {}", layer->getName());
         if (layer->getDefaultViaDef() != nullptr) {

src/drt/src/dr/FlexDR.cpp

@@ -55,6 +55,8 @@
 #include "utl/ScopedTemporaryFile.h"
 #include "utl/exception.h"
 
+using odb::dbTechLayerType;
+
 BOOST_CLASS_EXPORT(drt::RoutingJobDescription)
 
 namespace drt {

src/drt/src/dr/FlexDR_init.cpp

@@ -37,6 +37,7 @@
 #include "utl/Logger.h"
 
 using odb::dbTechLayerDir;
+using odb::dbTechLayerType;
 
 namespace drt {
 

src/drt/src/dr/FlexDR_maze.cpp

@@ -42,6 +42,7 @@
 #include "utl/Logger.h"
 
 using odb::dbTechLayerDir;
+using odb::dbTechLayerType;
 
 namespace drt {
 

src/drt/src/dr/FlexGridGraph.cpp

@@ -20,6 +20,7 @@
 #include "odb/geom.h"
 
 using odb::dbTechLayerDir;
+using odb::dbTechLayerType;
 
 namespace drt {
 void FlexGridGraph::addAccessPointLocation(frLayerNum layer_num,

src/drt/src/frBaseTypes.h

@@ -44,9 +44,6 @@ template <typename T>
 using frList = std::list<T>;
 template <typename T>
 using frListIter = typename std::list<T>::iterator;
-using odb::dbIoType;
-using odb::dbSigType;
-using odb::dbTechLayerType;
 
 enum frEndStyleEnum
 {