Merge pull request The-OpenROAD-Project#6807 from The-OpenROAD-Project-staging/rcx-grid

Rcx grid

Author: maliberty

src/rcx/include/rcx/box.h

@@ -42,11 +42,11 @@ namespace rcx {
 
 using uint = unsigned int;
 
-class Ath__box
+class Box
 {
  public:
-  Ath__box();
-  Ath__box(int x1, int y1, int x2, int y2, int units = 1);
+  Box();
+  Box(int x1, int y1, int x2, int y2, int units = 1);
 
   uint getDir() const;
   int getYhi(int bound) const;
@@ -64,7 +64,7 @@ class Ath__box
   void setRect(const odb::Rect& rect) { _rect = rect; }
 
   void invalidateBox();
-  void set(Ath__box* bb);
+  void set(Box* bb);
   void set(int x1, int y1, int x2, int y2, int units = 1);
   void setLayer(uint layer) { _layer = layer; }
 

src/rcx/include/rcx/extMeasureRC.h

@@ -68,7 +68,7 @@ using odb::uint;
 using utl::Logger;
 
 class extSpef;
-class Ath__gridTable;
+class GridTable;
 
 // CoupleOptions seriously needs to be rewriten to use a class with named
 // members. -cherry 05/09/2021
@@ -1016,7 +1016,7 @@ class extMeasure
   double _peffR;
   bool _skipResCalc = false;
 
-  Ath__gridTable* _search = NULL;
+  GridTable* _search = NULL;
   bool IsDebugNet1();
   static int getMetIndexOverUnder(int met,
                                   int mUnder,
@@ -2788,7 +2788,7 @@ class extMain
   std::vector<odb::dbBTerm*> _connectedBTerm;
   std::vector<odb::dbITerm*> _connectedITerm;
 
-  Ath__gridTable* _search = nullptr;
+  GridTable* _search = nullptr;
 
   int _noVariationIndex;
 

src/rcx/include/rcx/extRCap.h

@@ -66,7 +66,7 @@ class Logger;
 
 namespace rcx {
 using namespace odb;
-class Ath__wire;
+class Wire;
 
 class extMeasure;
 
@@ -90,26 +90,26 @@ class extSegment  // assume cross-section on the z-direction
   int _metOver;
   uint _id;
 
-  Ath__wire* _wire;
-  Ath__wire* _up;
-  Ath__wire* _down;
+  Wire* _wire;
+  Wire* _up;
+  Wire* _down;
 
-  // extSegment(uint dir, Ath__wire *w2, int dist);
+  // extSegment(uint dir, Wire *w2, int dist);
   //  ~extSegment();
 
   // extSegment();
-  // extSegment(uint d, Ath__wire *w, int xy, int len, Ath__wire *up, Ath__wire
+  // extSegment(uint d, Wire *w, int xy, int len, Wire *up, Wire
   // *down, int metOver=-1, int metUnder=-1);
   void set(uint d,
-           Ath__wire* w,
+           Wire* w,
            int xy,
            int len,
-           Ath__wire* up,
-           Ath__wire* down,
+           Wire* up,
+           Wire* down,
            int metOver = -1,
            int metUnder = -1);
-  int GetDist(Ath__wire* w1, Ath__wire* w2);
-  int setUpDown(bool up, Ath__wire* w1);
+  int GetDist(Wire* w1, Wire* w2);
+  int setUpDown(bool up, Wire* w1);
 
   friend class extMeasure;
   friend class extRCModel;