odb: Resolved master merge conflict

jhkim-pii · jhkim-pii · commit 9cc00f12d804 · 2025-12-21T18:26:42.000+09:00
Signed-off-by: Jaehyun Kim &lt;jhkim@precisioninno.com&gt;
diff --git a/src/odb/src/db/dbDatabase.cpp b/src/odb/src/db/dbDatabase.cpp
@@ -292,7 +292,7 @@ dbIStream& operator>>(dbIStream& stream, _dbDatabase& obj)
       stream >> obj.dbu_per_micron_;
     }
   }
-  if (obj.isSchema(db_schema_hierarchy_flag)) {
+  if (obj.isSchema(kSchemaHierarchyFlag)) {
     stream >> obj.hierarchy_;
   } else {
     obj.hierarchy_ = false;

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ dbIStream& operator>>(dbIStream& stream, _dbDatabase& obj)`
`292`	`292`	`stream >> obj.dbu_per_micron_;`
`293`	`293`	`}`
`294`	`294`	`}`
`295`		`- if (obj.isSchema(db_schema_hierarchy_flag)) {`
	`295`	`+ if (obj.isSchema(kSchemaHierarchyFlag)) {`
`296`	`296`	`stream >> obj.hierarchy_;`
`297`	`297`	`} else {`
`298`	`298`	`obj.hierarchy_ = false;`