@@ -29,11 +29,6 @@ namespace dpl {
2929
3030using utl::Logger;
3131
32- using odb::dbDatabase;
33- using odb::dbMaster;
34- using odb::dbMasterType;
35- using odb::dbTechLayer;
36-
3732class Node ;
3833class Group ;
3934class Master ;
@@ -73,7 +68,7 @@ struct GridPt;
7368struct DbuPt ;
7469struct DbuRect ;
7570
76- using dbMasterSeq = std::vector<dbMaster*>;
71+ using dbMasterSeq = std::vector<odb:: dbMaster*>;
7772
7873using IRDropByPoint = std::map<odb::Point, double >;
7974struct GapInfo ;
@@ -84,7 +79,7 @@ struct IRDrop;
8479class Opendp
8580{
8681 public:
87- Opendp (dbDatabase* db, Logger* logger);
82+ Opendp (odb:: dbDatabase* db, Logger* logger);
8883 ~Opendp ();
8984
9085 Opendp (const Opendp&) = delete ;
@@ -101,7 +96,7 @@ class Opendp
10196 void reportLegalizationStats () const ;
10297
10398 void setPaddingGlobal (int left, int right);
104- void setPadding (dbMaster* master, int left, int right);
99+ void setPadding (odb:: dbMaster* master, int left, int right);
105100 void setPadding (odb::dbInst* inst, int left, int right);
106101 void setDebug (std::unique_ptr<dpl::DplObserver>& observer);
107102
@@ -120,7 +115,7 @@ class Opendp
120115 void optimizeMirroring ();
121116
122117 // Place decap cells
123- void addDecapMaster (dbMaster* decap_master, double decap_cap);
118+ void addDecapMaster (odb:: dbMaster* decap_master, double decap_cap);
124119 void insertDecapCells (double target, IRDropByPoint& psm_ir_drops);
125120
126121 // Get the instance adjacent to the left or right of a given instance
@@ -150,7 +145,7 @@ class Opendp
150145 // gap -> sequence of masters to fill the gap
151146 using GapFillers = std::vector<dbMasterSeq>;
152147
153- using MasterByImplant = std::map<dbTechLayer*, dbMasterSeq>;
148+ using MasterByImplant = std::map<odb:: dbTechLayer*, dbMasterSeq>;
154149
155150 using YCoordToGap = std::map<DbuY, std::vector<GapInfo*>>;
156151
@@ -278,7 +273,7 @@ class Opendp
278273 dbMasterSeq filterFillerMasters (const dbMasterSeq& filler_masters) const ;
279274 MasterByImplant splitByImplant (const dbMasterSeq& filler_masters);
280275 void setGridCells ();
281- dbMasterSeq& gapFillers (dbTechLayer* implant,
276+ dbMasterSeq& gapFillers (odb:: dbTechLayer* implant,
282277 GridX gap,
283278 const MasterByImplant& filler_masters_by_implant);
284279 void placeRowFillers (GridY row,
@@ -292,7 +287,9 @@ class Opendp
292287 std::vector<int > findDecapCellIndices (const DbuX& gap_width,
293288 const double & current,
294289 const double & target);
295- void insertDecapInPos (dbMaster* master, const DbuX& pos_x, const DbuY& pos_y);
290+ void insertDecapInPos (odb::dbMaster* master,
291+ const DbuX& pos_x,
292+ const DbuY& pos_y);
296293 void insertDecapInRow (const std::vector<GapInfo*>& gaps,
297294 DbuY gap_y,
298295 DbuX irdrop_x,
@@ -309,7 +306,7 @@ class Opendp
309306 void setGridLoc (Node* cell, GridX x, GridY y);
310307
311308 Logger* logger_ = nullptr ;
312- dbDatabase* db_ = nullptr ;
309+ odb:: dbDatabase* db_ = nullptr ;
313310 odb::dbBlock* block_ = nullptr ;
314311 odb::Rect core_;
315312
@@ -331,8 +328,8 @@ class Opendp
331328
332329 // Filler placement.
333330 // gap (in sites) -> seq of masters by implant
334- std::map<dbTechLayer*, GapFillers> gap_fillers_;
335- std::map<dbMaster*, int > filler_count_;
331+ std::map<odb:: dbTechLayer*, GapFillers> gap_fillers_;
332+ std::map<odb:: dbMaster*, int > filler_count_;
336333 bool have_fillers_ = false ;
337334
338335 // Decap placement.
0 commit comments