odb: Revert the schema change and move include to user code area

Signed-off-by: Eren Dogan <[email protected]>

Author: erendn

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

@@ -73,5 +73,5 @@
             "parent":"dbBlock"
         }
     ],
-    "cpp_includes":["dbBlock.h","dbModule.h","dbModNet.h","dbHashTable.hpp","dbModITerm.h","dbBusPort.h","dbJournal.h","utl/Logger.h"]
+    "cpp_includes":["dbBlock.h","dbModule.h","dbModNet.h","dbHashTable.hpp","dbModITerm.h","dbBusPort.h","dbJournal.h"]
 }

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

@@ -61,5 +61,5 @@
 	}
 
     ],
-    "cpp_includes":["dbBlock.h","dbModInst.h","dbModNet.h","dbHashTable.hpp","dbModBTerm.h", "dbJournal.h","utl/Logger.h"]
+    "cpp_includes":["dbBlock.h","dbModInst.h","dbModNet.h","dbHashTable.hpp","dbModBTerm.h", "dbJournal.h"]
 }

src/odb/src/db/dbModBTerm.cpp

@@ -15,11 +15,11 @@
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
-#include "utl/Logger.h"
 // User Code Begin Includes
 #include <string>
 
 #include "odb/dbBlockCallBackObj.h"
+#include "utl/Logger.h"
 // User Code End Includes
 namespace odb {
 template class dbTable<_dbModBTerm>;

src/odb/src/db/dbModITerm.cpp

@@ -14,11 +14,11 @@
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
-#include "utl/Logger.h"
 // User Code Begin Includes
 #include <string>
 
 #include "odb/dbBlockCallBackObj.h"
+#include "utl/Logger.h"
 // User Code End Includes
 namespace odb {
 template class dbTable<_dbModITerm>;