diff --git a/include/sta/ConcreteLibrary.hh b/include/sta/ConcreteLibrary.hh index 75018056..6d291700 100644 --- a/include/sta/ConcreteLibrary.hh +++ b/include/sta/ConcreteLibrary.hh @@ -81,12 +81,12 @@ protected: void removeCell(ConcreteCell *cell); std::string name_; - ObjectId id_; std::string filename_; + ConcreteCellMap cell_map_; + ObjectId id_; bool is_liberty_; char bus_brkt_left_{'['}; char bus_brkt_right_{']'}; - ConcreteCellMap cell_map_; private: friend class ConcreteCell; diff --git a/include/sta/ConcreteNetwork.hh b/include/sta/ConcreteNetwork.hh index 593c444c..cbbce614 100644 --- a/include/sta/ConcreteNetwork.hh +++ b/include/sta/ConcreteNetwork.hh @@ -366,10 +366,10 @@ protected: ConcretePort *port_; ConcreteNet *net_; ConcreteTerm *term_{nullptr}; - ObjectId id_; // Doubly linked list of net pins. ConcretePin *net_next_{nullptr}; ConcretePin *net_prev_{nullptr}; + ObjectId id_; VertexId vertex_id_{vertex_id_null}; private: diff --git a/network/ConcreteLibrary.cc b/network/ConcreteLibrary.cc index 77b335a1..45eff5b6 100644 --- a/network/ConcreteLibrary.cc +++ b/network/ConcreteLibrary.cc @@ -42,8 +42,8 @@ ConcreteLibrary::ConcreteLibrary(std::string_view name, std::string_view filename, bool is_liberty) : name_(name), - id_(ConcreteNetwork::nextObjectId()), filename_(filename), + id_(ConcreteNetwork::nextObjectId()), is_liberty_(is_liberty) { }