odb: replace ZASSERT with assert

Signed-off-by: Matt Liberty <[email protected]>

Author: maliberty

src/odb/include/odb/ZException.h

@@ -3,10 +3,10 @@
 
 #pragma once
 
+#include <cassert>
 #include <map>
 #include <vector>
 
-#include "odb/ZException.h"
 #include "odb/dbMap.h"
 #include "odb/dbSet.h"
 
@@ -48,12 +48,12 @@ inline const D& dbMap<T, D>::operator[](T* object) const
 {
   if (_map) {
     typename std::map<T*, D>::const_iterator itr = _map->find(object);
-    ZASSERT(itr != _map->end());
+    assert(itr != _map->end());
     return (*itr).second;
   }
 
   uint idx = object->getId();
-  ZASSERT(idx && (idx < _vector->size()));
+  assert(idx && (idx < _vector->size()));
   return (*_vector)[idx];
 }
 
@@ -65,7 +65,7 @@ inline D& dbMap<T, D>::operator[](T* object)
   }
 
   uint idx = object->getId();
-  ZASSERT(idx && (idx < _vector->size()));
+  assert(idx && (idx < _vector->size()));
   return (*_vector)[idx];
 }
 

src/odb/include/odb/dbMap.hpp

@@ -7,7 +7,6 @@
 #include <cmath>
 #include <vector>
 
-#include "odb/ZException.h"
 #include "odb/dbObject.h"
 #include "odb/dbSet.h"
 #include "odb/dbTransform.h"

src/odb/include/odb/dbShape.h

@@ -20,7 +20,6 @@
 #include <vector>
 
 #include "boost/container/flat_map.hpp"
-#include "odb/ZException.h"
 #include "odb/dbObject.h"
 #include "odb/odb.h"
 

src/odb/include/odb/dbStream.h

@@ -3,11 +3,11 @@
 
 #pragma once
 
+#include <cassert>
 #include <vector>
 
 #include "dbCore.h"
 #include "dbVector.h"
-#include "odb/ZException.h"
 #include "odb/dbId.h"
 #include "odb/dbObject.h"
 #include "odb/odb.h"
@@ -90,9 +90,9 @@ class dbArrayTable : public dbObjectTable
   {
     uint page = id >> _page_shift;
     uint offset = id & _page_mask;
-    ZASSERT((id != 0) && (page < _page_cnt));
+    assert((id != 0) && (page < _page_cnt));
     T* p = (T*) &(_pages[page]->_objects[offset * sizeof(T)]);
-    ZASSERT(p->_oid & DB_ALLOC_BIT);
+    assert(p->_oid & DB_ALLOC_BIT);
     return p;
   }
 
@@ -118,9 +118,9 @@ class dbArrayTable : public dbObjectTable
   {
     uint page = id >> _page_shift;
     uint offset = id & _page_mask;
-    ZASSERT((id != 0) && (page < _page_cnt));
+    assert((id != 0) && (page < _page_cnt));
     T* p = (T*) &(_pages[page]->_objects[offset * sizeof(T)]);
-    ZASSERT((p->_oid & DB_ALLOC_BIT) == 0);
+    assert((p->_oid & DB_ALLOC_BIT) == 0);
     return p;
   }
 

src/odb/src/db/dbArrayTable.h

@@ -12,7 +12,6 @@
 #include "dbArrayTable.h"
 #include "dbCommon.h"
 #include "dbCore.h"
-#include "odb/ZException.h"
 #include "odb/dbId.h"
 #include "odb/dbObject.h"
 #include "odb/dbStream.h"
@@ -271,9 +270,9 @@ void dbArrayTable<T>::destroy(T* t)
 {
   --_alloc_cnt;
 
-  ZASSERT(t->getOID() != 0);
-  ZASSERT(t->getTable() == this);
-  ZASSERT(t->oid_ & DB_ALLOC_BIT);
+  assert(t->getOID() != 0);
+  assert(t->getTable() == this);
+  assert(t->oid_ & DB_ALLOC_BIT);
 
   dbArrayTablePage* page = (dbArrayTablePage*) t->getObjectPage();
   _dbFreeObject* o = (_dbFreeObject*) t;

src/odb/src/db/dbArrayTable.hpp

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "odb/ZException.h"
 #include "odb/dbStream.h"
 #include "odb/odb.h"
 

src/odb/src/db/dbAttrTable.h

@@ -3,6 +3,7 @@
 
 #include "dbBTerm.h"
 
+#include <cassert>
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>
@@ -29,7 +30,6 @@
 #include "dbNet.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
-#include "odb/ZException.h"
 #include "odb/db.h"
 #include "odb/dbBlockCallBackObj.h"
 #include "odb/dbObject.h"
@@ -644,7 +644,7 @@ dbBTerm* dbBTerm::create(dbNet* net_, const char* name)
     dbMaster* master = inst->getMaster();
     _dbMaster* master_impl = (_dbMaster*) master;
     _dbInstHdr* inst_hdr = parent_block->_inst_hdr_hash.find(master_impl->_id);
-    ZASSERT(inst_hdr->_inst_cnt == 1);
+    assert(inst_hdr->_inst_cnt == 1);
 
     master_impl->flags_._frozen = 0;  // allow the mterm creation
     auto mterm = (_dbMTerm*) dbMTerm::create(master, name, dbIoType::INOUT);

src/odb/src/db/dbBTerm.cpp

@@ -119,7 +119,6 @@
 #include "dbTrackGrid.h"
 #include "dbVia.h"
 #include "dbWire.h"
-#include "odb/ZException.h"
 #include "odb/db.h"
 #include "odb/dbBlockCallBackObj.h"
 #include "odb/dbExtControl.h"
@@ -2762,7 +2761,7 @@ void dbBlock::setCornerCount(int cornersStoredCnt,
                              int extDbCnt,
                              const char* name_list)
 {
-  ZASSERT((cornersStoredCnt > 0) && (cornersStoredCnt <= 256));
+  assert((cornersStoredCnt > 0) && (cornersStoredCnt <= 256));
   _dbBlock* block = (_dbBlock*) this;
 
   // TODO: Should this change be logged in the journal?
@@ -2871,7 +2870,7 @@ void dbBlock::getExtCornerName(int corner, char* cName)
   if (block->_num_ext_corners == 0) {
     return;
   }
-  ZASSERT((corner >= 0) && (corner < block->_num_ext_corners));
+  assert((corner >= 0) && (corner < block->_num_ext_corners));
 
   if (block->_corner_name_list == nullptr) {
     return;

src/odb/src/db/dbBlock.cpp

@@ -3,6 +3,7 @@
 
 #include "dbBox.h"
 
+#include <cassert>
 #include <cstring>
 #include <stdexcept>
 #include <vector>
@@ -29,7 +30,6 @@
 #include "dbTechLayer.h"
 #include "dbTechVia.h"
 #include "dbVia.h"
-#include "odb/ZException.h"
 #include "odb/db.h"
 #include "odb/dbBlockCallBackObj.h"
 #include "odb/dbObject.h"
@@ -289,7 +289,7 @@ _dbTechLayer* _dbBox::getTechLayer() const
     }
   }
 
-  ZASSERT(0);
+  assert(0);
   return nullptr;
 }
 
@@ -652,7 +652,7 @@ dbObject* dbBox::getBoxOwner() const
     }
   }
 
-  ZASSERT(0);
+  assert(0);
   return nullptr;
 }