Skip to content

Commit 60accdb

Browse files
committed
src/drt/src/global.h is very generic; rename
`src/drt/src/global.h` is often used witout any prefix at all (so just included as "global.h"), which is conflicing if there happens to be e.g. `@abc` in the include path (which also has a `"global.h"`. It also makes the current cyclic dependencies to fix a bit more confusing. Rename to `drt-global.h` to have an unambiguous name. Signed-off-by: Henner Zeller <h.zeller@acm.org>
1 parent e281635 commit 60accdb

36 files changed

Lines changed: 35 additions & 36 deletions

src/drt/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ cc_library(
118118
"src/dr/FlexDR.h",
119119
"src/dr/FlexGridGraph.h",
120120
"src/dr/FlexWavefront.h",
121+
"src/drt-global.h",
121122
"src/frDesign.h",
122123
"src/frRegionQuery.h",
123124
"src/gc/FlexGC.h",
124-
"src/global.h",
125125
"src/pa/AbstractPAGraphics.h",
126126
"src/pa/FlexPA.h",
127127
"src/pa/FlexPA_unique.h",

src/drt/src/GraphicsFactory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
#include "dr/AbstractDRGraphics.h"
1010
#include "dr/FlexDR_graphics.h"
11+
#include "drt-global.h"
1112
#include "frBaseTypes.h"
1213
#include "frDesign.h"
13-
#include "global.h"
1414
#include "gui/gui.h"
1515
#include "odb/db.h"
1616
#include "pa/AbstractPAGraphics.h"

src/drt/src/TritonRoute.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "distributed/frArchive.h"
3636
#include "dr/AbstractDRGraphics.h"
3737
#include "dr/FlexDR.h"
38+
#include "drt-global.h"
3839
#include "drt/PinAccessService.h"
3940
#include "dst/Distributed.h"
4041
#include "dst/JobMessage.h"
@@ -43,7 +44,6 @@
4344
#include "frProfileTask.h"
4445
#include "frRTree.h"
4546
#include "gc/FlexGC.h"
46-
#include "global.h"
4747
#include "io/GuideProcessor.h"
4848
#include "io/io.h"
4949
#include "odb/db.h"

src/drt/src/db/drObj/drNet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include "db/infra/frSegStyle.h"
2222
#include "db/obj/frAccess.h"
2323
#include "db/obj/frBlockObject.h"
24+
#include "drt-global.h"
2425
#include "frBaseTypes.h"
25-
#include "global.h"
2626

2727
namespace drt {
2828
class frNet;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include "db/obj/frGuide.h"
1515
#include "db/obj/frShape.h"
1616
#include "db/obj/frVia.h"
17+
#include "drt-global.h"
1718
#include "frBaseTypes.h"
18-
#include "global.h"
1919
#include "odb/dbTypes.h"
2020

2121
namespace drt {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include "db/tech/frLayer.h"
1919
#include "db/tech/frViaDef.h"
2020
#include "db/tech/frViaRuleGenerate.h"
21+
#include "drt-global.h"
2122
#include "frBaseTypes.h"
22-
#include "global.h"
2323
#include "odb/dbTypes.h"
2424
#include "utl/Logger.h"
2525

src/drt/src/distributed/RoutingCallBack.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
#include "distributed/frArchive.h"
2121
#include "distributed/paUpdate.h"
2222
#include "dr/FlexDR.h"
23+
#include "drt-global.h"
2324
#include "drt/TritonRoute.h"
2425
#include "dst/Distributed.h"
2526
#include "dst/JobCallBack.h"
2627
#include "dst/JobMessage.h"
27-
#include "global.h"
2828
#include "omp.h"
2929
#include "pa/FlexPA.h"
3030
#include "utl/Logger.h"

src/drt/src/dr/FlexGridGraph.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#include "db/tech/frTechObject.h"
2626
#include "dr/FlexMazeTypes.h"
2727
#include "dr/FlexWavefront.h"
28+
#include "drt-global.h"
2829
#include "frBaseTypes.h"
2930
#include "frDesign.h"
30-
#include "global.h"
3131
#include "odb/dbTypes.h"
3232
#include "utl/Logger.h"
3333

src/drt/src/dr/FlexGridGraph_maze.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#include "dr/FlexGridGraph.h"
1818
#include "dr/FlexMazeTypes.h"
1919
#include "dr/FlexWavefront.h"
20+
#include "drt-global.h"
2021
#include "frBaseTypes.h"
21-
#include "global.h"
2222
#include "odb/dbTypes.h"
2323
#include "odb/geom.h"
2424

src/drt/src/dr/FlexWavefront.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
#include "db/infra/frBox.h"
1111
#include "dr/FlexMazeTypes.h"
12+
#include "drt-global.h"
1213
#include "frBaseTypes.h"
13-
#include "global.h"
1414

1515
namespace drt {
1616
class FlexWavefrontGrid

0 commit comments

Comments
 (0)