Merge pull request The-OpenROAD-Project#4964 from The-OpenROAD-Projec…

…t-staging/odb-include3 odb: third batch of odb include path changes
andyfox-rushc · Apr 17, 2024 · 7c6ac49 · 7c6ac49
2 parents da0053d + 9826226
commit 7c6ac49
Show file tree

Hide file tree

Showing 122 changed files with 262 additions and 256 deletions.
diff --git a/src/odb/src/db/dbBPin.cpp b/src/odb/src/db/dbBPin.cpp
@@ -34,16 +34,17 @@
 
 #include <iostream>
 
-#include "db.h"
 #include "dbAccessPoint.h"
 #include "dbBTerm.h"
 #include "dbBlock.h"
-#include "dbBlockCallBackObj.h"
 #include "dbBox.h"
 #include "dbBoxItr.h"
 #include "dbDatabase.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
+
 namespace odb {
 
 template class dbTable<_dbBPin>;

diff --git a/src/odb/src/db/dbBlockage.cpp b/src/odb/src/db/dbBlockage.cpp
@@ -32,17 +32,17 @@
 
 #include "dbBlockage.h"
 
-#include "db.h"
 #include "dbBlock.h"
-#include "dbBlockCallBackObj.h"
 #include "dbBox.h"
 #include "dbDatabase.h"
-#include "dbDiff.h"
 #include "dbDiff.hpp"
 #include "dbInst.h"
-#include "dbSet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
+#include "odb/dbDiff.h"
+#include "odb/dbSet.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbCCSeg.cpp b/src/odb/src/db/dbCCSeg.cpp
@@ -32,14 +32,14 @@
 
 #include "dbCCSeg.h"
 
-#include "db.h"
 #include "dbBlock.h"
 #include "dbCapNode.h"
 #include "dbDatabase.h"
 #include "dbJournal.h"
 #include "dbNet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
 #include "utl/Logger.h"
 
 namespace odb {

diff --git a/src/odb/src/db/dbCapNode.cpp b/src/odb/src/db/dbCapNode.cpp
@@ -32,7 +32,6 @@
 
 #include "dbCapNode.h"
 
-#include "db.h"
 #include "dbBlock.h"
 #include "dbCCSeg.h"
 #include "dbCCSegItr.h"
@@ -42,6 +41,7 @@
 #include "dbNet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
 #include "utl/Logger.h"
 
 namespace odb {

diff --git a/src/odb/src/db/dbFill.cpp b/src/odb/src/db/dbFill.cpp
@@ -32,15 +32,15 @@
 
 #include "dbFill.h"
 
-#include "db.h"
 #include "dbBlock.h"
-#include "dbBlockCallBackObj.h"
 #include "dbDatabase.h"
 #include "dbDiff.hpp"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTech.h"
 #include "dbTechLayer.h"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbGCellGrid.cpp b/src/odb/src/db/dbGCellGrid.cpp
@@ -47,8 +47,8 @@
 #include <algorithm>
 
 #include "dbBlock.h"
-#include "dbSet.h"
 #include "dbTech.h"
+#include "odb/dbSet.h"
 // User Code End Includes
 namespace odb {
 template class dbTable<_dbGCellGrid>;

diff --git a/src/odb/src/db/dbGCellGrid.h b/src/odb/src/db/dbGCellGrid.h
@@ -39,8 +39,8 @@
 // User Code Begin Includes
 #include <map>
 
-#include "dbMatrix.h"
 #include "dbVector.h"
+#include "odb/dbMatrix.h"
 // User Code End Includes
 
 namespace odb {

diff --git a/src/odb/src/db/dbGroupGroundNetItr.h b/src/odb/src/db/dbGroupGroundNetItr.h
@@ -32,8 +32,8 @@
 
 #pragma once
 
-#include "dbIterator.h"
-#include "odb.h"
+#include "odb/dbIterator.h"
+#include "odb/odb.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbGroupPowerNetItr.h b/src/odb/src/db/dbGroupPowerNetItr.h
@@ -32,8 +32,8 @@
 
 #pragma once
 
-#include "dbIterator.h"
-#include "odb.h"
+#include "odb/dbIterator.h"
+#include "odb/odb.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbHier.cpp b/src/odb/src/db/dbHier.cpp
@@ -32,7 +32,6 @@
 
 #include "dbHier.h"
 
-#include "db.h"
 #include "dbBTerm.h"
 #include "dbBlock.h"
 #include "dbChip.h"
@@ -42,6 +41,7 @@
 #include "dbMaster.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbJournal.cpp b/src/odb/src/db/dbJournal.cpp
@@ -32,7 +32,6 @@
 
 #include "dbJournal.h"
 
-#include "db.h"
 #include "dbBTerm.h"
 #include "dbBlock.h"
 #include "dbCCSeg.h"
@@ -41,6 +40,7 @@
 #include "dbInst.h"
 #include "dbNet.h"
 #include "dbRSeg.h"
+#include "odb/db.h"
 #include "utl/Logger.h"
 
 namespace odb {

diff --git a/src/odb/src/db/dbMetalWidthViaMap.h b/src/odb/src/db/dbMetalWidthViaMap.h
@@ -37,8 +37,8 @@
 #include "odb/odb.h"
 
 // User Code Begin Includes
-#include "db.h"
 #include "dbVector.h"
+#include "odb/db.h"
 // User Code End Includes
 
 namespace odb {
@@ -79,4 +79,4 @@ class _dbMetalWidthViaMap : public _dbObject
 dbIStream& operator>>(dbIStream& stream, _dbMetalWidthViaMap& obj);
 dbOStream& operator<<(dbOStream& stream, const _dbMetalWidthViaMap& obj);
 }  // namespace odb
-   // Generator Code End Header
+   // Generator Code End Header
diff --git a/src/odb/src/db/dbName.h b/src/odb/src/db/dbName.h
@@ -33,8 +33,8 @@
 #pragma once
 
 #include "dbCore.h"
-#include "dbId.h"
-#include "odb.h"
+#include "odb/dbId.h"
+#include "odb/odb.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbNameCache.cpp b/src/odb/src/db/dbNameCache.cpp
@@ -33,13 +33,13 @@
 #include "dbNameCache.h"
 
 #include "dbDatabase.h"
-#include "dbDiff.h"
 #include "dbDiff.hpp"
 #include "dbHashTable.hpp"
 #include "dbName.h"
-#include "dbSet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/dbDiff.h"
+#include "odb/dbSet.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbObstruction.cpp b/src/odb/src/db/dbObstruction.cpp
@@ -32,17 +32,17 @@
 
 #include "dbObstruction.h"
 
-#include "db.h"
 #include "dbBlock.h"
-#include "dbBlockCallBackObj.h"
 #include "dbBox.h"
 #include "dbDatabase.h"
 #include "dbDiff.hpp"
 #include "dbInst.h"
-#include "dbSet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTechLayer.h"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
+#include "odb/dbSet.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbProperty.cpp b/src/odb/src/db/dbProperty.cpp
@@ -36,7 +36,6 @@
 
 #include <sstream>
 
-#include "db.h"
 #include "dbBlock.h"
 #include "dbChip.h"
 #include "dbDatabase.h"
@@ -47,6 +46,7 @@
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTech.h"
+#include "odb/db.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbRSeg.cpp b/src/odb/src/db/dbRSeg.cpp
@@ -32,16 +32,16 @@
 
 #include "dbRSeg.h"
 
-#include "db.h"
 #include "dbBlock.h"
 #include "dbCapNode.h"
 #include "dbCommon.h"
 #include "dbDatabase.h"
 #include "dbJournal.h"
 #include "dbNet.h"
-#include "dbShape.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
+#include "odb/dbShape.h"
 #include "utl/Logger.h"
 
 namespace odb {

diff --git a/src/odb/src/db/dbRegion.cpp b/src/odb/src/db/dbRegion.cpp
@@ -32,9 +32,7 @@
 
 #include "dbRegion.h"
 
-#include "db.h"
 #include "dbBlock.h"
-#include "dbBlockCallBackObj.h"
 #include "dbBox.h"
 #include "dbBoxItr.h"
 #include "dbDatabase.h"
@@ -44,6 +42,8 @@
 #include "dbRegionInstItr.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbRow.cpp b/src/odb/src/db/dbRow.cpp
@@ -32,17 +32,17 @@
 
 #include "dbRow.h"
 
-#include "db.h"
 #include "dbBlock.h"
-#include "dbBlockCallBackObj.h"
 #include "dbDatabase.h"
 #include "dbDiff.hpp"
 #include "dbLib.h"
-#include "dbSet.h"
 #include "dbSite.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
-#include "dbTransform.h"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
+#include "odb/dbSet.h"
+#include "odb/dbTransform.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbRow.h b/src/odb/src/db/dbRow.h
@@ -33,9 +33,9 @@
 #pragma once
 
 #include "dbCore.h"
-#include "dbId.h"
-#include "dbTypes.h"
-#include "odb.h"
+#include "odb/dbId.h"
+#include "odb/dbTypes.h"
+#include "odb/odb.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbSWire.cpp b/src/odb/src/db/dbSWire.cpp
@@ -32,16 +32,16 @@
 
 #include "dbSWire.h"
 
-#include "db.h"
 #include "dbBlock.h"
-#include "dbBlockCallBackObj.h"
 #include "dbDiff.hpp"
 #include "dbNet.h"
 #include "dbSBox.h"
 #include "dbSBoxItr.h"
-#include "dbSet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
+#include "odb/dbBlockCallBackObj.h"
+#include "odb/dbSet.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbSite.cpp b/src/odb/src/db/dbSite.cpp
@@ -32,11 +32,11 @@
 
 #include "dbSite.h"
 
-#include "db.h"
 #include "dbDatabase.h"
 #include "dbLib.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
+#include "odb/db.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbTarget.cpp b/src/odb/src/db/dbTarget.cpp
@@ -32,7 +32,6 @@
 
 #include "dbTarget.h"
 
-#include "db.h"
 #include "dbDatabase.h"
 #include "dbLib.h"
 #include "dbMTerm.h"
@@ -41,6 +40,7 @@
 #include "dbTable.hpp"
 #include "dbTech.h"
 #include "dbTechLayer.h"
+#include "odb/db.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbTarget.h b/src/odb/src/db/dbTarget.h
@@ -33,9 +33,9 @@
 #pragma once
 
 #include "dbCore.h"
-#include "dbId.h"
-#include "geom.h"
-#include "odb.h"
+#include "odb/dbId.h"
+#include "odb/geom.h"
+#include "odb/odb.h"
 
 namespace odb {
 

diff --git a/src/odb/src/db/dbTechLayer.cpp b/src/odb/src/db/dbTechLayer.cpp
@@ -69,7 +69,7 @@
 #include "dbTechLayerAntennaRule.h"
 #include "dbTechLayerSpacingRule.h"
 #include "dbTechMinCutOrAreaRule.h"
-#include "lefout.h"
+#include "odb/lefout.h"
 #include "utl/Logger.h"
 // User Code End Includes
 namespace odb {