diff --git a/dcalc/GraphDelayCalc.cc b/dcalc/GraphDelayCalc.cc index 5b86be82..05fa4dca 100644 --- a/dcalc/GraphDelayCalc.cc +++ b/dcalc/GraphDelayCalc.cc @@ -29,12 +29,6 @@ GraphDelayCalc::GraphDelayCalc(StaState *sta) : { } -void -GraphDelayCalc::copyState(const StaState *sta) -{ - StaState::copyState(sta); -} - void GraphDelayCalc::setObserver(DelayCalcObserver *observer) { diff --git a/include/sta/GraphDelayCalc.hh b/include/sta/GraphDelayCalc.hh index e07867d4..cdf70afe 100644 --- a/include/sta/GraphDelayCalc.hh +++ b/include/sta/GraphDelayCalc.hh @@ -44,7 +44,6 @@ class GraphDelayCalc : public StaState public: explicit GraphDelayCalc(StaState *sta); virtual ~GraphDelayCalc() {} - virtual void copyState(const StaState *sta); // Find arc delays and vertex slews thru level. virtual void findDelays(Level /* level */) {}; // Find and annotate drvr_vertex gate and load delays/slews. diff --git a/include/sta/StaState.hh b/include/sta/StaState.hh index 39defbad..f0268e89 100644 --- a/include/sta/StaState.hh +++ b/include/sta/StaState.hh @@ -122,9 +122,6 @@ protected: DispatchQueue *dispatch_queue_; bool pocv_enabled_; float sigma_factor_; - -private: - DISALLOW_COPY_AND_ASSIGN(StaState); }; } // namespace diff --git a/search/StaState.cc b/search/StaState.cc index a4c77c46..10324931 100644 --- a/search/StaState.cc +++ b/search/StaState.cc @@ -47,55 +47,15 @@ StaState::StaState() : { } -StaState::StaState(const StaState *sta) : - report_(sta->report_), - debug_(sta->debug_), - units_(sta->units_), - network_(sta->network_), - sdc_network_(sta->sdc_network_), - cmd_network_(sta->cmd_network_), - sdc_(sta->sdc_), - corners_(sta->corners_), - graph_(sta->graph_), - levelize_(sta->levelize_), - parasitics_(sta->parasitics_), - arc_delay_calc_(sta->arc_delay_calc_), - graph_delay_calc_(sta->graph_delay_calc_), - sim_(sta->sim_), - search_(sta->search_), - latches_(sta->latches_), - clk_network_(sta->clk_network_), - thread_count_(sta->thread_count_), - dispatch_queue_(sta->dispatch_queue_), - pocv_enabled_(sta->pocv_enabled_), - sigma_factor_(sta->sigma_factor_) +StaState::StaState(const StaState *sta) { + *this = *sta; } void StaState::copyState(const StaState *sta) { - report_ = sta->report_; - debug_ = sta->debug_; - units_ = sta->units_; - network_ = sta->network_; - sdc_network_ = sta->sdc_network_; - cmd_network_ = sta->cmd_network_; - sdc_ = sta->sdc_; - corners_ = sta->corners_; - graph_ = sta->graph_; - levelize_ = sta->levelize_; - parasitics_ = sta->parasitics_; - arc_delay_calc_ = sta->arc_delay_calc_; - graph_delay_calc_ = sta->graph_delay_calc_; - sim_ = sta->sim_; - search_ = sta->search_; - latches_ = sta->latches_; - clk_network_ = sta->clk_network_; - thread_count_ = sta->thread_count_; - dispatch_queue_ = sta->dispatch_queue_; - pocv_enabled_ = sta->pocv_enabled_; - sigma_factor_ = sta->sigma_factor_; + *this = *sta; } void