fix imports

Signed-off-by: LucasYuki <[email protected]>

Author: LucasYuki

src/odb/include/odb/dbChipCallBackObj.h

@@ -3,10 +3,6 @@
 
 #pragma once
 
-#include <list>
-
-#include "odb/odb.h"
-
 namespace odb {
 
 class dbChip;

src/odb/src/codeGenerator/schema/chip/dbChip.json

@@ -183,7 +183,7 @@
       "flags": ["private", "no-serial"]
     }
   ],
-  "declared_classes": ["dbPropertyItr", "_dbNameCache","dbBlockItr"],
+  "declared_classes": ["dbPropertyItr", "_dbNameCache","dbBlockItr","dbChipCallBackObj"],
   "h_includes": [
     "odb/geom.h"
   ],
@@ -196,11 +196,8 @@
     "dbTech.h", 
     "dbPropertyItr.h",
     "dbChipConn.h",
-    "dbChipConnItr.h",
     "dbChipInst.h",
-    "dbChipInstItr.h",
     "dbChipNet.h",
-    "dbChipNetItr.h",
     "dbCommon.h",
     "odb/dbChipCallBackObj.h",
     "odb/dbObject.h",

src/odb/src/db/CMakeLists.txt

@@ -61,6 +61,7 @@ add_library(db
     dbJournal.cpp 
     dbJournalLog.cpp 
     dbBlockCallBackObj.cpp 
+    dbChipCallBackObj.cpp 
     dbRegion.cpp 
     dbRegionInstItr.cpp 
     dbExtControl.cpp 
@@ -90,7 +91,6 @@ add_library(db
     dbChip.cpp
     dbChipBump.cpp
     dbChipBumpInst.cpp
-    dbChipCallBackObj.cpp 
     dbChipConn.cpp
     dbChipInst.cpp
     dbChipNet.cpp

src/odb/src/db/dbChip.cpp

@@ -10,11 +10,8 @@
 #include "dbBlock.h"
 #include "dbBlockItr.h"
 #include "dbChipConn.h"
-#include "dbChipConnItr.h"
 #include "dbChipInst.h"
-#include "dbChipInstItr.h"
 #include "dbChipNet.h"
-#include "dbChipNetItr.h"
 #include "dbChipRegion.h"
 #include "dbCommon.h"
 #include "dbDatabase.h"

src/odb/src/db/dbChip.h

@@ -22,6 +22,7 @@ class _dbDatabase;
 class dbPropertyItr;
 class _dbNameCache;
 class dbBlockItr;
+class dbChipCallBackObj;
 class _dbProperty;
 class _dbChipRegion;
 class _dbMarkerCategory;
@@ -30,9 +31,6 @@ class _dbChipInst;
 class _dbChipConn;
 class _dbChipNet;
 class _dbTech;
-// User Code Begin Classes
-class dbChipCallBackObj;
-// User Code End Classes
 
 class _dbChip : public _dbObject
 {

src/odb/src/db/dbMarkerCategory.cpp

@@ -479,8 +479,7 @@ std::set<dbMarkerCategory*> dbMarkerCategory::fromJSON(dbChip* chip,
     logger->error(utl::ODB, 31, "Unable to open marker report: {}", path);
   }
 
-  std::set<dbMarkerCategory*> categories
-      = fromJSON(chip, path.c_str(), report);
+  std::set<dbMarkerCategory*> categories = fromJSON(chip, path.c_str(), report);
 
   report.close();