From 53b126f1fd3e7328b937fad4c722956d8948b990 Mon Sep 17 00:00:00 2001 From: Matt Liberty Date: Tue, 16 Apr 2024 21:53:45 -0700 Subject: [PATCH] odb: second batch of odb include path changes Signed-off-by: Matt Liberty --- .../schema/tech/dbTechLayer.json | 4 +-- src/odb/src/db/dbArrayTable.h | 4 +-- src/odb/src/db/dbArrayTable.hpp | 36 +++++++++---------- src/odb/src/db/dbBTerm.cpp | 10 +++--- src/odb/src/db/dbBTerm.h | 6 ++-- src/odb/src/db/dbBlock.cpp | 16 ++++----- src/odb/src/db/dbBlock.h | 8 ++--- src/odb/src/db/dbBlockCallBackObj.cpp | 2 +- src/odb/src/db/dbBlockage.h | 4 +-- src/odb/src/db/dbCCSeg.h | 6 ++-- src/odb/src/db/dbCapNode.h | 6 ++-- src/odb/src/db/dbCapNodeItr.h | 4 +-- src/odb/src/db/dbChip.cpp | 2 +- src/odb/src/db/dbChip.h | 2 +- src/odb/src/db/dbDiff.hpp | 2 +- src/odb/src/db/dbExtControl.cpp | 4 +-- src/odb/src/db/dbFill.h | 6 ++-- src/odb/src/db/dbHier.h | 4 +-- src/odb/src/db/dbHierInstShapeItr.cpp | 6 ++-- src/odb/src/db/dbITerm.cpp | 6 ++-- src/odb/src/db/dbInst.cpp | 8 ++--- src/odb/src/db/dbInst.h | 6 ++-- src/odb/src/db/dbInstHdr.cpp | 2 +- src/odb/src/db/dbInstHdr.h | 4 +-- src/odb/src/db/dbIntHashTable.h | 2 +- src/odb/src/db/dbJournal.h | 2 +- src/odb/src/db/dbJournalLog.h | 2 +- src/odb/src/db/dbLib.cpp | 4 +-- src/odb/src/db/dbLib.h | 2 +- src/odb/src/db/dbMPin.cpp | 2 +- src/odb/src/db/dbMPin.h | 4 +-- src/odb/src/db/dbMTerm.cpp | 4 +-- src/odb/src/db/dbMTerm.h | 6 ++-- src/odb/src/db/dbMaster.cpp | 4 +-- src/odb/src/db/dbMaster.h | 4 +-- src/odb/src/db/dbNet.cpp | 10 +++--- src/odb/src/db/dbNet.h | 6 ++-- src/odb/src/db/dbNullIterator.h | 4 +-- src/odb/src/db/dbObstruction.h | 4 +-- src/odb/src/db/dbProperty.h | 6 ++-- src/odb/src/db/dbPropertyItr.h | 4 +-- src/odb/src/db/dbRSeg.h | 6 ++-- src/odb/src/db/dbRSegItr.h | 4 +-- src/odb/src/db/dbRegion.h | 8 ++--- src/odb/src/db/dbRegionInstItr.h | 4 +-- src/odb/src/db/dbSBox.cpp | 2 +- src/odb/src/db/dbSBox.h | 10 +++--- src/odb/src/db/dbSWire.h | 6 ++-- src/odb/src/db/dbShape.cpp | 4 +-- src/odb/src/db/dbSite.h | 6 ++-- src/odb/src/db/dbTable.h | 6 ++-- src/odb/src/db/dbTable.hpp | 6 ++-- src/odb/src/db/dbTargetItr.h | 4 +-- src/odb/src/db/dbTech.cpp | 2 +- src/odb/src/db/dbTech.h | 6 ++-- src/odb/src/db/dbTechLayer.h | 4 +-- src/odb/src/db/dbTechLayerAntennaRule.h | 4 +-- src/odb/src/db/dbTechLayerSpacingRule.cpp | 4 +-- src/odb/src/db/dbTechLayerSpacingRule.h | 6 ++-- src/odb/src/db/dbTechMinCutOrAreaRule.h | 6 ++-- src/odb/src/db/dbTechVia.h | 8 ++--- src/odb/src/db/dbTypes.cpp | 5 ++- src/odb/src/db/dbVector.h | 6 ++-- src/odb/src/db/dbVia.h | 10 +++--- src/odb/src/db/dbViaParams.cpp | 6 ++-- src/odb/src/db/dbWireGraph.cpp | 2 +- src/odb/src/db/dbWirePathItr.cpp | 4 +-- src/odb/src/db/dbWireShapeItr.cpp | 6 ++-- 68 files changed, 186 insertions(+), 187 deletions(-) diff --git a/src/odb/src/codeGenerator/schema/tech/dbTechLayer.json b/src/odb/src/codeGenerator/schema/tech/dbTechLayer.json index 86b3786e207..e098a4ba4ad 100644 --- a/src/odb/src/codeGenerator/schema/tech/dbTechLayer.json +++ b/src/odb/src/codeGenerator/schema/tech/dbTechLayer.json @@ -174,8 +174,8 @@ } ], "h_includes": [ - "dbMatrix.h", - "dbTypes.h", + "odb/dbMatrix.h", + "odb/dbTypes.h", "dbVector.h" ] } diff --git a/src/odb/src/db/dbArrayTable.h b/src/odb/src/db/dbArrayTable.h index 5db5243a43e..1b99067b96b 100644 --- a/src/odb/src/db/dbArrayTable.h +++ b/src/odb/src/db/dbArrayTable.h @@ -34,10 +34,10 @@ #include -#include "ZException.h" #include "dbCore.h" #include "dbVector.h" -#include "odb.h" +#include "odb/ZException.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbArrayTable.hpp b/src/odb/src/db/dbArrayTable.hpp index d934938c68d..d1a048b913b 100644 --- a/src/odb/src/db/dbArrayTable.hpp +++ b/src/odb/src/db/dbArrayTable.hpp @@ -35,10 +35,10 @@ #include #include -#include "ZException.h" #include "dbArrayTable.h" -#include "dbDiff.h" -#include "dbStream.h" +#include "odb/ZException.h" +#include "odb/dbDiff.h" +#include "odb/dbStream.h" namespace odb { template @@ -108,15 +108,15 @@ void dbArrayTable::clear() for (; t < e; t++) { if (t->_oid & DB_ALLOC_BIT) { t->~T(); -} + } } free((void*) page); } - { + { delete[] _pages; -} + } _page_cnt = 0; _page_tbl_size = 0; @@ -180,11 +180,11 @@ void dbArrayTable::resizePageTbl() for (i = 0; i < old_tbl_size; ++i) { _pages[i] = old_tbl[i]; -} + } for (; i < _page_tbl_size; ++i) { _pages[i] = nullptr; -} + } delete[] old_tbl; } @@ -224,7 +224,7 @@ void dbArrayTable::newPage() if (t != b) { // don't link zero-object pushQ(_free_list, o); -} + } } } else { T* b = (T*) page->_objects; @@ -245,7 +245,7 @@ T* dbArrayTable::create() if (_free_list == 0) { newPage(); -} + } _dbFreeObject* o = popQ(_free_list); o->_oid |= DB_ALLOC_BIT; @@ -286,7 +286,7 @@ void dbArrayTable::destroyArray(dbId id) // freelist in the correct order. for (; i >= id; --i) { destroy(getPtr(i)); -} + } } template @@ -369,7 +369,7 @@ void dbArrayTable::copy_pages(const dbArrayTable& t) for (i = 0; i < _page_tbl_size; ++i) { _pages[i] = nullptr; -} + } for (i = 0; i < _page_cnt; ++i) { dbArrayTablePage* page = t._pages[i]; @@ -455,7 +455,7 @@ dbIStream& operator>>(dbIStream& stream, dbArrayTable& table) for (; i < table._page_tbl_size; ++i) { table._pages[i] = nullptr; -} + } return stream; } @@ -478,17 +478,17 @@ bool dbArrayTable::operator==(const dbArrayTable& rhs) const // empty tables if ((lhs._page_cnt == 0) && (rhs._page_cnt == 0)) { return true; -} + } // Simple rejection test if (lhs._page_cnt != rhs._page_cnt) { return false; -} + } // Simple rejection test if (lhs._alloc_cnt != rhs._alloc_cnt) { return false; -} + } uint i; @@ -502,7 +502,7 @@ bool dbArrayTable::operator==(const dbArrayTable& rhs) const if (*l != *r) { return false; -} + } } else if (lhs_valid_o) { return false; } else if (rhs_valid_o) { @@ -574,7 +574,7 @@ void dbArrayTable::getObjects(std::vector& objects) for (i = 1; i < _alloc_cnt; ++i) { if (validId(i)) { objects.push_back(getPtr(i)); -} + } } } diff --git a/src/odb/src/db/dbBTerm.cpp b/src/odb/src/db/dbBTerm.cpp index 7c88706de9e..74cdc53d3a7 100644 --- a/src/odb/src/db/dbBTerm.cpp +++ b/src/odb/src/db/dbBTerm.cpp @@ -32,17 +32,14 @@ #include "dbBTerm.h" -#include "db.h" #include "dbArrayTable.h" #include "dbBPinItr.h" #include "dbBlock.h" -#include "dbBlockCallBackObj.h" #include "dbBox.h" #include "dbBoxItr.h" #include "dbChip.h" #include "dbCommon.h" #include "dbDatabase.h" -#include "dbDiff.h" #include "dbDiff.hpp" #include "dbHier.h" #include "dbITerm.h" @@ -53,10 +50,13 @@ #include "dbMaster.h" #include "dbModNet.h" #include "dbNet.h" -#include "dbShape.h" #include "dbTable.h" #include "dbTable.hpp" -#include "dbTransform.h" +#include "odb/db.h" +#include "odb/dbBlockCallBackObj.h" +#include "odb/dbDiff.h" +#include "odb/dbShape.h" +#include "odb/dbTransform.h" #include "utl/Logger.h" namespace odb { diff --git a/src/odb/src/db/dbBTerm.h b/src/odb/src/db/dbBTerm.h index eac5a111c6d..ac5c4e52ab2 100644 --- a/src/odb/src/db/dbBTerm.h +++ b/src/odb/src/db/dbBTerm.h @@ -36,9 +36,9 @@ #include "dbCore.h" #include "dbDatabase.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/dbBlock.cpp b/src/odb/src/db/dbBlock.cpp index b4f821dca43..62260e99f4f 100644 --- a/src/odb/src/db/dbBlock.cpp +++ b/src/odb/src/db/dbBlock.cpp @@ -40,7 +40,6 @@ #include #include -#include "db.h" #include "dbAccessPoint.h" #include "dbArrayTable.h" #include "dbArrayTable.hpp" @@ -48,7 +47,6 @@ #include "dbBPinItr.h" #include "dbBTerm.h" #include "dbBTermItr.h" -#include "dbBlockCallBackObj.h" #include "dbBlockItr.h" #include "dbBlockage.h" #include "dbBox.h" @@ -60,9 +58,7 @@ #include "dbChip.h" #include "dbDatabase.h" #include "dbDft.h" -#include "dbDiff.h" #include "dbDiff.hpp" -#include "dbExtControl.h" #include "dbFill.h" #include "dbGCellGrid.h" #include "dbGlobalConnect.h" @@ -118,7 +114,6 @@ #include "dbSBoxItr.h" #include "dbSWire.h" #include "dbSWireItr.h" -#include "dbShape.h" #include "dbTable.h" #include "dbTable.hpp" #include "dbTech.h" @@ -128,9 +123,14 @@ #include "dbTrackGrid.h" #include "dbVia.h" #include "dbWire.h" -#include "defout.h" -#include "lefout.h" -#include "parse.h" +#include "odb/db.h" +#include "odb/dbBlockCallBackObj.h" +#include "odb/dbDiff.h" +#include "odb/dbExtControl.h" +#include "odb/dbShape.h" +#include "odb/defout.h" +#include "odb/lefout.h" +#include "odb/parse.h" #include "utl/Logger.h" namespace odb { diff --git a/src/odb/src/db/dbBlock.h b/src/odb/src/db/dbBlock.h index a22d7d52b40..27c355dcc86 100644 --- a/src/odb/src/db/dbBlock.h +++ b/src/odb/src/db/dbBlock.h @@ -39,11 +39,11 @@ #include "dbHashTable.h" #include "dbIntHashTable.h" #include "dbPagedVector.h" -#include "dbTransform.h" -#include "dbTypes.h" #include "dbVector.h" -#include "geom.h" -#include "odb.h" +#include "odb/dbTransform.h" +#include "odb/dbTypes.h" +#include "odb/geom.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbBlockCallBackObj.cpp b/src/odb/src/db/dbBlockCallBackObj.cpp index 03674fad686..f796f4a66ac 100644 --- a/src/odb/src/db/dbBlockCallBackObj.cpp +++ b/src/odb/src/db/dbBlockCallBackObj.cpp @@ -30,7 +30,7 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -#include "dbBlockCallBackObj.h" +#include "odb/dbBlockCallBackObj.h" #include "dbBlock.h" diff --git a/src/odb/src/db/dbBlockage.h b/src/odb/src/db/dbBlockage.h index 05cc6f6cf0e..b5b7e9a0636 100644 --- a/src/odb/src/db/dbBlockage.h +++ b/src/odb/src/db/dbBlockage.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/dbCCSeg.h b/src/odb/src/db/dbCCSeg.h index 70ebd500c1a..f2d39f394f6 100644 --- a/src/odb/src/db/dbCCSeg.h +++ b/src/odb/src/db/dbCCSeg.h @@ -34,9 +34,9 @@ #include "dbCore.h" #include "dbDatabase.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/dbCapNode.h b/src/odb/src/db/dbCapNode.h index d4b7d159c4d..5739068ad44 100644 --- a/src/odb/src/db/dbCapNode.h +++ b/src/odb/src/db/dbCapNode.h @@ -34,9 +34,9 @@ #include "dbCore.h" #include "dbDatabase.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/dbCapNodeItr.h b/src/odb/src/db/dbCapNodeItr.h index a36b0db3e9b..db4a99a6df8 100644 --- a/src/odb/src/db/dbCapNodeItr.h +++ b/src/odb/src/db/dbCapNodeItr.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/dbChip.cpp b/src/odb/src/db/dbChip.cpp index c4c52ba766b..791bfca9216 100644 --- a/src/odb/src/db/dbChip.cpp +++ b/src/odb/src/db/dbChip.cpp @@ -32,7 +32,6 @@ #include "dbChip.h" -#include "db.h" #include "dbBlock.h" #include "dbBlockItr.h" #include "dbDatabase.h" @@ -42,6 +41,7 @@ #include "dbTable.h" #include "dbTable.hpp" #include "dbTech.h" +#include "odb/db.h" namespace odb { diff --git a/src/odb/src/db/dbChip.h b/src/odb/src/db/dbChip.h index b944c470d82..ef3c4722764 100644 --- a/src/odb/src/db/dbChip.h +++ b/src/odb/src/db/dbChip.h @@ -33,7 +33,7 @@ #pragma once #include "dbCore.h" -#include "odb.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbDiff.hpp b/src/odb/src/db/dbDiff.hpp index a6d87538e8d..e248bd4d844 100644 --- a/src/odb/src/db/dbDiff.hpp +++ b/src/odb/src/db/dbDiff.hpp @@ -34,7 +34,7 @@ #include -#include "dbSet.h" +#include "odb/dbSet.h" namespace odb { // diff --git a/src/odb/src/db/dbExtControl.cpp b/src/odb/src/db/dbExtControl.cpp index b7bd1960ad6..16aa756a94f 100644 --- a/src/odb/src/db/dbExtControl.cpp +++ b/src/odb/src/db/dbExtControl.cpp @@ -30,10 +30,10 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -#include "dbExtControl.h" +#include "odb/dbExtControl.h" -#include "db.h" #include "dbDatabase.h" +#include "odb/db.h" namespace odb { diff --git a/src/odb/src/db/dbFill.h b/src/odb/src/db/dbFill.h index 5993f6b2051..d7df576b7f6 100644 --- a/src/odb/src/db/dbFill.h +++ b/src/odb/src/db/dbFill.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/dbHier.h b/src/odb/src/db/dbHier.h index f7170f64f3d..213c128939a 100644 --- a/src/odb/src/db/dbHier.h +++ b/src/odb/src/db/dbHier.h @@ -33,9 +33,9 @@ #pragma once #include "dbCore.h" -#include "dbId.h" #include "dbVector.h" -#include "odb.h" +#include "odb/dbId.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbHierInstShapeItr.cpp b/src/odb/src/db/dbHierInstShapeItr.cpp index 67ebc6744af..4d8d0b9496a 100644 --- a/src/odb/src/db/dbHierInstShapeItr.cpp +++ b/src/odb/src/db/dbHierInstShapeItr.cpp @@ -30,9 +30,9 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -#include "ZException.h" -#include "db.h" -#include "dbShape.h" +#include "odb/ZException.h" +#include "odb/db.h" +#include "odb/dbShape.h" namespace odb { diff --git a/src/odb/src/db/dbITerm.cpp b/src/odb/src/db/dbITerm.cpp index 616aabf7b54..c5172681eff 100644 --- a/src/odb/src/db/dbITerm.cpp +++ b/src/odb/src/db/dbITerm.cpp @@ -32,12 +32,10 @@ #include "dbITerm.h" -#include "db.h" #include "dbAccessPoint.h" #include "dbArrayTable.h" #include "dbBTerm.h" #include "dbBlock.h" -#include "dbBlockCallBackObj.h" #include "dbChip.h" #include "dbCommon.h" #include "dbDatabase.h" @@ -52,9 +50,11 @@ #include "dbMaster.h" #include "dbModNet.h" #include "dbNet.h" -#include "dbShape.h" #include "dbTable.h" #include "dbTable.hpp" +#include "odb/db.h" +#include "odb/dbBlockCallBackObj.h" +#include "odb/dbShape.h" #include "utl/Logger.h" namespace odb { diff --git a/src/odb/src/db/dbInst.cpp b/src/odb/src/db/dbInst.cpp index dce9861b655..18b1a5e32b2 100644 --- a/src/odb/src/db/dbInst.cpp +++ b/src/odb/src/db/dbInst.cpp @@ -34,12 +34,10 @@ #include -#include "db.h" #include "dbArrayTable.h" #include "dbArrayTable.hpp" #include "dbBTerm.h" #include "dbBlock.h" -#include "dbBlockCallBackObj.h" #include "dbBox.h" #include "dbChip.h" #include "dbCommon.h" @@ -58,10 +56,12 @@ #include "dbNet.h" #include "dbNullIterator.h" #include "dbRegion.h" -#include "dbSet.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" #include "utl/Logger.h" namespace odb { diff --git a/src/odb/src/db/dbInst.h b/src/odb/src/db/dbInst.h index 65c5a3f881a..d16c80ed3ad 100644 --- a/src/odb/src/db/dbInst.h +++ b/src/odb/src/db/dbInst.h @@ -34,10 +34,10 @@ #include "dbCore.h" #include "dbDatabase.h" -#include "dbId.h" -#include "dbTypes.h" #include "dbVector.h" // disconnect the child-iterm -#include "odb.h" +#include "odb/dbId.h" +#include "odb/dbTypes.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbInstHdr.cpp b/src/odb/src/db/dbInstHdr.cpp index e0c57620a43..d7c91f54dc5 100644 --- a/src/odb/src/db/dbInstHdr.cpp +++ b/src/odb/src/db/dbInstHdr.cpp @@ -32,7 +32,6 @@ #include "dbInstHdr.h" -#include "db.h" #include "dbBlock.h" #include "dbDatabase.h" #include "dbLib.h" @@ -40,6 +39,7 @@ #include "dbMaster.h" #include "dbTable.h" #include "dbTable.hpp" +#include "odb/db.h" namespace odb { diff --git a/src/odb/src/db/dbInstHdr.h b/src/odb/src/db/dbInstHdr.h index 4e2febcf9a9..0936c3194c2 100644 --- a/src/odb/src/db/dbInstHdr.h +++ b/src/odb/src/db/dbInstHdr.h @@ -33,9 +33,9 @@ #pragma once #include "dbCore.h" -#include "dbId.h" #include "dbVector.h" -#include "odb.h" +#include "odb/dbId.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbIntHashTable.h b/src/odb/src/db/dbIntHashTable.h index e4370ab7669..71815a85912 100644 --- a/src/odb/src/db/dbIntHashTable.h +++ b/src/odb/src/db/dbIntHashTable.h @@ -33,7 +33,7 @@ #pragma once #include "dbPagedVector.h" -#include "odb.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbJournal.h b/src/odb/src/db/dbJournal.h index e2205e72c24..ecdbc639cd0 100644 --- a/src/odb/src/db/dbJournal.h +++ b/src/odb/src/db/dbJournal.h @@ -33,7 +33,7 @@ #pragma once #include "dbJournalLog.h" -#include "odb.h" +#include "odb/odb.h" namespace utl { class Logger; diff --git a/src/odb/src/db/dbJournalLog.h b/src/odb/src/db/dbJournalLog.h index 5b592c58210..dac4e2274c0 100644 --- a/src/odb/src/db/dbJournalLog.h +++ b/src/odb/src/db/dbJournalLog.h @@ -33,7 +33,7 @@ #pragma once #include "dbPagedVector.h" -#include "odb.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbLib.cpp b/src/odb/src/db/dbLib.cpp index eb95bb9d67a..8e53c6a84db 100644 --- a/src/odb/src/db/dbLib.cpp +++ b/src/odb/src/db/dbLib.cpp @@ -32,7 +32,6 @@ #include "dbLib.h" -#include "db.h" #include "dbDatabase.h" #include "dbHashTable.hpp" #include "dbMaster.h" @@ -43,7 +42,8 @@ #include "dbTable.h" #include "dbTable.hpp" #include "dbTech.h" -#include "dbTransform.h" +#include "odb/db.h" +#include "odb/dbTransform.h" namespace odb { diff --git a/src/odb/src/db/dbLib.h b/src/odb/src/db/dbLib.h index 78fdcf9519e..c7b7a726abc 100644 --- a/src/odb/src/db/dbLib.h +++ b/src/odb/src/db/dbLib.h @@ -34,7 +34,7 @@ #include "dbCore.h" #include "dbHashTable.h" -#include "odb.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbMPin.cpp b/src/odb/src/db/dbMPin.cpp index b289da473e7..c6b72961795 100644 --- a/src/odb/src/db/dbMPin.cpp +++ b/src/odb/src/db/dbMPin.cpp @@ -32,7 +32,6 @@ #include "dbMPin.h" -#include "db.h" #include "dbAccessPoint.h" #include "dbBlock.h" #include "dbBoxItr.h" @@ -41,6 +40,7 @@ #include "dbMaster.h" #include "dbTable.h" #include "dbTable.hpp" +#include "odb/db.h" namespace odb { diff --git a/src/odb/src/db/dbMPin.h b/src/odb/src/db/dbMPin.h index 923d9484bcd..22b4c09c187 100644 --- a/src/odb/src/db/dbMPin.h +++ b/src/odb/src/db/dbMPin.h @@ -33,9 +33,9 @@ #pragma once #include "dbCore.h" -#include "dbId.h" #include "dbVector.h" -#include "odb.h" +#include "odb/dbId.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbMTerm.cpp b/src/odb/src/db/dbMTerm.cpp index 0065bdd331c..4942d44b95a 100644 --- a/src/odb/src/db/dbMTerm.cpp +++ b/src/odb/src/db/dbMTerm.cpp @@ -34,7 +34,6 @@ #include -#include "db.h" #include "dbDatabase.h" #include "dbLib.h" #include "dbMPinItr.h" @@ -43,7 +42,8 @@ #include "dbTable.hpp" #include "dbTargetItr.h" #include "dbTechLayerAntennaRule.h" -#include "lefout.h" +#include "odb/db.h" +#include "odb/lefout.h" namespace odb { diff --git a/src/odb/src/db/dbMTerm.h b/src/odb/src/db/dbMTerm.h index ce39980b4c0..a31e7c5f932 100644 --- a/src/odb/src/db/dbMTerm.h +++ b/src/odb/src/db/dbMTerm.h @@ -33,10 +33,10 @@ #pragma once #include "dbCore.h" -#include "dbId.h" -#include "dbTypes.h" #include "dbVector.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/dbMaster.cpp b/src/odb/src/db/dbMaster.cpp index 79ecc4ae6b6..f03e9786d1e 100644 --- a/src/odb/src/db/dbMaster.cpp +++ b/src/odb/src/db/dbMaster.cpp @@ -32,7 +32,6 @@ #include "dbMaster.h" -#include "db.h" #include "dbBlock.h" #include "dbBox.h" #include "dbBoxItr.h" @@ -48,7 +47,8 @@ #include "dbTarget.h" #include "dbTargetItr.h" #include "dbTechLayerAntennaRule.h" -#include "dbTransform.h" +#include "odb/db.h" +#include "odb/dbTransform.h" #include "utl/Logger.h" namespace odb { diff --git a/src/odb/src/db/dbMaster.h b/src/odb/src/db/dbMaster.h index dd771204b40..2509b213380 100644 --- a/src/odb/src/db/dbMaster.h +++ b/src/odb/src/db/dbMaster.h @@ -34,8 +34,8 @@ #include "dbCore.h" #include "dbHashTable.h" -#include "dbTypes.h" -#include "odb.h" +#include "odb/dbTypes.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbNet.cpp b/src/odb/src/db/dbNet.cpp index ece91285bcd..fc72a7f808d 100644 --- a/src/odb/src/db/dbNet.cpp +++ b/src/odb/src/db/dbNet.cpp @@ -34,11 +34,9 @@ #include -#include "db.h" #include "dbBTerm.h" #include "dbBTermItr.h" #include "dbBlock.h" -#include "dbBlockCallBackObj.h" #include "dbCCSeg.h" #include "dbCCSegItr.h" #include "dbCapNode.h" @@ -46,7 +44,6 @@ #include "dbCommon.h" #include "dbDatabase.h" #include "dbDiff.hpp" -#include "dbExtControl.h" #include "dbGroup.h" #include "dbGuide.h" #include "dbGuideItr.h" @@ -61,13 +58,16 @@ #include "dbRSegItr.h" #include "dbSWire.h" #include "dbSWireItr.h" -#include "dbSet.h" -#include "dbShape.h" #include "dbTable.h" #include "dbTable.hpp" #include "dbTech.h" #include "dbTechNonDefaultRule.h" #include "dbWire.h" +#include "odb/db.h" +#include "odb/dbBlockCallBackObj.h" +#include "odb/dbExtControl.h" +#include "odb/dbSet.h" +#include "odb/dbShape.h" #include "utl/Logger.h" namespace odb { diff --git a/src/odb/src/db/dbNet.h b/src/odb/src/db/dbNet.h index bc5d07ce503..ac39035be88 100644 --- a/src/odb/src/db/dbNet.h +++ b/src/odb/src/db/dbNet.h @@ -33,10 +33,10 @@ #pragma once #include "dbCore.h" -#include "dbId.h" -#include "dbTypes.h" #include "dbVector.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/dbNullIterator.h b/src/odb/src/db/dbNullIterator.h index 0c1d31d3d9e..3ddd09dd082 100644 --- a/src/odb/src/db/dbNullIterator.h +++ b/src/odb/src/db/dbNullIterator.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/dbObstruction.h b/src/odb/src/db/dbObstruction.h index 567a8e6801a..6b1645c05fb 100644 --- a/src/odb/src/db/dbObstruction.h +++ b/src/odb/src/db/dbObstruction.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/dbProperty.h b/src/odb/src/db/dbProperty.h index 1a3611d72bb..7cc0d53e81e 100644 --- a/src/odb/src/db/dbProperty.h +++ b/src/odb/src/db/dbProperty.h @@ -36,9 +36,9 @@ #include #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/dbPropertyItr.h b/src/odb/src/db/dbPropertyItr.h index eef8bd48587..57c1f0b24ab 100644 --- a/src/odb/src/db/dbPropertyItr.h +++ b/src/odb/src/db/dbPropertyItr.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/dbRSeg.h b/src/odb/src/db/dbRSeg.h index d0eda61fa04..a07b8d015c1 100644 --- a/src/odb/src/db/dbRSeg.h +++ b/src/odb/src/db/dbRSeg.h @@ -34,9 +34,9 @@ #include "dbCore.h" #include "dbDatabase.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/dbRSegItr.h b/src/odb/src/db/dbRSegItr.h index a31e4a06b7e..913e8995764 100644 --- a/src/odb/src/db/dbRSegItr.h +++ b/src/odb/src/db/dbRSegItr.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/dbRegion.h b/src/odb/src/db/dbRegion.h index 13c4d65f0af..5e757631025 100644 --- a/src/odb/src/db/dbRegion.h +++ b/src/odb/src/db/dbRegion.h @@ -33,10 +33,10 @@ #pragma once #include "dbCore.h" -#include "dbId.h" -#include "dbTypes.h" -#include "geom.h" -#include "odb.h" +#include "odb/dbId.h" +#include "odb/dbTypes.h" +#include "odb/geom.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbRegionInstItr.h b/src/odb/src/db/dbRegionInstItr.h index 80d9697ee7b..386cb71275b 100644 --- a/src/odb/src/db/dbRegionInstItr.h +++ b/src/odb/src/db/dbRegionInstItr.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/dbSBox.cpp b/src/odb/src/db/dbSBox.cpp index 60c897f538b..a5de349f3f1 100644 --- a/src/odb/src/db/dbSBox.cpp +++ b/src/odb/src/db/dbSBox.cpp @@ -32,7 +32,6 @@ #include "dbSBox.h" -#include "db.h" #include "dbBlock.h" #include "dbBox.h" #include "dbDatabase.h" @@ -43,6 +42,7 @@ #include "dbTechLayer.h" #include "dbTechVia.h" #include "dbVia.h" +#include "odb/db.h" namespace odb { diff --git a/src/odb/src/db/dbSBox.h b/src/odb/src/db/dbSBox.h index 11cc150febd..d8d83f9de88 100644 --- a/src/odb/src/db/dbSBox.h +++ b/src/odb/src/db/dbSBox.h @@ -33,11 +33,11 @@ #pragma once #include "dbBox.h" -#include "dbId.h" -#include "dbObject.h" -#include "dbTypes.h" -#include "geom.h" -#include "odb.h" +#include "odb/dbId.h" +#include "odb/dbObject.h" +#include "odb/dbTypes.h" +#include "odb/geom.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbSWire.h b/src/odb/src/db/dbSWire.h index dc534ea4e08..f5f120be323 100644 --- a/src/odb/src/db/dbSWire.h +++ b/src/odb/src/db/dbSWire.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/dbShape.cpp b/src/odb/src/db/dbShape.cpp index 84085c4b0a3..e6bf2fe5230 100644 --- a/src/odb/src/db/dbShape.cpp +++ b/src/odb/src/db/dbShape.cpp @@ -30,12 +30,12 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -#include "dbShape.h" +#include "odb/dbShape.h" -#include "db.h" #include "dbTechLayer.h" #include "dbTechVia.h" #include "dbVia.h" +#include "odb/db.h" namespace odb { diff --git a/src/odb/src/db/dbSite.h b/src/odb/src/db/dbSite.h index 4620538c765..2d17b780cf4 100644 --- a/src/odb/src/db/dbSite.h +++ b/src/odb/src/db/dbSite.h @@ -34,10 +34,10 @@ #include "dbCore.h" #include "dbHashTable.h" -#include "dbId.h" -#include "dbTypes.h" #include "dbVector.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/dbTable.h b/src/odb/src/db/dbTable.h index eebb861000a..254eee06701 100644 --- a/src/odb/src/db/dbTable.h +++ b/src/odb/src/db/dbTable.h @@ -34,11 +34,11 @@ #include -#include "ZException.h" #include "dbCore.h" -#include "dbIterator.h" #include "dbVector.h" -#include "odb.h" +#include "odb/ZException.h" +#include "odb/dbIterator.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbTable.hpp b/src/odb/src/db/dbTable.hpp index a7258b02aa4..a9073a04139 100644 --- a/src/odb/src/db/dbTable.hpp +++ b/src/odb/src/db/dbTable.hpp @@ -35,11 +35,11 @@ #include #include -#include "ZException.h" #include "dbDatabase.h" -#include "dbDiff.h" -#include "dbStream.h" #include "dbTable.h" +#include "odb/ZException.h" +#include "odb/dbDiff.h" +#include "odb/dbStream.h" namespace odb { diff --git a/src/odb/src/db/dbTargetItr.h b/src/odb/src/db/dbTargetItr.h index 28ecd1acaec..154dbcc3e3a 100644 --- a/src/odb/src/db/dbTargetItr.h +++ b/src/odb/src/db/dbTargetItr.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/dbTech.cpp b/src/odb/src/db/dbTech.cpp index c9884972527..2190bc97fa8 100644 --- a/src/odb/src/db/dbTech.cpp +++ b/src/odb/src/db/dbTech.cpp @@ -32,7 +32,6 @@ #include "dbTech.h" -#include "db.h" #include "dbBox.h" #include "dbBoxItr.h" #include "dbDatabase.h" @@ -52,6 +51,7 @@ #include "dbTechViaGenerateRule.h" #include "dbTechViaLayerRule.h" #include "dbTechViaRule.h" +#include "odb/db.h" #include "utl/Logger.h" namespace odb { diff --git a/src/odb/src/db/dbTech.h b/src/odb/src/db/dbTech.h index ecf67eb543d..d5cefd3419c 100644 --- a/src/odb/src/db/dbTech.h +++ b/src/odb/src/db/dbTech.h @@ -34,10 +34,10 @@ #include "dbCore.h" #include "dbHashTable.hpp" -#include "dbMatrix.h" -#include "dbTypes.h" #include "dbVector.h" -#include "odb.h" +#include "odb/dbMatrix.h" +#include "odb/dbTypes.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbTechLayer.h b/src/odb/src/db/dbTechLayer.h index b5a833dccfe..f6e980b1387 100644 --- a/src/odb/src/db/dbTechLayer.h +++ b/src/odb/src/db/dbTechLayer.h @@ -35,9 +35,9 @@ #include "dbCore.h" #include "dbHashTable.h" -#include "dbMatrix.h" -#include "dbTypes.h" #include "dbVector.h" +#include "odb/dbMatrix.h" +#include "odb/dbTypes.h" #include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbTechLayerAntennaRule.h b/src/odb/src/db/dbTechLayerAntennaRule.h index cc11305948b..5b91ca49a23 100644 --- a/src/odb/src/db/dbTechLayerAntennaRule.h +++ b/src/odb/src/db/dbTechLayerAntennaRule.h @@ -34,8 +34,8 @@ #include "dbCore.h" #include "dbTechLayer.h" -#include "dbTypes.h" -#include "odb.h" +#include "odb/dbTypes.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbTechLayerSpacingRule.cpp b/src/odb/src/db/dbTechLayerSpacingRule.cpp index 72d49aa41d0..4318b97112b 100644 --- a/src/odb/src/db/dbTechLayerSpacingRule.cpp +++ b/src/odb/src/db/dbTechLayerSpacingRule.cpp @@ -34,13 +34,13 @@ #include -#include "db.h" #include "dbDatabase.h" #include "dbTable.h" #include "dbTable.hpp" #include "dbTech.h" #include "dbTechLayer.h" -#include "lefout.h" +#include "odb/db.h" +#include "odb/lefout.h" namespace odb { diff --git a/src/odb/src/db/dbTechLayerSpacingRule.h b/src/odb/src/db/dbTechLayerSpacingRule.h index 748615a9043..9f315dc9237 100644 --- a/src/odb/src/db/dbTechLayerSpacingRule.h +++ b/src/odb/src/db/dbTechLayerSpacingRule.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/dbTechMinCutOrAreaRule.h b/src/odb/src/db/dbTechMinCutOrAreaRule.h index be661c7b244..1730a278f33 100644 --- a/src/odb/src/db/dbTechMinCutOrAreaRule.h +++ b/src/odb/src/db/dbTechMinCutOrAreaRule.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/dbTechVia.h b/src/odb/src/db/dbTechVia.h index 7906d5d4fa5..06fbddabdeb 100644 --- a/src/odb/src/db/dbTechVia.h +++ b/src/odb/src/db/dbTechVia.h @@ -33,10 +33,10 @@ #pragma once #include "dbCore.h" -#include "dbId.h" -#include "dbTypes.h" -#include "dbViaParams.h" -#include "odb.h" +#include "odb/dbId.h" +#include "odb/dbTypes.h" +#include "odb/dbViaParams.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbTypes.cpp b/src/odb/src/db/dbTypes.cpp index 339816e85d0..932d438e7f5 100644 --- a/src/odb/src/db/dbTypes.cpp +++ b/src/odb/src/db/dbTypes.cpp @@ -32,11 +32,10 @@ #include "odb/dbTypes.h" -#include - +#include #include -#include "dbId.h" +#include "odb/dbId.h" namespace odb { diff --git a/src/odb/src/db/dbVector.h b/src/odb/src/db/dbVector.h index ad5a1d3d4f9..0586beb341f 100644 --- a/src/odb/src/db/dbVector.h +++ b/src/odb/src/db/dbVector.h @@ -34,9 +34,9 @@ #include -#include "dbDiff.h" -#include "dbStream.h" -#include "odb.h" +#include "odb/dbDiff.h" +#include "odb/dbStream.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbVia.h b/src/odb/src/db/dbVia.h index bc06529e6dc..baccd381b48 100644 --- a/src/odb/src/db/dbVia.h +++ b/src/odb/src/db/dbVia.h @@ -33,11 +33,11 @@ #pragma once #include "dbCore.h" -#include "dbId.h" -#include "dbTypes.h" -#include "dbViaParams.h" -#include "geom.h" -#include "odb.h" +#include "odb/dbId.h" +#include "odb/dbTypes.h" +#include "odb/dbViaParams.h" +#include "odb/geom.h" +#include "odb/odb.h" namespace odb { diff --git a/src/odb/src/db/dbViaParams.cpp b/src/odb/src/db/dbViaParams.cpp index 4a1b0e57f3e..5419deb9b61 100644 --- a/src/odb/src/db/dbViaParams.cpp +++ b/src/odb/src/db/dbViaParams.cpp @@ -30,10 +30,10 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -#include "dbViaParams.h" +#include "odb/dbViaParams.h" -#include "db.h" -#include "dbDiff.h" +#include "odb/db.h" +#include "odb/dbDiff.h" namespace odb { diff --git a/src/odb/src/db/dbWireGraph.cpp b/src/odb/src/db/dbWireGraph.cpp index 4833db187a7..e88ea6f18a8 100644 --- a/src/odb/src/db/dbWireGraph.cpp +++ b/src/odb/src/db/dbWireGraph.cpp @@ -30,7 +30,7 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -#include "dbWireGraph.h" +#include "odb/dbWireGraph.h" #include "dbWire.h" #include "dbWireCodec.h" diff --git a/src/odb/src/db/dbWirePathItr.cpp b/src/odb/src/db/dbWirePathItr.cpp index 7839023464c..7a8e4257fa9 100644 --- a/src/odb/src/db/dbWirePathItr.cpp +++ b/src/odb/src/db/dbWirePathItr.cpp @@ -30,15 +30,15 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -#include "db.h" #include "dbBlock.h" #include "dbDatabase.h" #include "dbNet.h" -#include "dbShape.h" #include "dbTable.h" #include "dbWire.h" #include "dbWireCodec.h" #include "dbWireOpcode.h" +#include "odb/db.h" +#include "odb/dbShape.h" #include "utl/Logger.h" namespace odb { diff --git a/src/odb/src/db/dbWireShapeItr.cpp b/src/odb/src/db/dbWireShapeItr.cpp index 12ece24b28d..c528a5c5657 100644 --- a/src/odb/src/db/dbWireShapeItr.cpp +++ b/src/odb/src/db/dbWireShapeItr.cpp @@ -30,14 +30,14 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -#include "db.h" #include "dbBlock.h" #include "dbNet.h" -#include "dbShape.h" #include "dbTable.h" #include "dbWire.h" -#include "dbWireCodec.h" #include "dbWireOpcode.h" +#include "odb/db.h" +#include "odb/dbShape.h" +#include "odb/dbWireCodec.h" namespace odb {