Merge branch 'master' into heatmap-units

Author: gadfort

src/gpl/src/nesterovPlace.cpp

@@ -1209,11 +1209,12 @@ nesterovDbCbk::nesterovDbCbk(NesterovPlace* nesterov_place)
 void NesterovPlace::createCbkGCell(odb::dbInst* db_inst)
 {
   auto gcell_index = nbc_->createCbkGCell(db_inst);
-  for (auto& nesterov : nbVec_) {
-    // TODO: manage regions, not every NB should create a
-    // gcell.
-    nesterov->createCbkGCell(db_inst, gcell_index);
-  }
+  // Always create gcell on top-level
+  nbVec_[0]->createCbkGCell(db_inst, gcell_index);
+  // TODO: create new gcell in its proper region
+  // for (auto& nesterov : nbVec_) {
+  //   nesterov->createCbkGCell(db_inst, gcell_index);
+  // }
 }
 
 void NesterovPlace::destroyCbkGCell(odb::dbInst* db_inst)

src/odb/include/odb/dbId.h

@@ -20,7 +20,7 @@ class dbId
   dbId(unsigned int id) : id_(id) {}
 
   operator unsigned int() const { return id_; }
-  unsigned int& id() { return id_; }
+  unsigned int id() const { return id_; }
 
   bool isValid() const { return id_ != invalid; }
   void clear() { id_ = invalid; }