diff --git a/dcalc/NetCaps.hh b/dcalc/NetCaps.hh index cef4fd11..33664d83 100644 --- a/dcalc/NetCaps.hh +++ b/dcalc/NetCaps.hh @@ -16,8 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" - namespace sta { // Constraints::pinNetCap return values. @@ -39,8 +37,6 @@ public: bool hasSetLoad() const { return has_set_load_; } private: - DISALLOW_COPY_AND_ASSIGN(NetCaps); - float pin_cap_; float wire_cap_; float fanout_; diff --git a/graph/Graph.cc b/graph/Graph.cc index 0d05faa7..16ef0f29 100644 --- a/graph/Graph.cc +++ b/graph/Graph.cc @@ -16,7 +16,6 @@ #include "Graph.hh" -#include "DisallowCopyAssign.hh" #include "Debug.hh" #include "Stats.hh" #include "MinMax.hh" @@ -112,9 +111,6 @@ protected: int &bidirect_count_; int &load_count_; const Network *network_; - -private: - DISALLOW_COPY_AND_ASSIGN(FindNetDrvrLoadCounts); }; FindNetDrvrLoadCounts::FindNetDrvrLoadCounts(Pin *drvr_pin, @@ -308,7 +304,6 @@ public: MakeEdgesThruHierPin(Graph *graph); private: - DISALLOW_COPY_AND_ASSIGN(MakeEdgesThruHierPin); virtual void visit(Pin *drvr, Pin *load); diff --git a/include/sta/ArcDelayCalc.hh b/include/sta/ArcDelayCalc.hh index d55606fb..45a7037c 100644 --- a/include/sta/ArcDelayCalc.hh +++ b/include/sta/ArcDelayCalc.hh @@ -17,7 +17,6 @@ #pragma once #include -#include "DisallowCopyAssign.hh" #include "MinMax.hh" #include "LibertyClass.hh" #include "NetworkClass.hh" @@ -137,9 +136,6 @@ protected: const DcalcAnalysisPt *dcalc_ap) const; TimingModel *model(TimingArc *arc, const DcalcAnalysisPt *dcalc_ap) const; - -private: - DISALLOW_COPY_AND_ASSIGN(ArcDelayCalc); }; } // namespace diff --git a/include/sta/Bfs.hh b/include/sta/Bfs.hh index 58a87bbc..f46ad1b5 100644 --- a/include/sta/Bfs.hh +++ b/include/sta/Bfs.hh @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "Iterator.hh" #include "Set.hh" #include "GraphClass.hh" @@ -113,9 +112,6 @@ protected: friend class BfsFwdIterator; friend class BfsBkwdIterator; - -private: - DISALLOW_COPY_AND_ASSIGN(BfsIterator); }; class BfsFwdIterator : public BfsIterator @@ -136,9 +132,6 @@ protected: virtual bool levelLess(Level level1, Level level2) const; virtual void incrLevel(Level &level); - -private: - DISALLOW_COPY_AND_ASSIGN(BfsFwdIterator); }; class BfsBkwdIterator : public BfsIterator @@ -159,9 +152,6 @@ protected: virtual bool levelLess(Level level1, Level level2) const; virtual void incrLevel(Level &level); - -private: - DISALLOW_COPY_AND_ASSIGN(BfsBkwdIterator); }; } // namespace diff --git a/include/sta/Clock.hh b/include/sta/Clock.hh index 88f343c4..702ec981 100644 --- a/include/sta/Clock.hh +++ b/include/sta/Clock.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "MinMax.hh" #include "RiseFallMinMax.hh" #include "SdcClass.hh" @@ -192,8 +191,6 @@ protected: FloatSeq *edge_shifts_; private: - DISALLOW_COPY_AND_ASSIGN(Clock); - friend class Sdc; }; @@ -213,7 +210,6 @@ public: friend class Clock; // builder private: - DISALLOW_COPY_AND_ASSIGN(ClockEdge); ClockEdge(Clock *clock, RiseFall *rf); void setTime(float time); @@ -266,8 +262,6 @@ public: bool empty() const; private: - DISALLOW_COPY_AND_ASSIGN(InterClockUncertainty); - const Clock *src_; const Clock *target_; RiseFallMinMax uncertainties_[RiseFall::index_count]; diff --git a/include/sta/ClockGatingCheck.hh b/include/sta/ClockGatingCheck.hh index 7f065b5e..11d14fb2 100644 --- a/include/sta/ClockGatingCheck.hh +++ b/include/sta/ClockGatingCheck.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "SdcClass.hh" #include "RiseFallMinMax.hh" @@ -31,8 +30,6 @@ public: LogicValue activeValue() const { return active_value_; } private: - DISALLOW_COPY_AND_ASSIGN(ClockGatingCheck); - RiseFallMinMax margins_; LogicValue active_value_; }; diff --git a/include/sta/ClockGroups.hh b/include/sta/ClockGroups.hh index 6c519df9..f9e793c4 100644 --- a/include/sta/ClockGroups.hh +++ b/include/sta/ClockGroups.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "SdcCmdComment.hh" #include "SdcClass.hh" @@ -31,8 +30,6 @@ public: ClockSet *clks() const { return clks_; } private: - DISALLOW_COPY_AND_ASSIGN(ClockGroup); - ClockSet *clks_; }; @@ -62,8 +59,6 @@ private: bool asynchronous_; bool allow_paths_; ClockGroupSet groups_; - - DISALLOW_COPY_AND_ASSIGN(ClockGroups); }; } // namespace diff --git a/include/sta/ClockInsertion.hh b/include/sta/ClockInsertion.hh index 60df7817..4e9d3866 100644 --- a/include/sta/ClockInsertion.hh +++ b/include/sta/ClockInsertion.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "MinMax.hh" #include "NetworkClass.hh" #include "SdcClass.hh" @@ -45,8 +44,6 @@ public: void setDelays(RiseFallMinMax *delays); private: - DISALLOW_COPY_AND_ASSIGN(ClockInsertion); - const Clock *clk_; const Pin *pin_; RiseFallMinMax delays_[EarlyLate::index_count]; diff --git a/include/sta/ClockLatency.hh b/include/sta/ClockLatency.hh index 456d0a2c..9f599b34 100644 --- a/include/sta/ClockLatency.hh +++ b/include/sta/ClockLatency.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "MinMax.hh" #include "NetworkClass.hh" #include "Transition.hh" @@ -49,8 +48,6 @@ public: void setDelays(RiseFallMinMax *delays); private: - DISALLOW_COPY_AND_ASSIGN(ClockLatency); - const Clock *clk_; const Pin *pin_; RiseFallMinMax delays_; diff --git a/include/sta/ConcreteLibrary.hh b/include/sta/ConcreteLibrary.hh index 12195777..2bea143d 100644 --- a/include/sta/ConcreteLibrary.hh +++ b/include/sta/ConcreteLibrary.hh @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "Vector.hh" #include "Map.hh" #include "StringUtil.hh" @@ -82,8 +81,6 @@ protected: ConcreteCellMap cell_map_; private: - DISALLOW_COPY_AND_ASSIGN(ConcreteLibrary); - friend class ConcreteCell; }; @@ -161,8 +158,6 @@ protected: bool is_leaf_; private: - DISALLOW_COPY_AND_ASSIGN(ConcreteCell); - friend class ConcreteLibrary; friend class ConcreteCellPortBitIterator; }; @@ -241,8 +236,6 @@ protected: ConcretePortSeq *member_ports_; private: - DISALLOW_COPY_AND_ASSIGN(ConcretePort); - friend class ConcreteCell; }; @@ -254,7 +247,6 @@ public: virtual ConcretePort *next(); private: - DISALLOW_COPY_AND_ASSIGN(ConcreteCellPortBitIterator); void findNext(); ConcretePortSeq::ConstIterator port_iter_; diff --git a/include/sta/ConcreteNetwork.hh b/include/sta/ConcreteNetwork.hh index a81f863b..48a4cef4 100644 --- a/include/sta/ConcreteNetwork.hh +++ b/include/sta/ConcreteNetwork.hh @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "Map.hh" #include "Set.hh" #include "StringUtil.hh" @@ -261,8 +260,6 @@ protected: CellNetworkViewMap cell_network_view_map_; private: - DISALLOW_COPY_AND_ASSIGN(ConcreteNetwork); - friend class ConcreteLibertyLibraryIterator; }; @@ -306,8 +303,6 @@ protected: ConcreteInstanceNetMap *nets_; private: - DISALLOW_COPY_AND_ASSIGN(ConcreteInstance); - friend class ConcreteNetwork; friend class ConcreteInstancePinIterator; }; @@ -339,8 +334,6 @@ protected: VertexId vertex_id_; private: - DISALLOW_COPY_AND_ASSIGN(ConcretePin); - friend class ConcreteNetwork; friend class ConcreteNet; friend class ConcreteNetPinIterator; @@ -364,8 +357,6 @@ protected: ConcreteTerm *net_next_; private: - DISALLOW_COPY_AND_ASSIGN(ConcreteTerm); - friend class ConcreteNetwork; friend class ConcreteNet; friend class ConcreteNetTermIterator; @@ -384,7 +375,6 @@ public: ConcreteNet *mergedInto() { return merged_into_; } protected: - DISALLOW_COPY_AND_ASSIGN(ConcreteNet); ConcreteNet(const char *name, ConcreteInstance *instance); ~ConcreteNet(); diff --git a/include/sta/Corner.hh b/include/sta/Corner.hh index 9a9e790e..9c7010dd 100644 --- a/include/sta/Corner.hh +++ b/include/sta/Corner.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "MinMax.hh" #include "Vector.hh" #include "StringSet.hh" @@ -93,8 +92,6 @@ private: ParasiticAnalysisPtSeq parasitic_analysis_pts_; DcalcAnalysisPtSeq dcalc_analysis_pts_; PathAnalysisPtSeq path_analysis_pts_; - - DISALLOW_COPY_AND_ASSIGN(Corners); }; class Corner @@ -131,7 +128,6 @@ private: LibertySeq liberty_[MinMax::index_count]; friend class Corners; - DISALLOW_COPY_AND_ASSIGN(Corner); }; } // namespace diff --git a/include/sta/CycleAccting.hh b/include/sta/CycleAccting.hh index 6da1ec2a..029405c1 100644 --- a/include/sta/CycleAccting.hh +++ b/include/sta/CycleAccting.hh @@ -83,7 +83,6 @@ public: bool maxCyclesExceeded() const { return max_cycles_exceeded_; } private: - DISALLOW_COPY_AND_ASSIGN(CycleAccting); void setHoldAccting(int src_cycle, int tgt_cycle, float delay, diff --git a/include/sta/DataCheck.hh b/include/sta/DataCheck.hh index a6690b44..91d76437 100644 --- a/include/sta/DataCheck.hh +++ b/include/sta/DataCheck.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "MinMax.hh" #include "LibertyClass.hh" #include "NetworkClass.hh" @@ -57,8 +56,6 @@ public: bool &one_value) const; private: - DISALLOW_COPY_AND_ASSIGN(DataCheck); - Pin *from_; Pin *to_; Clock *clk_; diff --git a/include/sta/DcalcAnalysisPt.hh b/include/sta/DcalcAnalysisPt.hh index c938f923..3d832d17 100644 --- a/include/sta/DcalcAnalysisPt.hh +++ b/include/sta/DcalcAnalysisPt.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Iterator.hh" #include "MinMax.hh" #include "LibertyClass.hh" @@ -63,8 +62,6 @@ public: int libertyIndex() const; private: - DISALLOW_COPY_AND_ASSIGN(DcalcAnalysisPt); - Corner *corner_; DcalcAPIndex index_; DcalcAPIndex check_clk_slew_index_; diff --git a/include/sta/Debug.hh b/include/sta/Debug.hh index 4df93cf1..77dcee5d 100644 --- a/include/sta/Debug.hh +++ b/include/sta/Debug.hh @@ -17,7 +17,6 @@ #pragma once #include -#include "DisallowCopyAssign.hh" #include "Map.hh" #include "StringUtil.hh" @@ -49,9 +48,6 @@ protected: bool debug_on_; DebugMap *debug_map_; int stats_level_; - -private: - DISALLOW_COPY_AND_ASSIGN(Debug); }; // Inlining a varargs function would eval the args, which can diff --git a/include/sta/DeratingFactors.hh b/include/sta/DeratingFactors.hh index 6bb7e83e..72be0200 100644 --- a/include/sta/DeratingFactors.hh +++ b/include/sta/DeratingFactors.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "MinMax.hh" #include "LibertyClass.hh" #include "SdcClass.hh" @@ -48,8 +47,6 @@ public: bool hasValue() const; private: - DISALLOW_COPY_AND_ASSIGN(DeratingFactors); - RiseFallMinMax factors_[path_clk_or_data_count]; }; @@ -78,8 +75,6 @@ public: void clear(); private: - DISALLOW_COPY_AND_ASSIGN(DeratingFactorsGlobal); - DeratingFactors factors_[timing_derate_type_count]; }; @@ -112,9 +107,6 @@ class DeratingFactorsNet : public DeratingFactors { public: DeratingFactorsNet(); - -private: - DISALLOW_COPY_AND_ASSIGN(DeratingFactorsNet); }; } // namespace diff --git a/include/sta/DisabledPorts.hh b/include/sta/DisabledPorts.hh index bc728130..a3f59069 100644 --- a/include/sta/DisabledPorts.hh +++ b/include/sta/DisabledPorts.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Map.hh" #include "NetworkClass.hh" #include "LibertyClass.hh" @@ -54,8 +53,6 @@ public: bool all() const { return all_; } private: - DISALLOW_COPY_AND_ASSIGN(DisabledPorts); - bool all_; LibertyPortSet *from_; LibertyPortSet *to_; @@ -77,8 +74,6 @@ public: using DisabledPorts::isDisabled; private: - DISALLOW_COPY_AND_ASSIGN(DisabledCellPorts); - LibertyCell *cell_; TimingArcSetSet *arc_sets_; }; @@ -91,8 +86,6 @@ public: Instance *instance() const { return inst_; } private: - DISALLOW_COPY_AND_ASSIGN(DisabledInstancePorts); - Instance *inst_; }; diff --git a/include/sta/DisallowCopyAssign.hh b/include/sta/DisallowCopyAssign.hh deleted file mode 100644 index d90baf83..00000000 --- a/include/sta/DisallowCopyAssign.hh +++ /dev/null @@ -1,23 +0,0 @@ -// OpenSTA, Static Timing Analyzer -// Copyright (c) 2022, Parallax Software, Inc. -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -#pragma once - -// Disallow the copy constructor and operator= functions. -// This should be used in the private declarations for a class. -#define DISALLOW_COPY_AND_ASSIGN(type_name) \ - type_name(const type_name&) = delete; \ - void operator=(const type_name&) = delete diff --git a/include/sta/ExceptionPath.hh b/include/sta/ExceptionPath.hh index 5d18601c..e0337c5b 100644 --- a/include/sta/ExceptionPath.hh +++ b/include/sta/ExceptionPath.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Error.hh" #include "Set.hh" #include "SdcCmdComment.hh" @@ -128,9 +127,6 @@ protected: bool own_pts_; int priority_; ExceptionState *states_; - -private: - DISALLOW_COPY_AND_ASSIGN(ExceptionPath); }; // set_false_path @@ -161,9 +157,6 @@ public: virtual bool overrides(ExceptionPath *exception) const; virtual int typePriority() const; virtual bool tighterThan(ExceptionPath *exception) const; - -private: - DISALLOW_COPY_AND_ASSIGN(FalsePath); }; // Loop paths are false paths used to disable paths around @@ -177,9 +170,6 @@ public: virtual ExceptionPathType type() const { return ExceptionPathType::loop; } virtual const char *typeString() const; virtual bool mergeable(ExceptionPath *exception) const; - -private: - DISALLOW_COPY_AND_ASSIGN(LoopPath); }; // set_max_delay/set_min_delay @@ -212,9 +202,6 @@ public: protected: bool ignore_clk_latency_; float delay_; - -private: - DISALLOW_COPY_AND_ASSIGN(PathDelay); }; // set_multicycle_path @@ -253,9 +240,6 @@ public: protected: bool use_end_clk_; int path_multiplier_; - -private: - DISALLOW_COPY_AND_ASSIGN(MultiCyclePath); }; // Filter used restrict path reporting -from/-thru nets/pins. @@ -281,9 +265,6 @@ public: const MinMaxAll *min_max); virtual int typePriority() const; virtual bool tighterThan(ExceptionPath *exception) const; - -private: - DISALLOW_COPY_AND_ASSIGN(FilterPath); }; class GroupPath : public ExceptionPath @@ -314,9 +295,6 @@ public: protected: const char *name_; bool is_default_; - -private: - DISALLOW_COPY_AND_ASSIGN(GroupPath); }; // Base class for Exception from/thru/to. @@ -368,9 +346,6 @@ protected: static const size_t hash_pin = 5; static const size_t hash_net = 7; static const size_t hash_inst = 11; - -private: - DISALLOW_COPY_AND_ASSIGN(ExceptionPt); }; class ExceptionFromTo : public ExceptionPt @@ -420,9 +395,6 @@ protected: PinSet *pins_; ClockSet *clks_; InstanceSet *insts_; - -private: - DISALLOW_COPY_AND_ASSIGN(ExceptionFromTo); }; class ExceptionFrom : public ExceptionFromTo @@ -441,9 +413,6 @@ public: protected: virtual const char *cmdKeyword() const; virtual void findHash(); - -private: - DISALLOW_COPY_AND_ASSIGN(ExceptionFrom); }; class ExceptionTo : public ExceptionFromTo @@ -486,9 +455,6 @@ protected: // -rise|-fall endpoint transition. const RiseFallBoth *end_rf_; - -private: - DISALLOW_COPY_AND_ASSIGN(ExceptionTo); }; class ExceptionThru : public ExceptionPt @@ -565,9 +531,6 @@ protected: EdgePinsSet *edges_; NetSet *nets_; InstanceSet *insts_; - -private: - DISALLOW_COPY_AND_ASSIGN(ExceptionThru); }; ExceptionThruSeq * @@ -583,8 +546,6 @@ public: ExceptionPt *next(); private: - DISALLOW_COPY_AND_ASSIGN(ExceptionPtIterator); - const ExceptionPath *exception_; bool from_done_; ExceptionThruSeq::Iterator thru_iter_; @@ -616,7 +577,6 @@ protected: const Network *network_; private: - DISALLOW_COPY_AND_ASSIGN(ExpandedExceptionVisitor); void expandFrom(); void expandThrus(ExceptionFrom *expanded_from); void expandThru(ExceptionFrom *expanded_from, @@ -647,8 +607,6 @@ public: size_t hash() const; private: - DISALLOW_COPY_AND_ASSIGN(ExceptionState); - ExceptionPath *exception_; ExceptionThru *next_thru_; ExceptionState *next_state_; diff --git a/include/sta/FuncExpr.hh b/include/sta/FuncExpr.hh index 5f13cfdd..d7726b33 100644 --- a/include/sta/FuncExpr.hh +++ b/include/sta/FuncExpr.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Set.hh" #include "NetworkClass.hh" #include "LibertyClass.hh" @@ -73,7 +72,6 @@ public: bool checkSize(LibertyPort *port); private: - DISALLOW_COPY_AND_ASSIGN(FuncExpr); FuncExpr(Operator op, FuncExpr *left, FuncExpr *right, @@ -100,7 +98,6 @@ public: virtual LibertyPort *next() { return iter_.next(); } private: - DISALLOW_COPY_AND_ASSIGN(FuncExprPortIterator); void findPorts(FuncExpr *expr); LibertyPortSet ports_; diff --git a/include/sta/Graph.hh b/include/sta/Graph.hh index 1b62b0cf..2bfea752 100644 --- a/include/sta/Graph.hh +++ b/include/sta/Graph.hh @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "Iterator.hh" #include "Map.hh" #include "Vector.hh" @@ -269,9 +268,6 @@ protected: friend class VertexInEdgeIterator; friend class VertexOutEdgeIterator; friend class MakeEdgesThruHierPin; - -private: - DISALLOW_COPY_AND_ASSIGN(Graph); }; // Each Vertex corresponds to one network pin. @@ -388,8 +384,6 @@ protected: unsigned object_idx_:VertexTable::idx_bits; private: - DISALLOW_COPY_AND_ASSIGN(Vertex); - friend class Graph; friend class Edge; friend class VertexInEdgeIterator; @@ -459,8 +453,6 @@ protected: unsigned object_idx_:VertexTable::idx_bits; private: - DISALLOW_COPY_AND_ASSIGN(Edge); - friend class Graph; friend class GraphDelays1; friend class GraphSlewsDelays1; @@ -479,7 +471,6 @@ public: virtual Vertex *next(); private: - DISALLOW_COPY_AND_ASSIGN(VertexIterator); bool findNextPin(); void findNext(); @@ -503,8 +494,6 @@ public: Edge *next(); private: - DISALLOW_COPY_AND_ASSIGN(VertexInEdgeIterator); - Edge *next_; const Graph *graph_; }; @@ -518,8 +507,6 @@ public: Edge *next(); private: - DISALLOW_COPY_AND_ASSIGN(VertexOutEdgeIterator); - Edge *next_; const Graph *graph_; }; @@ -535,8 +522,6 @@ public: virtual Edge *next() { return edge_iter_.next(); } private: - DISALLOW_COPY_AND_ASSIGN(EdgesThruHierPinIterator); - EdgeSet edges_; EdgeSet::Iterator edge_iter_; }; diff --git a/include/sta/GraphDelayCalc.hh b/include/sta/GraphDelayCalc.hh index cdf70afe..bc9ca04c 100644 --- a/include/sta/GraphDelayCalc.hh +++ b/include/sta/GraphDelayCalc.hh @@ -17,7 +17,6 @@ #pragma once #include -#include "DisallowCopyAssign.hh" #include "GraphClass.hh" #include "DcalcAnalysisPt.hh" #include "StaState.hh" @@ -118,9 +117,6 @@ public: // Return values. float &min_period, bool &exists); - -private: - DISALLOW_COPY_AND_ASSIGN(GraphDelayCalc); }; // Abstract base class for edge delay change observer. @@ -132,9 +128,6 @@ public: virtual void delayChangedFrom(Vertex *vertex) = 0; virtual void delayChangedTo(Vertex *vertex) = 0; virtual void checkDelayChangedTo(Vertex *vertex) = 0; - -private: - DISALLOW_COPY_AND_ASSIGN(DelayCalcObserver); }; } // namespace diff --git a/include/sta/HpinDrvrLoad.hh b/include/sta/HpinDrvrLoad.hh index 795ee829..e2674217 100644 --- a/include/sta/HpinDrvrLoad.hh +++ b/include/sta/HpinDrvrLoad.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Set.hh" #include "NetworkClass.hh" @@ -46,9 +45,6 @@ public: HpinDrvrLoadVisitor() {} virtual ~HpinDrvrLoadVisitor() {} virtual void visit(HpinDrvrLoad *drvr_load) = 0; - -private: - DISALLOW_COPY_AND_ASSIGN(HpinDrvrLoadVisitor); }; class HpinDrvrLoad diff --git a/include/sta/InputDrive.hh b/include/sta/InputDrive.hh index 1baa5c07..0f4d49f3 100644 --- a/include/sta/InputDrive.hh +++ b/include/sta/InputDrive.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "MinMax.hh" #include "LibertyClass.hh" #include "NetworkClass.hh" @@ -75,8 +74,6 @@ public: RiseFallMinMax *slews() { return &slews_; } private: - DISALLOW_COPY_AND_ASSIGN(InputDrive); - RiseFallMinMax slews_; RiseFallMinMax drive_resistances_; // Separate rise/fall/min/max drive cells. @@ -104,8 +101,6 @@ public: bool equal(InputDriveCell *drive) const; private: - DISALLOW_COPY_AND_ASSIGN(InputDriveCell); - LibertyLibrary *library_; LibertyCell *cell_; LibertyPort *from_port_; diff --git a/include/sta/InternalPower.hh b/include/sta/InternalPower.hh index ee30da9d..27a576cc 100644 --- a/include/sta/InternalPower.hh +++ b/include/sta/InternalPower.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "LibertyClass.hh" #include "Transition.hh" @@ -43,9 +42,6 @@ protected: FuncExpr *when_; InternalPowerModel *models_[RiseFall::index_count]; const char *related_pg_pin_; - -private: - DISALLOW_COPY_AND_ASSIGN(InternalPowerAttrs); }; class InternalPower @@ -72,9 +68,6 @@ protected: FuncExpr *when_; const char *related_pg_pin_; InternalPowerModel *models_[RiseFall::index_count]; - -private: - DISALLOW_COPY_AND_ASSIGN(InternalPower); }; class InternalPowerModel @@ -107,9 +100,6 @@ protected: bool checkAxis(TableAxis *axis); TableModel *model_; - -private: - DISALLOW_COPY_AND_ASSIGN(InternalPowerModel); }; } // namespace diff --git a/include/sta/LeakagePower.hh b/include/sta/LeakagePower.hh index 6bc6e69a..de564ef1 100644 --- a/include/sta/LeakagePower.hh +++ b/include/sta/LeakagePower.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "LibertyClass.hh" namespace sta { @@ -35,9 +34,6 @@ public: protected: FuncExpr *when_; float power_; - -private: - DISALLOW_COPY_AND_ASSIGN(LeakagePowerAttrs); }; class LeakagePower @@ -54,9 +50,6 @@ protected: LibertyCell *cell_; FuncExpr *when_; float power_; - -private: - DISALLOW_COPY_AND_ASSIGN(LeakagePower); }; } // namespace diff --git a/include/sta/Liberty.hh b/include/sta/Liberty.hh index 47dfb2ec..1468597b 100644 --- a/include/sta/Liberty.hh +++ b/include/sta/Liberty.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "MinMax.hh" #include "RiseFallMinMax.hh" #include "ConcreteLibrary.hh" @@ -349,8 +348,6 @@ protected: static constexpr float slew_upper_threshold_default_ = .8; private: - DISALLOW_COPY_AND_ASSIGN(LibertyLibrary); - friend class LibertyCell; friend class LibertyCellIterator; friend class TableTemplateIterator; @@ -365,8 +362,6 @@ public: LibertyCell *next(); private: - DISALLOW_COPY_AND_ASSIGN(LibertyCellIterator); - ConcreteCellMap::ConstIterator iter_; }; @@ -580,8 +575,6 @@ protected: LibertyPgPortMap pg_port_map_; private: - DISALLOW_COPY_AND_ASSIGN(LibertyCell); - friend class LibertyLibrary; friend class LibertyCellPortIterator; friend class LibertyCellPgPortIterator; @@ -599,8 +592,6 @@ public: LibertyPort *next(); private: - DISALLOW_COPY_AND_ASSIGN(LibertyCellPortIterator); - ConcretePortSeq::ConstIterator iter_; }; @@ -613,8 +604,6 @@ public: LibertyPort *next(); private: - DISALLOW_COPY_AND_ASSIGN(LibertyCellPortBitIterator); - ConcreteCellPortBitIterator *iter_; }; @@ -626,8 +615,6 @@ public: LibertyPgPort *next(); private: - DISALLOW_COPY_AND_ASSIGN(LibertyCellPgPortIterator); - LibertyPgPortMap::Iterator iter_; }; @@ -817,8 +804,6 @@ protected: bool is_disabled_constraint_:1; private: - DISALLOW_COPY_AND_ASSIGN(LibertyPort); - friend class LibertyLibrary; friend class LibertyCell; friend class LibertyBuilder; @@ -838,8 +823,6 @@ public: virtual LibertyPort *next(); private: - DISALLOW_COPY_AND_ASSIGN(LibertyPortMemberIterator); - ConcretePortMemberIterator *iter_; }; @@ -862,9 +845,6 @@ protected: float process_; float voltage_; float temperature_; - -private: - DISALLOW_COPY_AND_ASSIGN(Pvt); }; class OperatingConditions : public Pvt @@ -884,9 +864,6 @@ public: protected: const char *name_; WireloadTree wire_load_tree_; - -private: - DISALLOW_COPY_AND_ASSIGN(OperatingConditions); }; class ScaleFactors @@ -915,9 +892,6 @@ public: protected: const char *name_; float scales_[scale_factor_type_count][scale_factor_pvt_count][RiseFall::index_count]; - -private: - DISALLOW_COPY_AND_ASSIGN(ScaleFactors); }; class BusDcl @@ -935,9 +909,6 @@ protected: const char *name_; int from_; int to_; - -private: - DISALLOW_COPY_AND_ASSIGN(BusDcl); }; // Cell mode_definition group. @@ -960,8 +931,6 @@ protected: ModeValueMap values_; private: - DISALLOW_COPY_AND_ASSIGN(ModeDef); - friend class LibertyCell; }; @@ -987,8 +956,6 @@ protected: const char *sdf_cond_; private: - DISALLOW_COPY_AND_ASSIGN(ModeValueDef); - friend class ModeDef; }; @@ -1015,9 +982,6 @@ protected: TableAxis *axis1_; TableAxis *axis2_; TableAxis *axis3_; - -private: - DISALLOW_COPY_AND_ASSIGN(TableTemplate); }; class TestCell @@ -1046,9 +1010,6 @@ protected: LibertyPort *scan_enable_; LibertyPort *scan_out_; LibertyPort *scan_out_inv_; - -private: - DISALLOW_COPY_AND_ASSIGN(TestCell); }; class OcvDerate diff --git a/include/sta/LinearModel.hh b/include/sta/LinearModel.hh index d343dab9..44c4719c 100644 --- a/include/sta/LinearModel.hh +++ b/include/sta/LinearModel.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "TimingModel.hh" namespace sta { @@ -50,9 +49,6 @@ protected: float intrinsic_; float resistance_; - -private: - DISALLOW_COPY_AND_ASSIGN(GateLinearModel); }; class CheckLinearModel : public CheckTimingModel @@ -81,9 +77,6 @@ protected: virtual void setIsScaled(bool is_scaled); float intrinsic_; - -private: - DISALLOW_COPY_AND_ASSIGN(CheckLinearModel); }; } // namespace diff --git a/include/sta/MinMax.hh b/include/sta/MinMax.hh index 05718501..f4543f34 100644 --- a/include/sta/MinMax.hh +++ b/include/sta/MinMax.hh @@ -18,7 +18,6 @@ #include #include -#include "DisallowCopyAssign.hh" #include "Iterator.hh" namespace sta { @@ -72,7 +71,6 @@ public: static const int index_bit_count = 1; private: - DISALLOW_COPY_AND_ASSIGN(MinMax); MinMax(const char *name, int index, float init_value, @@ -113,7 +111,6 @@ public: const std::vector &rangeIndex() const { return range_index_; } private: - DISALLOW_COPY_AND_ASSIGN(MinMaxAll); MinMaxAll(const char *name, int index, std::vector range, @@ -142,8 +139,6 @@ public: { return (index_++ == 0) ? MinMax::min() : MinMax::max(); } private: - DISALLOW_COPY_AND_ASSIGN(MinMaxIterator); - int index_; int index_max_; }; diff --git a/include/sta/Network.hh b/include/sta/Network.hh index 0e522710..3631fcf9 100644 --- a/include/sta/Network.hh +++ b/include/sta/Network.hh @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "Map.hh" #include "StringUtil.hh" #include "LibertyClass.hh" @@ -479,9 +478,6 @@ protected: char divider_; char escape_; NetDrvrPinsMap net_drvr_pin_map_; - -private: - DISALLOW_COPY_AND_ASSIGN(Network); }; // Network API to support network edits. @@ -519,8 +515,6 @@ public: Net *into_net) = 0; virtual Net *mergedInto(Net *net) = 0; -private: - DISALLOW_COPY_AND_ASSIGN(NetworkEdit); }; // Network API to support the Parallax readers. @@ -575,9 +569,6 @@ public: LogicValue const_value) = 0; using NetworkEdit::makeInstance; - -private: - DISALLOW_COPY_AND_ASSIGN(NetworkReader); }; Instance * @@ -595,9 +586,6 @@ public: virtual bool hasNext() = 0; virtual void next(Pin *&pin, LogicValue &value) = 0; - -private: - DISALLOW_COPY_AND_ASSIGN(ConstantPinIterator); }; // Implementation class for Network::constantPinIterator(). @@ -612,7 +600,6 @@ public: virtual void next(Pin *&pin, LogicValue &value); private: - DISALLOW_COPY_AND_ASSIGN(NetworkConstantPinIterator); void findConstantPins(NetSet &nets, PinSet &pins); @@ -630,9 +617,6 @@ public: virtual ~HierPinThruVisitor() {} virtual void visit(Pin *drvr, Pin *load) = 0; - -private: - DISALLOW_COPY_AND_ASSIGN(HierPinThruVisitor); }; class PinVisitor @@ -658,9 +642,6 @@ protected: PinSeq &loads_; PinSeq &drvrs_; const Network *network_; - -private: - DISALLOW_COPY_AND_ASSIGN(FindNetDrvrLoads); }; // Visit driver/loads pins through a hierarcial pin. diff --git a/include/sta/NullParasitics.hh b/include/sta/NullParasitics.hh index d7362484..54048f6a 100644 --- a/include/sta/NullParasitics.hh +++ b/include/sta/NullParasitics.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Parasitics.hh" namespace sta { @@ -186,9 +185,6 @@ public: virtual void disconnectPinBefore(const Pin *pin); virtual void loadPinCapacitanceChanged(const Pin *pin); - -private: - DISALLOW_COPY_AND_ASSIGN(NullParasitics); }; } // namespace diff --git a/include/sta/Parasitics.hh b/include/sta/Parasitics.hh index 58848ec7..63cbc33e 100644 --- a/include/sta/Parasitics.hh +++ b/include/sta/Parasitics.hh @@ -17,7 +17,6 @@ #pragma once #include -#include "DisallowCopyAssign.hh" #include "StaState.hh" #include "LibertyClass.hh" #include "NetworkClass.hh" @@ -303,9 +302,6 @@ protected: Parasitics(StaState *sta); Net *findParasiticNet(const Pin *pin) const; - -private: - DISALLOW_COPY_AND_ASSIGN(Parasitics); }; // Managed by the Corner class. diff --git a/include/sta/Path.hh b/include/sta/Path.hh index 6e3e0054..ee438ff7 100644 --- a/include/sta/Path.hh +++ b/include/sta/Path.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "MinMax.hh" #include "NetworkClass.hh" #include "SdcClass.hh" diff --git a/include/sta/PathAnalysisPt.hh b/include/sta/PathAnalysisPt.hh index cbdc9650..924611f4 100644 --- a/include/sta/PathAnalysisPt.hh +++ b/include/sta/PathAnalysisPt.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Iterator.hh" #include "MinMax.hh" #include "SdcClass.hh" @@ -48,8 +47,6 @@ public: void setInsertionAnalysisPt(const EarlyLate *early_late, PathAnalysisPt *ap); private: - DISALLOW_COPY_AND_ASSIGN(PathAnalysisPt); - Corner *corner_; PathAPIndex index_; const MinMax *path_min_max_; diff --git a/include/sta/PathEnd.hh b/include/sta/PathEnd.hh index 13dae25f..121df051 100644 --- a/include/sta/PathEnd.hh +++ b/include/sta/PathEnd.hh @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "LibertyClass.hh" #include "GraphClass.hh" #include "SdcClass.hh" @@ -207,9 +206,6 @@ protected: Arrival src_clk_arrival, const StaState *sta); PathRef path_; - -private: - DISALLOW_COPY_AND_ASSIGN(PathEnd); }; class PathEndUnconstrained : public PathEnd @@ -228,9 +224,6 @@ public: virtual Slack slack(const StaState *sta) const; virtual Slack slackNoCrpr(const StaState *sta) const; virtual float sourceClkOffset(const StaState *sta) const; - -private: - DISALLOW_COPY_AND_ASSIGN(PathEndUnconstrained); }; class PathEndClkConstrained : public PathEnd @@ -279,9 +272,6 @@ protected: PathVertex clk_path_; mutable Crpr crpr_; mutable bool crpr_valid_; - -private: - DISALLOW_COPY_AND_ASSIGN(PathEndClkConstrained); }; class PathEndClkConstrainedMcp : public PathEndClkConstrained @@ -310,9 +300,6 @@ protected: const StaState *sta) const; MultiCyclePath *mcp_; - -private: - DISALLOW_COPY_AND_ASSIGN(PathEndClkConstrainedMcp); }; // Path constrained by timing check. @@ -348,9 +335,6 @@ protected: TimingArc *check_arc_; Edge *check_edge_; - -private: - DISALLOW_COPY_AND_ASSIGN(PathEndCheck); }; // PathEndClkConstrained::clk_path_ is the latch enable. @@ -415,8 +399,6 @@ private: PathDelay *path_delay_; // Source clk arrival for set_max_delay -ignore_clk_latency. Arrival src_clk_arrival_; - - DISALLOW_COPY_AND_ASSIGN(PathEndLatchCheck); }; // Path constrained by an output delay. @@ -464,9 +446,6 @@ protected: Arrival &latency) const; OutputDelay *output_delay_; - -private: - DISALLOW_COPY_AND_ASSIGN(PathEndOutputDelay); }; // Clock path constrained clock gating signal. @@ -501,9 +480,6 @@ protected: TimingRole *check_role_; ArcDelay margin_; - -private: - DISALLOW_COPY_AND_ASSIGN(PathEndGatedClock); }; class PathEndDataCheck : public PathEndClkConstrainedMcp @@ -542,9 +518,6 @@ protected: private: PathVertex data_clk_path_; DataCheck *check_; - -private: - DISALLOW_COPY_AND_ASSIGN(PathEndDataCheck); }; // Path constrained by set_min/max_delay. @@ -609,9 +582,6 @@ protected: OutputDelay *output_delay_; // Source clk arrival for set_min/max_delay -ignore_clk_latency. Arrival src_clk_arrival_; - -private: - DISALLOW_COPY_AND_ASSIGN(PathEndPathDelay); }; //////////////////////////////////////////////////////////////// diff --git a/include/sta/PathExpanded.hh b/include/sta/PathExpanded.hh index 1f0850cd..53ff0d34 100644 --- a/include/sta/PathExpanded.hh +++ b/include/sta/PathExpanded.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "TimingArc.hh" #include "GraphClass.hh" #include "SearchClass.hh" @@ -70,9 +69,6 @@ protected: // Index of the startpoint. size_t start_index_; const StaState *sta_; - -private: - DISALLOW_COPY_AND_ASSIGN(PathExpanded); }; } // namespace diff --git a/include/sta/PathGroup.hh b/include/sta/PathGroup.hh index 1e41dd12..7d834d4e 100644 --- a/include/sta/PathGroup.hh +++ b/include/sta/PathGroup.hh @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "Map.hh" #include "Vector.hh" #include "SdcClass.hh" @@ -94,9 +93,6 @@ protected: float threshold_; std::mutex lock_; const StaState *sta_; - -private: - DISALLOW_COPY_AND_ASSIGN(PathGroup); }; class PathGroups : public StaState @@ -197,9 +193,6 @@ protected: static const char *gated_clk_group_name_; static const char *async_group_name_; static const char *unconstrained_group_name_; - -private: - DISALLOW_COPY_AND_ASSIGN(PathGroups); }; } // namespace diff --git a/include/sta/PathRef.hh b/include/sta/PathRef.hh index 1053aa7f..30a253d3 100644 --- a/include/sta/PathRef.hh +++ b/include/sta/PathRef.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Vector.hh" #include "SearchClass.hh" #include "Path.hh" diff --git a/include/sta/PathVertex.hh b/include/sta/PathVertex.hh index b6066b10..93f11975 100644 --- a/include/sta/PathVertex.hh +++ b/include/sta/PathVertex.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "SearchClass.hh" #include "Path.hh" @@ -131,7 +130,6 @@ public: virtual PathVertex *next(); private: - DISALLOW_COPY_AND_ASSIGN(VertexPathIterator); void findNext(); const Search *search_; diff --git a/include/sta/PatternMatch.hh b/include/sta/PatternMatch.hh index 8ee3c2f2..a7d4977d 100644 --- a/include/sta/PatternMatch.hh +++ b/include/sta/PatternMatch.hh @@ -17,7 +17,6 @@ #pragma once #include -#include "DisallowCopyAssign.hh" #include "Error.hh" // Don't require all of tcl.h. @@ -54,7 +53,6 @@ public: bool hasWildcards() const; private: - DISALLOW_COPY_AND_ASSIGN(PatternMatch); void compileRegexp(); const char *pattern_; diff --git a/include/sta/PortDelay.hh b/include/sta/PortDelay.hh index 03a6e249..896be23b 100644 --- a/include/sta/PortDelay.hh +++ b/include/sta/PortDelay.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "RiseFallMinMax.hh" #include "SdcClass.hh" @@ -54,9 +53,6 @@ protected: Pin *ref_pin_; RiseFallMinMax delays_; PinSet leaf_pins_; - -private: - DISALLOW_COPY_AND_ASSIGN(PortDelay); }; class InputDelay : public PortDelay @@ -72,8 +68,6 @@ protected: Network *network); private: - DISALLOW_COPY_AND_ASSIGN(InputDelay); - int index_; friend class Sdc; @@ -90,8 +84,6 @@ protected: Network *network); private: - DISALLOW_COPY_AND_ASSIGN(OutputDelay); - friend class Sdc; }; diff --git a/include/sta/PortDirection.hh b/include/sta/PortDirection.hh index 353871cd..3c4b6331 100644 --- a/include/sta/PortDirection.hh +++ b/include/sta/PortDirection.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "NetworkClass.hh" namespace sta { @@ -55,7 +54,6 @@ public: bool isUnknown() const { return this == unknown_; } private: - DISALLOW_COPY_AND_ASSIGN(PortDirection); PortDirection(const char *name, int index); diff --git a/include/sta/PortExtCap.hh b/include/sta/PortExtCap.hh index 2c00ca2a..3a520f26 100644 --- a/include/sta/PortExtCap.hh +++ b/include/sta/PortExtCap.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "MinMax.hh" #include "Transition.hh" #include "RiseFallMinMax.hh" @@ -58,8 +57,6 @@ public: FanoutValues *fanout() { return &fanout_; } private: - DISALLOW_COPY_AND_ASSIGN(PortExtCap); - Port *port_; RiseFallMinMax pin_cap_; RiseFallMinMax wire_cap_; diff --git a/include/sta/Report.hh b/include/sta/Report.hh index fcce8ed0..40c005fe 100644 --- a/include/sta/Report.hh +++ b/include/sta/Report.hh @@ -21,7 +21,6 @@ #include #include #include "Machine.hh" // __attribute__ -#include "DisallowCopyAssign.hh" struct Tcl_Interp; @@ -154,9 +153,6 @@ protected: static Report *default_; friend class Debug; - -private: - DISALLOW_COPY_AND_ASSIGN(Report); }; } // namespace diff --git a/include/sta/ReportTcl.hh b/include/sta/ReportTcl.hh index bd9cee83..11ea208d 100644 --- a/include/sta/ReportTcl.hh +++ b/include/sta/ReportTcl.hh @@ -17,7 +17,6 @@ #pragma once #include -#include "DisallowCopyAssign.hh" #include "Report.hh" namespace sta { @@ -53,7 +52,6 @@ protected: void flush(); private: - DISALLOW_COPY_AND_ASSIGN(ReportTcl); Tcl_ChannelType *makeEncapChannelType(Tcl_Channel channel, char *channel_name, Tcl_DriverOutputProc output_proc); diff --git a/include/sta/RiseFallMinMax.hh b/include/sta/RiseFallMinMax.hh index ca3cbd75..cecb085e 100644 --- a/include/sta/RiseFallMinMax.hh +++ b/include/sta/RiseFallMinMax.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "MinMax.hh" #include "Transition.hh" diff --git a/include/sta/RiseFallValues.hh b/include/sta/RiseFallValues.hh index 5890e4fe..baeb2f9c 100644 --- a/include/sta/RiseFallValues.hh +++ b/include/sta/RiseFallValues.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Transition.hh" namespace sta { @@ -38,8 +37,6 @@ public: void clear(); private: - DISALLOW_COPY_AND_ASSIGN(RiseFallValues); - float values_[RiseFall::index_count]; bool exists_[RiseFall::index_count]; }; diff --git a/include/sta/Sdc.hh b/include/sta/Sdc.hh index 96c65fa9..0e15251b 100644 --- a/include/sta/Sdc.hh +++ b/include/sta/Sdc.hh @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "StringUtil.hh" #include "StringSet.hh" #include "Map.hh" @@ -1392,8 +1391,6 @@ protected: EdgeClockLatencyMap edge_clk_latency_; private: - DISALLOW_COPY_AND_ASSIGN(Sdc); - friend class WriteSdc; friend class FindNetCaps; friend class ClockGroupIterator; @@ -1407,8 +1404,8 @@ public: private: ClockIterator(ClockSeq &clocks); + friend class Sdc; - DISALLOW_COPY_AND_ASSIGN(ClockIterator); }; class ClockGroupIterator : public ClockGroupsNameMap::Iterator @@ -1420,7 +1417,6 @@ private: ClockGroupIterator(ClockGroupsNameMap &clk_groups_name_map); friend class Sdc; - DISALLOW_COPY_AND_ASSIGN(ClockGroupIterator); }; class GroupPathIterator : public GroupPathMap::Iterator @@ -1432,7 +1428,6 @@ private: GroupPathIterator(GroupPathMap &group_path_map); friend class Sdc; - DISALLOW_COPY_AND_ASSIGN(GroupPathIterator); }; } // namespace diff --git a/include/sta/SdcNetwork.hh b/include/sta/SdcNetwork.hh index b575dbf2..57cadaf5 100644 --- a/include/sta/SdcNetwork.hh +++ b/include/sta/SdcNetwork.hh @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "Network.hh" namespace sta { @@ -164,9 +163,6 @@ protected: Network *network_; // network_ if it supports edits. NetworkEdit *network_edit_; - -private: - DISALLOW_COPY_AND_ASSIGN(NetworkNameAdapter); }; //////////////////////////////////////////////////////////////// @@ -253,9 +249,6 @@ protected: PinSeq *pins) const; const char *staToSdc(const char *sta_name) const; - -private: - DISALLOW_COPY_AND_ASSIGN(SdcNetwork); }; // Encapsulate a network to map names to/from the sdc namespace. diff --git a/include/sta/Search.hh b/include/sta/Search.hh index 5566dba7..8ab75568 100644 --- a/include/sta/Search.hh +++ b/include/sta/Search.hh @@ -627,9 +627,6 @@ class ClkArrivalSearchPred : public EvalPred public: ClkArrivalSearchPred(const StaState *sta); virtual bool searchThru(Edge *edge); - -private: - DISALLOW_COPY_AND_ASSIGN(ClkArrivalSearchPred); }; // Class for visiting fanin/fanout paths of a vertex. @@ -812,9 +809,6 @@ protected: Search *search); TagGroupBldr *tag_bldr_; - -private: - DISALLOW_COPY_AND_ASSIGN(DynLoopSrchPred); }; } // namespace diff --git a/include/sta/SearchPred.hh b/include/sta/SearchPred.hh index 7b9065c0..72f01846 100644 --- a/include/sta/SearchPred.hh +++ b/include/sta/SearchPred.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "NetworkClass.hh" #include "GraphClass.hh" #include "LibertyClass.hh" @@ -50,9 +49,6 @@ public: virtual bool searchThru(Edge *edge) = 0; // Search is allowed to to_pin. virtual bool searchTo(const Vertex *to_vertex) = 0; - -private: - DISALLOW_COPY_AND_ASSIGN(SearchPred); }; class SearchPred0 : public SearchPred @@ -78,9 +74,6 @@ public: protected: const StaState *sta_; - -private: - DISALLOW_COPY_AND_ASSIGN(SearchPred0); }; // SearchPred0 unless @@ -90,9 +83,6 @@ class SearchPred1 : public SearchPred0 public: explicit SearchPred1(const StaState *sta); virtual bool searchThru(Edge *edge); - -private: - DISALLOW_COPY_AND_ASSIGN(SearchPred1); }; // SearchPred1 unless @@ -102,9 +92,6 @@ class SearchPred2 : public SearchPred1 public: explicit SearchPred2(const StaState *sta); virtual bool searchThru(Edge *edge); - -private: - DISALLOW_COPY_AND_ASSIGN(SearchPred2); }; // SearchPred2 unless @@ -114,9 +101,6 @@ class SearchPredNonLatch2 : public SearchPred2 public: explicit SearchPredNonLatch2(const StaState *sta); virtual bool searchThru(Edge *edge); - -private: - DISALLOW_COPY_AND_ASSIGN(SearchPredNonLatch2); }; // SearchPred2 unless @@ -126,9 +110,6 @@ class SearchPredNonReg2 : public SearchPred2 public: explicit SearchPredNonReg2(const StaState *sta); virtual bool searchThru(Edge *edge); - -private: - DISALLOW_COPY_AND_ASSIGN(SearchPredNonReg2); }; // Predicate for BFS search to stop at the end of the clock tree. @@ -138,9 +119,6 @@ class ClkTreeSearchPred : public SearchPred1 public: explicit ClkTreeSearchPred(const StaState *sta); virtual bool searchThru(Edge *edge); - -private: - DISALLOW_COPY_AND_ASSIGN(ClkTreeSearchPred); }; bool diff --git a/include/sta/Sequential.hh b/include/sta/Sequential.hh index 388ddc1c..169d0c68 100644 --- a/include/sta/Sequential.hh +++ b/include/sta/Sequential.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "LibertyClass.hh" #include "NetworkClass.hh" @@ -65,8 +64,6 @@ protected: LibertyPort *output_inv_; private: - DISALLOW_COPY_AND_ASSIGN(Sequential); - friend class LibertyCell; }; diff --git a/include/sta/Sta.hh b/include/sta/Sta.hh index 30dfde39..5edb0b8b 100644 --- a/include/sta/Sta.hh +++ b/include/sta/Sta.hh @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "StringSeq.hh" #include "LibertyClass.hh" #include "NetworkClass.hh" @@ -1368,6 +1367,7 @@ protected: void ensureGraphSdcAnnotated(); CornerSeq makeCornerSeq(Corner *corner) const; void makeParasiticAnalysisPts(); + void clkSkewPreamble(); CmdNamespace cmd_namespace_; Instance *current_instance_; @@ -1392,9 +1392,6 @@ protected: // Singleton sta used by tcl command interpreter. static Sta *sta_; - -private: - DISALLOW_COPY_AND_ASSIGN(Sta); }; } // namespace diff --git a/include/sta/StaState.hh b/include/sta/StaState.hh index f0268e89..b9dfc9ca 100644 --- a/include/sta/StaState.hh +++ b/include/sta/StaState.hh @@ -16,8 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" - namespace sta { class Report; diff --git a/include/sta/Stats.hh b/include/sta/Stats.hh index 0147dc65..058ac9ea 100644 --- a/include/sta/Stats.hh +++ b/include/sta/Stats.hh @@ -17,7 +17,6 @@ #pragma once #include // size_t -#include "DisallowCopyAssign.hh" namespace sta { @@ -33,8 +32,6 @@ public: void report(const char *step); private: - DISALLOW_COPY_AND_ASSIGN(Stats); - double elapsed_begin_; double user_begin_; double system_begin_; diff --git a/include/sta/TableModel.hh b/include/sta/TableModel.hh index 26798006..0b79b405 100644 --- a/include/sta/TableModel.hh +++ b/include/sta/TableModel.hh @@ -17,7 +17,6 @@ #pragma once #include -#include "DisallowCopyAssign.hh" #include "MinMax.hh" #include "Vector.hh" #include "Transition.hh" @@ -117,9 +116,6 @@ protected: TableModel *delay_sigma_models_[EarlyLate::index_count]; TableModel *slew_model_; TableModel *slew_sigma_models_[EarlyLate::index_count]; - -private: - DISALLOW_COPY_AND_ASSIGN(GateTableModel); }; class CheckTableModel : public CheckTimingModel @@ -185,9 +181,6 @@ protected: TableModel *model_; TableModel *sigma_models_[EarlyLate::index_count]; - -private: - DISALLOW_COPY_AND_ASSIGN(CheckTableModel); }; // Wrapper class for Table to apply scale factors. @@ -243,9 +236,6 @@ protected: unsigned scale_factor_type_:scale_factor_bits; unsigned tr_index_:RiseFall::index_bit_count; bool is_scaled_:1; - -private: - DISALLOW_COPY_AND_ASSIGN(TableModel); }; // Abstract base class for tables. @@ -283,9 +273,6 @@ public: string *result) const = 0; virtual void report(const Units *units, Report *report) const = 0; - -private: - DISALLOW_COPY_AND_ASSIGN(Table); }; // Zero dimension (scalar) table. @@ -312,7 +299,6 @@ public: using Table::findValue; private: - DISALLOW_COPY_AND_ASSIGN(Table0); float value_; }; @@ -345,8 +331,6 @@ public: using Table::findValue; private: - DISALLOW_COPY_AND_ASSIGN(Table1); - FloatSeq *values_; TableAxis *axis1_; bool own_axis1_; @@ -385,8 +369,6 @@ public: using Table::findValue; protected: - DISALLOW_COPY_AND_ASSIGN(Table2); - FloatTable *values_; // Row. TableAxis *axis1_; @@ -431,8 +413,6 @@ public: using Table::findValue; private: - DISALLOW_COPY_AND_ASSIGN(Table3); - TableAxis *axis3_; bool own_axis3_; }; @@ -450,8 +430,6 @@ public: size_t findAxisIndex(float value) const; private: - DISALLOW_COPY_AND_ASSIGN(TableAxis); - TableAxisVariable variable_; FloatSeq *values_; }; diff --git a/include/sta/TimingArc.hh b/include/sta/TimingArc.hh index b363d940..0b5c8d88 100644 --- a/include/sta/TimingArc.hh +++ b/include/sta/TimingArc.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Vector.hh" #include "Transition.hh" #include "Delay.hh" @@ -123,9 +122,6 @@ protected: const char *mode_value_; float ocv_arc_depth_; TimingModel *models_[RiseFall::index_count]; - -private: - DISALLOW_COPY_AND_ASSIGN(TimingArcAttrs); }; // A timing arc set is a group of related timing arcs between from/to @@ -221,18 +217,12 @@ protected: TimingArc *from_arc2_[RiseFall::index_count]; static TimingArcSet *wire_timing_arc_set_; - -private: - DISALLOW_COPY_AND_ASSIGN(TimingArcSet); }; class TimingArcSetArcIterator : public TimingArcSeq::ConstIterator { public: TimingArcSetArcIterator(const TimingArcSet *set); - -private: - DISALLOW_COPY_AND_ASSIGN(TimingArcSetArcIterator); }; // A timing arc is a single from/to transition between two ports. @@ -281,8 +271,6 @@ protected: Vector corner_arcs_; private: - DISALLOW_COPY_AND_ASSIGN(TimingArc); - friend class LibertyLibrary; friend class LibertyCell; friend class TimingArcSet; diff --git a/include/sta/TimingRole.hh b/include/sta/TimingRole.hh index cb719643..0692b218 100644 --- a/include/sta/TimingRole.hh +++ b/include/sta/TimingRole.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "MinMax.hh" #include "Map.hh" #include "StringUtil.hh" @@ -90,7 +89,6 @@ private: // generic_type = nullptr means type is the same as this. TimingRole *generic_role, int index); - DISALLOW_COPY_AND_ASSIGN(TimingRole); const char *name_; bool is_timing_check_; diff --git a/include/sta/TokenParser.hh b/include/sta/TokenParser.hh index 1dc6fe5d..7d376efb 100644 --- a/include/sta/TokenParser.hh +++ b/include/sta/TokenParser.hh @@ -16,8 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" - namespace sta { // Iterate over the tokens in str separated by character sep. @@ -36,8 +34,6 @@ public: char *next(); private: - DISALLOW_COPY_AND_ASSIGN(TokenParser); - const char *delimiters_; char *token_; char *token_end_; diff --git a/include/sta/Transition.hh b/include/sta/Transition.hh index 540e2f02..164fe3b0 100644 --- a/include/sta/Transition.hh +++ b/include/sta/Transition.hh @@ -18,7 +18,6 @@ #include #include -#include "DisallowCopyAssign.hh" #include "Iterator.hh" #include "Map.hh" #include "StringUtil.hh" @@ -77,9 +76,6 @@ protected: static RiseFall fall_; static const std::array range_; static const std::array range_index_; - -private: - DISALLOW_COPY_AND_ASSIGN(RiseFall); }; // Rise/fall/risefall transition. @@ -128,9 +124,6 @@ protected: static RiseFallBoth rise_; static RiseFallBoth fall_; static RiseFallBoth rise_fall_; - -private: - DISALLOW_COPY_AND_ASSIGN(RiseFallBoth); }; // General SDF transition. @@ -196,9 +189,6 @@ private: static TransitionMap transition_map_; static int max_index_; - -private: - DISALLOW_COPY_AND_ASSIGN(Transition); }; // Obsolete. Use range iteration instead. @@ -213,8 +203,6 @@ public: virtual RiseFall *next(); private: - DISALLOW_COPY_AND_ASSIGN(RiseFallIterator); - int index_; int index_max_; }; diff --git a/include/sta/VertexVisitor.hh b/include/sta/VertexVisitor.hh index f6f39891..cf14ebd8 100644 --- a/include/sta/VertexVisitor.hh +++ b/include/sta/VertexVisitor.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "NetworkClass.hh" #include "GraphClass.hh" diff --git a/include/sta/Wireload.hh b/include/sta/Wireload.hh index 0b9d98d9..6cc3c404 100644 --- a/include/sta/Wireload.hh +++ b/include/sta/Wireload.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Vector.hh" #include "LibertyClass.hh" @@ -72,9 +71,6 @@ protected: // Fanout length extrapolation slope. float slope_; FanoutLengthSeq fanout_lengths_; - -private: - DISALLOW_COPY_AND_ASSIGN(Wireload); }; class WireloadSelection @@ -89,8 +85,6 @@ public: const Wireload *findWireload(float area) const; private: - DISALLOW_COPY_AND_ASSIGN(WireloadSelection); - const char *name_; WireloadForAreaSeq wireloads_; }; diff --git a/liberty/Liberty.cc b/liberty/Liberty.cc index be683828..158b14f1 100644 --- a/liberty/Liberty.cc +++ b/liberty/Liberty.cc @@ -16,7 +16,6 @@ #include "Liberty.hh" -#include "DisallowCopyAssign.hh" #include "EnumNameMap.hh" #include "Report.hh" #include "Debug.hh" @@ -1583,8 +1582,6 @@ public: TimingArcSet *setupCheck() const { return setup_check_; } private: - DISALLOW_COPY_AND_ASSIGN(LatchEnable); - LibertyPort *data_; LibertyPort *enable_; RiseFall *enable_edge_; diff --git a/liberty/LibertyBuilder.hh b/liberty/LibertyBuilder.hh index 1f103dd9..7e68fcff 100644 --- a/liberty/LibertyBuilder.hh +++ b/liberty/LibertyBuilder.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Vector.hh" #include "Transition.hh" #include "LibertyClass.hh" @@ -139,8 +138,6 @@ protected: bool to_rise, bool to_fall, TimingArcAttrs *attrs); -private: - DISALLOW_COPY_AND_ASSIGN(LibertyBuilder); }; } // namespace diff --git a/liberty/LibertyExprPvt.hh b/liberty/LibertyExprPvt.hh index 3f57eae2..e2935512 100644 --- a/liberty/LibertyExprPvt.hh +++ b/liberty/LibertyExprPvt.hh @@ -16,8 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" - namespace sta { class Report; @@ -52,8 +50,6 @@ public: void tokenAppend(char ch); private: - DISALLOW_COPY_AND_ASSIGN(LibExprParser); - const char *func_; LibertyCell *cell_; const char *error_msg_; diff --git a/liberty/LibertyParser.hh b/liberty/LibertyParser.hh index 10090934..9fd46058 100644 --- a/liberty/LibertyParser.hh +++ b/liberty/LibertyParser.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Zlib.hh" #include "Vector.hh" #include "Map.hh" @@ -80,9 +79,6 @@ public: protected: int line_; - -private: - DISALLOW_COPY_AND_ASSIGN(LibertyStmt); }; // Groups are a type keyword with a set of parameters and statements @@ -119,27 +115,18 @@ protected: LibertyAttrMap *attr_map_; LibertyGroupSeq *subgroups_; LibertyDefineMap *define_map_; - -private: - DISALLOW_COPY_AND_ASSIGN(LibertyGroup); }; class LibertySubgroupIterator : public LibertyGroupSeq::Iterator { public: explicit LibertySubgroupIterator(LibertyGroup *group); - -private: - DISALLOW_COPY_AND_ASSIGN(LibertySubgroupIterator); }; class LibertyAttrIterator : public LibertyAttrSeq::Iterator { public: explicit LibertyAttrIterator(LibertyGroup *group); - -private: - DISALLOW_COPY_AND_ASSIGN(LibertyAttrIterator); }; // Abstract base class for attributes. @@ -158,9 +145,6 @@ public: protected: const char *name_; - -private: - DISALLOW_COPY_AND_ASSIGN(LibertyAttr); }; // Abstract base class for simple attributes. @@ -178,8 +162,6 @@ public: virtual LibertyAttrValueSeq *values() const; private: - DISALLOW_COPY_AND_ASSIGN(LibertySimpleAttr); - LibertyAttrValue *value_; }; @@ -198,8 +180,6 @@ public: virtual LibertyAttrValueSeq *values() const { return values_; } private: - DISALLOW_COPY_AND_ASSIGN(LibertyComplexAttr); - LibertyAttrValueSeq *values_; }; @@ -213,9 +193,6 @@ public: virtual bool isFloat() = 0; virtual float floatValue() = 0; virtual const char *stringValue() = 0; - -private: - DISALLOW_COPY_AND_ASSIGN(LibertyAttrValue); }; class LibertyStringAttrValue : public LibertyAttrValue @@ -229,8 +206,6 @@ public: virtual const char *stringValue(); private: - DISALLOW_COPY_AND_ASSIGN(LibertyStringAttrValue); - const char *value_; }; @@ -244,8 +219,6 @@ public: virtual const char *stringValue(); private: - DISALLOW_COPY_AND_ASSIGN(LibertyFloatAttrValue); - float value_; }; @@ -266,8 +239,6 @@ public: LibertyAttrType valueType() const { return value_type_; } private: - DISALLOW_COPY_AND_ASSIGN(LibertyDefine); - const char *name_; LibertyGroupType group_type_; LibertyAttrType value_type_; @@ -291,8 +262,6 @@ public: float value() const { return value_; } private: - DISALLOW_COPY_AND_ASSIGN(LibertyVariable); - const char *var_; float value_; }; @@ -310,9 +279,6 @@ public: virtual bool save(LibertyGroup *group) = 0; virtual bool save(LibertyAttr *attr) = 0; virtual bool save(LibertyVariable *variable) = 0; - -private: - DISALLOW_COPY_AND_ASSIGN(LibertyGroupVisitor); }; void diff --git a/liberty/LibertyReaderPvt.hh b/liberty/LibertyReaderPvt.hh index 030a3146..eb1e13f3 100644 --- a/liberty/LibertyReaderPvt.hh +++ b/liberty/LibertyReaderPvt.hh @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "Vector.hh" #include "Map.hh" #include "StringSeq.hh" @@ -585,8 +584,6 @@ protected: static constexpr char escape_ = '\\'; private: - DISALLOW_COPY_AND_ASSIGN(LibertyReader); - friend class PortNameBitIterator; friend class TimingGroup; }; @@ -614,9 +611,6 @@ protected: bool invert_; const char *attr_name_; int line_; - -private: - DISALLOW_COPY_AND_ASSIGN(LibertyFunc); }; // Port attributes that refer to other ports cannot be parsed @@ -636,8 +630,6 @@ public: int line() const { return line_; } private: - DISALLOW_COPY_AND_ASSIGN(PortGroup); - LibertyPortSeq *ports_; TimingGroupSeq timings_; InternalPowerGroupSeq internal_power_groups_; @@ -686,9 +678,6 @@ protected: LogicValue clr_preset_var1_; LogicValue clr_preset_var2_; int line_; - -private: - DISALLOW_COPY_AND_ASSIGN(SequentialGroup); }; // Liberty group with related_pins group attribute. @@ -707,9 +696,6 @@ protected: StringSeq *related_port_names_; bool is_one_to_one_; int line_; - -private: - DISALLOW_COPY_AND_ASSIGN(RelatedPortGroup); }; class TimingGroup : public TimingArcAttrs, public RelatedPortGroup @@ -767,9 +753,6 @@ protected: TableModel *transition_[RiseFall::index_count]; TableModel *delay_sigma_[RiseFall::index_count][EarlyLate::index_count]; TableModel *slew_sigma_[RiseFall::index_count][EarlyLate::index_count]; - -private: - DISALLOW_COPY_AND_ASSIGN(TimingGroup); }; class InternalPowerGroup : public InternalPowerAttrs, public RelatedPortGroup @@ -777,11 +760,6 @@ class InternalPowerGroup : public InternalPowerAttrs, public RelatedPortGroup public: explicit InternalPowerGroup(int line); virtual ~InternalPowerGroup(); - -protected: - -private: - DISALLOW_COPY_AND_ASSIGN(InternalPowerGroup); }; class LeakagePowerGroup : public LeakagePowerAttrs @@ -792,9 +770,6 @@ public: protected: int line_; - -private: - DISALLOW_COPY_AND_ASSIGN(LeakagePowerGroup); }; // Named port iterator. Port name can be: @@ -829,9 +804,6 @@ protected: int range_to_; int range_bit_; unsigned size_; - -private: - DISALLOW_COPY_AND_ASSIGN(PortNameBitIterator); }; } // namespace diff --git a/liberty/Wireload.cc b/liberty/Wireload.cc index 771bb452..1d90a765 100644 --- a/liberty/Wireload.cc +++ b/liberty/Wireload.cc @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "StringUtil.hh" #include "Liberty.hh" @@ -165,8 +164,6 @@ public: const Wireload *wireload() const { return wireload_; } private: - DISALLOW_COPY_AND_ASSIGN(WireloadForArea); - float min_area_; float max_area_; const Wireload *wireload_; diff --git a/network/ConcreteLibrary.cc b/network/ConcreteLibrary.cc index 10e5ed85..936613e7 100644 --- a/network/ConcreteLibrary.cc +++ b/network/ConcreteLibrary.cc @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "PatternMatch.hh" #include "PortDirection.hh" #include "ParseBus.hh" @@ -327,8 +326,6 @@ public: PortDirection *direction() { return direction_; } private: - DISALLOW_COPY_AND_ASSIGN(BusPort); - const char *name_; int from_; int to_; diff --git a/network/ConcreteNetwork.cc b/network/ConcreteNetwork.cc index 2a399f42..a5b4e276 100644 --- a/network/ConcreteNetwork.cc +++ b/network/ConcreteNetwork.cc @@ -16,7 +16,6 @@ #include "ConcreteNetwork.hh" -#include "DisallowCopyAssign.hh" #include "PatternMatch.hh" #include "Report.hh" #include "Liberty.hh" @@ -83,7 +82,6 @@ public: Net *next(); private: - DISALLOW_COPY_AND_ASSIGN(ConcreteInstanceNetIterator); void findNext(); ConcreteInstanceNetMap::Iterator iter_; @@ -135,7 +133,6 @@ public: Pin *next(); private: - DISALLOW_COPY_AND_ASSIGN(ConcreteInstancePinIterator); void findNext(); ConcretePin **pins_; @@ -190,8 +187,6 @@ public: Pin *next(); private: - DISALLOW_COPY_AND_ASSIGN(ConcreteNetPinIterator); - ConcretePin *next_; }; @@ -224,8 +219,6 @@ public: Term *next(); private: - DISALLOW_COPY_AND_ASSIGN(ConcreteNetTermIterator); - ConcreteTerm *next_; }; @@ -309,8 +302,6 @@ public: virtual Library *next(); private: - DISALLOW_COPY_AND_ASSIGN(ConcreteLibraryIterator1); - ConcreteLibraryIterator iter_; }; @@ -348,7 +339,6 @@ public: virtual LibertyLibrary *next(); private: - DISALLOW_COPY_AND_ASSIGN(ConcreteLibertyLibraryIterator); void findNext(); ConcreteLibrarySeq::ConstIterator iter_; @@ -678,8 +668,6 @@ public: virtual Port *next(); private: - DISALLOW_COPY_AND_ASSIGN(ConcreteCellPortIterator1); - ConcreteCellPortIterator *iter_; }; @@ -717,8 +705,6 @@ public: virtual Port *next(); private: - DISALLOW_COPY_AND_ASSIGN(ConcreteCellPortBitIterator1); - ConcreteCellPortBitIterator *iter_; }; @@ -858,8 +844,6 @@ public: virtual Port *next(); private: - DISALLOW_COPY_AND_ASSIGN(ConcretePortMemberIterator1); - ConcretePortMemberIterator *iter_; }; @@ -1814,8 +1798,6 @@ public: Net *clone_net); private: - DISALLOW_COPY_AND_ASSIGN(ConcreteBindingTbl); - BindingMap map_; NetworkEdit *network_; }; diff --git a/network/Network.cc b/network/Network.cc index 33745172..07753312 100644 --- a/network/Network.cc +++ b/network/Network.cc @@ -17,7 +17,6 @@ #include "Network.hh" -#include "DisallowCopyAssign.hh" #include "StringUtil.hh" #include "PatternMatch.hh" #include "Liberty.hh" @@ -1079,7 +1078,6 @@ public: Instance *next(); private: - DISALLOW_COPY_AND_ASSIGN(LeafInstanceIterator1); void nextInst(); const Network *network_; @@ -1226,9 +1224,6 @@ public: protected: PinSet::Iterator pin_iter_; - -private: - DISALLOW_COPY_AND_ASSIGN(ConnectedPinIterator1); }; ConnectedPinIterator1::ConnectedPinIterator1(PinSet *pins) : @@ -1261,9 +1256,6 @@ public: protected: PinSet *pins_; - -private: - DISALLOW_COPY_AND_ASSIGN(FindConnectedPins); }; FindConnectedPins::FindConnectedPins(PinSet *pins) : @@ -1436,9 +1428,6 @@ public: protected: PinSet *pins_; const Network *network_; - -private: - DISALLOW_COPY_AND_ASSIGN(FindDrvrPins); }; FindDrvrPins::FindDrvrPins(PinSet *pins, diff --git a/sdc/ExceptionPath.cc b/sdc/ExceptionPath.cc index 8f015eb9..e4cb251b 100644 --- a/sdc/ExceptionPath.cc +++ b/sdc/ExceptionPath.cc @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "MinMax.hh" #include "TimingRole.hh" #include "Units.hh" @@ -2458,9 +2457,6 @@ protected: PinPairSet *pairs_; const Network *network_; - -private: - DISALLOW_COPY_AND_ASSIGN(InsertPinPairsThru); }; InsertPinPairsThru::InsertPinPairsThru(PinPairSet *pairs, @@ -2512,9 +2508,6 @@ protected: PinPairSet *pairs_; const Network *network_; - -private: - DISALLOW_COPY_AND_ASSIGN(DeletePinPairsThru); }; DeletePinPairsThru::DeletePinPairsThru(PinPairSet *pairs, diff --git a/sdc/Sdc.cc b/sdc/Sdc.cc index ba1eed9f..c509a168 100644 --- a/sdc/Sdc.cc +++ b/sdc/Sdc.cc @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "Stats.hh" #include "Debug.hh" #include "Mutex.hh" @@ -1319,9 +1318,6 @@ protected: PinPairSet drvr_loads_; const Network *network_; Sdc *sdc_; - -private: - DISALLOW_COPY_AND_ASSIGN(FindClkHpinDisables); }; FindClkHpinDisables::FindClkHpinDisables(Clock *clk, @@ -3193,9 +3189,6 @@ protected: float &fanout_; bool &has_set_load_; const Sdc *sdc_; - -private: - DISALLOW_COPY_AND_ASSIGN(FindNetCaps); }; FindNetCaps::FindNetCaps(const RiseFall *rf, @@ -3603,9 +3596,6 @@ protected: PinPairSet *pairs_; Graph *graph_; - -private: - DISALLOW_COPY_AND_ASSIGN(DisableEdgesThruHierPin); }; DisableEdgesThruHierPin::DisableEdgesThruHierPin(PinPairSet *pairs, @@ -3650,9 +3640,6 @@ protected: PinPairSet *pairs_; Graph *graph_; - -private: - DISALLOW_COPY_AND_ASSIGN(RemoveDisableEdgesThruHierPin); }; RemoveDisableEdgesThruHierPin::RemoveDisableEdgesThruHierPin(PinPairSet *pairs, @@ -5264,9 +5251,6 @@ public: private: ExceptionPathSet &expansions_; - -private: - DISALLOW_COPY_AND_ASSIGN(ExpandException); }; ExpandException::ExpandException(ExceptionPath *exception, diff --git a/sdc/SdcGraph.cc b/sdc/SdcGraph.cc index 8bd84a82..f69f5302 100644 --- a/sdc/SdcGraph.cc +++ b/sdc/SdcGraph.cc @@ -116,9 +116,6 @@ public: protected: bool annotate_; Graph *graph_; - -private: - DISALLOW_COPY_AND_ASSIGN(DisableHpinEdgeVisitor); }; DisableHpinEdgeVisitor::DisableHpinEdgeVisitor(Graph *graph) : diff --git a/sdc/WriteSdc.cc b/sdc/WriteSdc.cc index 868b0d0f..23026c0f 100644 --- a/sdc/WriteSdc.cc +++ b/sdc/WriteSdc.cc @@ -76,9 +76,6 @@ public: WriteSdcObject() {} virtual ~WriteSdcObject() {} virtual void write() const = 0; - -private: - DISALLOW_COPY_AND_ASSIGN(WriteSdcObject); }; class WriteGetPort : public WriteSdcObject @@ -89,8 +86,6 @@ public: virtual void write() const; private: - DISALLOW_COPY_AND_ASSIGN(WriteGetPort); - const Port *port_; const WriteSdc *writer_; }; @@ -118,8 +113,6 @@ public: virtual void write() const; private: - DISALLOW_COPY_AND_ASSIGN(WriteGetPinAndClkKey); - const Pin *pin_; bool map_hpin_to_drvr_; const Clock *clk_; @@ -154,8 +147,6 @@ public: virtual void write() const; private: - DISALLOW_COPY_AND_ASSIGN(WriteGetPin); - const Pin *pin_; bool map_hpin_to_drvr_; const WriteSdc *writer_; @@ -184,8 +175,6 @@ public: virtual void write() const; private: - DISALLOW_COPY_AND_ASSIGN(WriteGetNet); - const Net *net_; const WriteSdc *writer_; }; @@ -211,8 +200,6 @@ public: virtual void write() const; private: - DISALLOW_COPY_AND_ASSIGN(WriteGetInstance); - const Instance *inst_; const WriteSdc *writer_; }; @@ -238,8 +225,6 @@ public: virtual void write() const; private: - DISALLOW_COPY_AND_ASSIGN(WriteGetLibCell); - const LibertyCell *cell_; const WriteSdc *writer_; }; @@ -265,8 +250,6 @@ public: virtual void write() const; private: - DISALLOW_COPY_AND_ASSIGN(WriteGetClock); - const Clock *clk_; const WriteSdc *writer_; }; diff --git a/sdc/WriteSdcPvt.hh b/sdc/WriteSdcPvt.hh index 64105d65..f9cbc716 100644 --- a/sdc/WriteSdcPvt.hh +++ b/sdc/WriteSdcPvt.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Zlib.hh" #include "NetworkClass.hh" #include "GraphClass.hh" @@ -262,9 +261,6 @@ protected: size_t instance_name_length_; Cell *cell_; gzFile stream_; - -private: - DISALLOW_COPY_AND_ASSIGN(WriteSdc); }; } // namespace diff --git a/sdf/ReportAnnotation.cc b/sdf/ReportAnnotation.cc index 103f648b..e495515f 100644 --- a/sdf/ReportAnnotation.cc +++ b/sdf/ReportAnnotation.cc @@ -16,7 +16,6 @@ #include "sdf/ReportAnnotation.hh" -#include "DisallowCopyAssign.hh" #include "StringUtil.hh" #include "Report.hh" #include "TimingRole.hh" @@ -105,9 +104,6 @@ protected: bool report_role_[count_index_max]; PinSet unannotated_pins_; PinSet annotated_pins_; - -private: - DISALLOW_COPY_AND_ASSIGN(ReportAnnotated); }; diff --git a/sdf/SdfReader.cc b/sdf/SdfReader.cc index dee88b66..fc880473 100644 --- a/sdf/SdfReader.cc +++ b/sdf/SdfReader.cc @@ -19,7 +19,6 @@ #include #include -#include "DisallowCopyAssign.hh" #include "Error.hh" #include "Report.hh" #include "MinMax.hh" @@ -48,8 +47,6 @@ public: bool hasValue() const; private: - DISALLOW_COPY_AND_ASSIGN(SdfTriple); - float *values_[3]; }; @@ -70,8 +67,6 @@ public: const char *cond() const { return cond_; } private: - DISALLOW_COPY_AND_ASSIGN(SdfPortSpec); - Transition *tr_; const char *port_; const char *cond_; // timing checks only diff --git a/sdf/SdfReaderPvt.hh b/sdf/SdfReaderPvt.hh index 5096b1f0..466a4d39 100644 --- a/sdf/SdfReaderPvt.hh +++ b/sdf/SdfReaderPvt.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Zlib.hh" #include "Vector.hh" #include "TimingRole.hh" @@ -157,7 +156,6 @@ public: void notSupported(const char *feature); private: - DISALLOW_COPY_AND_ASSIGN(SdfReader); int readSdfFile1(Network *network, Graph *graph, const char *filename); diff --git a/sdf/SdfWriter.cc b/sdf/SdfWriter.cc index e1b6feff..4159e260 100644 --- a/sdf/SdfWriter.cc +++ b/sdf/SdfWriter.cc @@ -106,8 +106,6 @@ protected: char *sdfName(const Instance *inst); private: - DISALLOW_COPY_AND_ASSIGN(SdfWriter); - char sdf_divider_; bool include_typ_; float timescale_; diff --git a/search/CheckMaxSkews.cc b/search/CheckMaxSkews.cc index 1ae733a4..b2e62d3c 100644 --- a/search/CheckMaxSkews.cc +++ b/search/CheckMaxSkews.cc @@ -16,7 +16,6 @@ #include "CheckMaxSkews.hh" -#include "DisallowCopyAssign.hh" #include "TimingRole.hh" #include "TimingArc.hh" #include "Liberty.hh" @@ -37,9 +36,6 @@ public: virtual ~MaxSkewCheckVisitor() {} virtual void visit(MaxSkewCheck &check, const StaState *sta) = 0; - -private: - DISALLOW_COPY_AND_ASSIGN(MaxSkewCheckVisitor); }; CheckMaxSkews::CheckMaxSkews(StaState *sta) : @@ -66,8 +62,6 @@ public: const StaState *sta); private: - DISALLOW_COPY_AND_ASSIGN(MaxSkewChecksVisitor); - MaxSkewCheckSeq &checks_; }; @@ -92,7 +86,6 @@ public: const StaState *sta); private: - DISALLOW_COPY_AND_ASSIGN(MaxSkewViolatorsVisititor); MaxSkewCheckSeq &checks_; }; @@ -130,8 +123,6 @@ public: MaxSkewCheck *minSlackCheck(); private: - DISALLOW_COPY_AND_ASSIGN(MaxSkewSlackVisitor); - MaxSkewCheck *min_slack_check_; }; diff --git a/search/CheckMaxSkews.hh b/search/CheckMaxSkews.hh index e5ad6d8f..1d19d659 100644 --- a/search/CheckMaxSkews.hh +++ b/search/CheckMaxSkews.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "GraphClass.hh" #include "Delay.hh" #include "StaState.hh" @@ -45,9 +44,6 @@ protected: MaxSkewCheckSeq checks_; StaState *sta_; - -private: - DISALLOW_COPY_AND_ASSIGN(CheckMaxSkews); }; class MaxSkewCheck diff --git a/search/CheckMinPeriods.cc b/search/CheckMinPeriods.cc index 3fe811d0..a812fd37 100644 --- a/search/CheckMinPeriods.cc +++ b/search/CheckMinPeriods.cc @@ -16,7 +16,6 @@ #include "CheckMinPeriods.hh" -#include "DisallowCopyAssign.hh" #include "Liberty.hh" #include "Network.hh" #include "Sdc.hh" @@ -36,9 +35,6 @@ public: virtual ~MinPeriodCheckVisitor() {} virtual void visit(MinPeriodCheck &check, StaState *sta) = 0; - -private: - DISALLOW_COPY_AND_ASSIGN(MinPeriodCheckVisitor); }; CheckMinPeriods::CheckMinPeriods(StaState *sta) : @@ -65,8 +61,6 @@ public: StaState *sta); private: - DISALLOW_COPY_AND_ASSIGN(MinPeriodViolatorsVisitor); - MinPeriodCheckSeq &checks_; }; @@ -138,8 +132,6 @@ public: MinPeriodCheck *minSlackCheck(); private: - DISALLOW_COPY_AND_ASSIGN(MinPeriodSlackVisitor); - MinPeriodCheck *min_slack_check_; }; diff --git a/search/CheckMinPeriods.hh b/search/CheckMinPeriods.hh index 73710140..b5189adf 100644 --- a/search/CheckMinPeriods.hh +++ b/search/CheckMinPeriods.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "NetworkClass.hh" #include "GraphClass.hh" #include "Delay.hh" @@ -45,9 +44,6 @@ protected: MinPeriodCheckSeq checks_; StaState *sta_; - -private: - DISALLOW_COPY_AND_ASSIGN(CheckMinPeriods); }; class MinPeriodCheck @@ -62,8 +58,6 @@ public: Slack slack(const StaState *sta) const; private: - DISALLOW_COPY_AND_ASSIGN(MinPeriodCheck); - Pin *pin_; Clock *clk_; }; diff --git a/search/CheckMinPulseWidths.cc b/search/CheckMinPulseWidths.cc index 41b80a19..0097fa8a 100644 --- a/search/CheckMinPulseWidths.cc +++ b/search/CheckMinPulseWidths.cc @@ -17,7 +17,6 @@ #include "CheckMinPulseWidths.hh" #include "Debug.hh" -#include "DisallowCopyAssign.hh" #include "TimingRole.hh" #include "Liberty.hh" #include "Network.hh" @@ -54,9 +53,6 @@ public: virtual ~MinPulseWidthCheckVisitor() {} virtual void visit(MinPulseWidthCheck &check, const StaState *sta) = 0; - -private: - DISALLOW_COPY_AND_ASSIGN(MinPulseWidthCheckVisitor); }; CheckMinPulseWidths::CheckMinPulseWidths(StaState *sta) : @@ -86,8 +82,6 @@ public: const StaState *sta); private: - DISALLOW_COPY_AND_ASSIGN(MinPulseWidthChecksVisitor); - const Corner *corner_; MinPulseWidthCheckSeq &checks_; }; @@ -149,8 +143,6 @@ public: const StaState *sta); private: - DISALLOW_COPY_AND_ASSIGN(MinPulseWidthViolatorsVisitor); - const Corner *corner_; MinPulseWidthCheckSeq &checks_; }; @@ -196,8 +188,6 @@ public: MinPulseWidthCheck *minSlackCheck(); private: - DISALLOW_COPY_AND_ASSIGN(MinPulseWidthSlackVisitor); - const Corner *corner_; MinPulseWidthCheck *min_slack_check_; }; diff --git a/search/CheckMinPulseWidths.hh b/search/CheckMinPulseWidths.hh index 75fcd938..c48e9aa4 100644 --- a/search/CheckMinPulseWidths.hh +++ b/search/CheckMinPulseWidths.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "SdcClass.hh" #include "SearchClass.hh" #include "StaState.hh" @@ -55,9 +54,6 @@ protected: MinPulseWidthCheckSeq checks_; StaState *sta_; - -private: - DISALLOW_COPY_AND_ASSIGN(CheckMinPulseWidths); }; class MinPulseWidthCheck @@ -89,9 +85,6 @@ public: protected: // Open path of the pulse. PathRef open_path_; - -private: - DISALLOW_COPY_AND_ASSIGN(MinPulseWidthCheck); }; class MinPulseWidthSlackLess diff --git a/search/CheckTiming.hh b/search/CheckTiming.hh index be073456..b36fa60c 100644 --- a/search/CheckTiming.hh +++ b/search/CheckTiming.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Vector.hh" #include "StringSeq.hh" #include "NetworkClass.hh" @@ -68,9 +67,6 @@ protected: string &error_msg); CheckErrorSeq errors_; - -private: - DISALLOW_COPY_AND_ASSIGN(CheckTiming); }; } // namespace diff --git a/search/ClkInfo.hh b/search/ClkInfo.hh index 8fca1297..eaf62ca3 100644 --- a/search/ClkInfo.hh +++ b/search/ClkInfo.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Transition.hh" #include "SearchClass.hh" #include "PathVertexRep.hh" @@ -70,8 +69,6 @@ protected: void findHash(const StaState *sta); private: - DISALLOW_COPY_AND_ASSIGN(ClkInfo); - ClockEdge *clk_edge_; const Pin *clk_src_; const Pin *gen_clk_src_; diff --git a/search/ClkSkew.cc b/search/ClkSkew.cc index 7558d22e..9ab29f39 100644 --- a/search/ClkSkew.cc +++ b/search/ClkSkew.cc @@ -18,7 +18,6 @@ #include // abs -#include "DisallowCopyAssign.hh" #include "Report.hh" #include "Debug.hh" #include "Fuzzy.hh" @@ -39,6 +38,7 @@ namespace sta { using std::abs; +// Source/target clock skew. class ClkSkew { public: @@ -234,8 +234,7 @@ ClkSkews::findClkSkewFrom(Vertex *src_vertex, const SetupHold *setup_hold, ClkSkewMap &skews) { - VertexSet endpoints; - findFanout(q_vertex, endpoints); + VertexSet endpoints = findFanout(q_vertex); VertexSet::Iterator end_iter(endpoints); while (end_iter.hasNext()) { Vertex *end = end_iter.next(); @@ -338,13 +337,12 @@ FanOutSrchPred::searchThru(Edge *edge) || role == TimingRole::tristateDisable(); } -void -ClkSkews::findFanout(Vertex *from, - // Return value. - VertexSet &endpoints) +VertexSet +ClkSkews::findFanout(Vertex *from) { debugPrint(debug_, "fanout", 1, "%s", from->name(sdc_network_)); + VertexSet endpoints; FanOutSrchPred pred(this); BfsFwdIterator fanout_iter(BfsIndex::other, &pred, this); fanout_iter.enqueue(from); @@ -357,6 +355,7 @@ ClkSkews::findFanout(Vertex *from, } fanout_iter.enqueueAdjacentVertices(fanout); } + return endpoints; } } // namespace diff --git a/search/ClkSkew.hh b/search/ClkSkew.hh index 338c9380..b4e8c256 100644 --- a/search/ClkSkew.hh +++ b/search/ClkSkew.hh @@ -63,9 +63,7 @@ protected: const Corner *corner, const SetupHold *setup_hold, ClkSkewMap &skews); - void findFanout(Vertex *from, - // Return value. - VertexSet &endpoints); + VertexSet findFanout(Vertex *from); }; } // namespace diff --git a/search/Crpr.hh b/search/Crpr.hh index fe835ce7..80bc6dac 100644 --- a/search/Crpr.hh +++ b/search/Crpr.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "SdcClass.hh" #include "StaState.hh" #include "SearchClass.hh" diff --git a/search/FindRegister.cc b/search/FindRegister.cc index 595bee2b..28b5198f 100644 --- a/search/FindRegister.cc +++ b/search/FindRegister.cc @@ -16,7 +16,6 @@ #include "FindRegister.hh" -#include "DisallowCopyAssign.hh" #include "TimingRole.hh" #include "FuncExpr.hh" #include "TimingArc.hh" @@ -47,8 +46,6 @@ public: virtual bool searchFrom(const Vertex *from_vertex); private: - DISALLOW_COPY_AND_ASSIGN(FindRegClkPred); - Clock *clk_; }; @@ -90,7 +87,6 @@ public: bool latches); private: - DISALLOW_COPY_AND_ASSIGN(FindRegVisitor); void visitRegs(const Pin *clk_pin, TimingSense clk_sense, const RiseFallBoth *clk_rf, @@ -328,7 +324,6 @@ public: bool latches); private: - DISALLOW_COPY_AND_ASSIGN(FindRegInstances); virtual void visitReg(Instance *inst); virtual void visitSequential(Instance *inst, Sequential *seq); @@ -388,7 +383,6 @@ public: bool latches); protected: - DISALLOW_COPY_AND_ASSIGN(FindRegPins); virtual void visitReg(Instance *inst); virtual void visitSequential(Instance *inst, Sequential *seq); @@ -468,7 +462,6 @@ public: explicit FindRegDataPins(StaState *sta); private: - DISALLOW_COPY_AND_ASSIGN(FindRegDataPins); virtual bool matchPin(Pin *pin); virtual FuncExpr *seqExpr1(Sequential *seq); virtual FuncExpr *seqExpr2(Sequential *seq); @@ -535,7 +528,6 @@ public: explicit FindRegClkPins(StaState *sta); private: - DISALLOW_COPY_AND_ASSIGN(FindRegClkPins); virtual bool matchPin(Pin *pin); virtual FuncExpr *seqExpr1(Sequential *seq); virtual FuncExpr *seqExpr2(Sequential *seq); @@ -593,7 +585,6 @@ public: explicit FindRegAsyncPins(StaState *sta); private: - DISALLOW_COPY_AND_ASSIGN(FindRegAsyncPins); virtual bool matchPin(Pin *pin); virtual FuncExpr *seqExpr1(Sequential *seq) { return seq->clear(); } virtual FuncExpr *seqExpr2(Sequential *seq) { return seq->preset(); } @@ -638,7 +629,6 @@ public: explicit FindRegOutputPins(StaState *sta); private: - DISALLOW_COPY_AND_ASSIGN(FindRegOutputPins); virtual bool matchPin(Pin *pin); virtual void visitSequential(Instance *inst, Sequential *seq); diff --git a/search/Genclks.cc b/search/Genclks.cc index b925dd7f..a63f8f05 100644 --- a/search/Genclks.cc +++ b/search/Genclks.cc @@ -58,8 +58,6 @@ public: void setFoundLatchFdbkEdges(bool found); protected: - DISALLOW_COPY_AND_ASSIGN(GenclkInfo); - Clock *gclk_; Level gclk_level_; VertexSet *fanins_; @@ -241,9 +239,6 @@ public: protected: const StaState *sta_; - -private: - DISALLOW_COPY_AND_ASSIGN(GenClkMasterSearchPred); }; GenClkMasterSearchPred::GenClkMasterSearchPred(const StaState *sta) : @@ -419,8 +414,6 @@ public: virtual bool searchTo(const Vertex *to_vertex); private: - DISALLOW_COPY_AND_ASSIGN(GenClkFaninSrchPred); - bool combinational_; }; @@ -503,7 +496,6 @@ public: virtual bool searchTo(const Vertex *to_vertex); private: - DISALLOW_COPY_AND_ASSIGN(GenClkInsertionSearchPred); bool isNonGeneratedClkPin(const Pin *pin) const; Clock *gclk_; @@ -778,8 +770,6 @@ public: virtual bool searchTo(const Vertex *to_vertex); private: - DISALLOW_COPY_AND_ASSIGN(GenClkArrivalSearchPred); - bool combinational_; }; diff --git a/search/Levelize.hh b/search/Levelize.hh index baf48e42..c11a7f9a 100644 --- a/search/Levelize.hh +++ b/search/Levelize.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "NetworkClass.hh" #include "SdcClass.hh" #include "GraphClass.hh" @@ -85,9 +84,6 @@ protected: EdgeSet disabled_loop_edges_; EdgeSet latch_d_to_q_edges_; LevelizeObserver *observer_; - -private: - DISALLOW_COPY_AND_ASSIGN(Levelize); }; // Loops broken by levelization may not necessarily be combinational. @@ -105,8 +101,6 @@ public: Graph *graph) const; private: - DISALLOW_COPY_AND_ASSIGN(GraphLoop); - EdgeSeq *edges_; }; @@ -116,9 +110,6 @@ public: LevelizeObserver() {} virtual ~LevelizeObserver() {} virtual void levelChangedBefore(Vertex *vertex) = 0; - -private: - DISALLOW_COPY_AND_ASSIGN(LevelizeObserver); }; } // namespace diff --git a/search/PathEnum.cc b/search/PathEnum.cc index 68d9b1e4..9684b112 100644 --- a/search/PathEnum.cc +++ b/search/PathEnum.cc @@ -16,7 +16,6 @@ #include "PathEnum.hh" -#include "DisallowCopyAssign.hh" #include "Debug.hh" #include "Error.hh" #include "Fuzzy.hh" @@ -52,8 +51,6 @@ public: Path *divPath() const { return after_div_; } private: - DISALLOW_COPY_AND_ASSIGN(Diversion); - PathEnd *path_end_; Path *after_div_; }; @@ -251,7 +248,6 @@ public: const PathAnalysisPt *path_ap); private: - DISALLOW_COPY_AND_ASSIGN(PathEnumFaninVisitor); void makeDivertedPathEnd(Path *after_div, TimingArc *div_arc, // Return values. diff --git a/search/PathEnum.hh b/search/PathEnum.hh index 3d11ad70..d53d6e5a 100644 --- a/search/PathEnum.hh +++ b/search/PathEnum.hh @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "Iterator.hh" #include "Vector.hh" #include "StaState.hh" @@ -65,7 +64,6 @@ public: virtual PathEnd *next(); private: - DISALLOW_COPY_AND_ASSIGN(PathEnum); void makeDiversions(PathEnd *path_end, Path *before); void makeDiversion(PathEnd *div_end, diff --git a/search/PathEnumed.hh b/search/PathEnumed.hh index c869efd5..59a5ed33 100644 --- a/search/PathEnumed.hh +++ b/search/PathEnumed.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Path.hh" namespace sta { @@ -66,9 +65,6 @@ protected: Arrival arrival_; VertexId vertex_id_; unsigned int tag_index_:tag_index_bits; - -private: - DISALLOW_COPY_AND_ASSIGN(PathEnumed); }; void deletePathEnumed(PathEnumed *path); diff --git a/search/PathVertex.cc b/search/PathVertex.cc index 8a933c16..750a1c77 100644 --- a/search/PathVertex.cc +++ b/search/PathVertex.cc @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "Fuzzy.hh" #include "Graph.hh" #include "ExceptionPath.hh" @@ -298,9 +297,6 @@ class PrevPred2 : public SearchPred0 public: explicit PrevPred2(const StaState *sta); virtual bool searchThru(Edge *edge); - -private: - DISALLOW_COPY_AND_ASSIGN(PrevPred2); }; PrevPred2::PrevPred2(const StaState *sta) : @@ -355,9 +351,6 @@ protected: PathVertex prev_path_; TimingArc *prev_arc_; float dcalc_tol_; - -private: - DISALLOW_COPY_AND_ASSIGN(PrevPathVisitor); }; PrevPathVisitor::PrevPathVisitor(const Path *path, diff --git a/search/ReportPath.hh b/search/ReportPath.hh index d3bd44be..0e1a16dd 100644 --- a/search/ReportPath.hh +++ b/search/ReportPath.hh @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "StringSeq.hh" #include "SearchClass.hh" #include "PathEnd.hh" @@ -454,9 +453,6 @@ protected: static const float field_blank_; static const float field_skip_; - -private: - DISALLOW_COPY_AND_ASSIGN(ReportPath); }; class ReportField diff --git a/search/Search.cc b/search/Search.cc index 85543f94..c329bbf7 100644 --- a/search/Search.cc +++ b/search/Search.cc @@ -19,7 +19,6 @@ #include #include // abs -#include "DisallowCopyAssign.hh" #include "Mutex.hh" #include "Report.hh" #include "Debug.hh" @@ -165,9 +164,6 @@ public: SearchThru(TagGroupBldr *tag_bldr, const StaState *sta); virtual bool searchThru(Edge *edge); - -private: - DISALLOW_COPY_AND_ASSIGN(SearchThru); }; SearchThru::SearchThru(TagGroupBldr *tag_bldr, @@ -584,9 +580,6 @@ protected: Graph *graph_; Search *search_; - -private: - DISALLOW_COPY_AND_ASSIGN(SeedFaninsThruHierPin); }; SeedFaninsThruHierPin::SeedFaninsThruHierPin(Graph *graph, diff --git a/search/Sim.hh b/search/Sim.hh index f7357ab3..86711006 100644 --- a/search/Sim.hh +++ b/search/Sim.hh @@ -20,7 +20,6 @@ #include #include "StaConfig.hh" // CUDD -#include "DisallowCopyAssign.hh" #include "Map.hh" #include "NetworkClass.hh" #include "GraphClass.hh" @@ -140,9 +139,6 @@ protected: mutable BddSymbolTable symtab_; mutable std::mutex cudd_lock_; #endif // CUDD - -private: - DISALLOW_COPY_AND_ASSIGN(Sim); }; // Abstract base class for Sim value change observer. @@ -154,9 +150,6 @@ public: virtual void valueChangeAfter(Vertex *vertex) = 0; virtual void faninEdgesChangeAfter(Vertex *vertex) = 0; virtual void fanoutEdgesChangeAfter(Vertex *vertex) = 0; - -private: - DISALLOW_COPY_AND_ASSIGN(SimObserver); }; bool diff --git a/search/Sta.cc b/search/Sta.cc index 79e5a666..539e3a9d 100644 --- a/search/Sta.cc +++ b/search/Sta.cc @@ -106,8 +106,6 @@ public: virtual void checkDelayChangedTo(Vertex *vertex); private: - DISALLOW_COPY_AND_ASSIGN(StaDelayCalcObserver); - Search *search_; }; @@ -148,8 +146,6 @@ public: virtual void fanoutEdgesChangeAfter(Vertex *vertex); private: - DISALLOW_COPY_AND_ASSIGN(StaSimObserver); - GraphDelayCalc *graph_delay_calc_; Levelize *levelize_; Search *search_; @@ -203,8 +199,6 @@ public: virtual void levelChangedBefore(Vertex *vertex); private: - DISALLOW_COPY_AND_ASSIGN(StaLevelizeObserver); - Search *search_; }; @@ -2572,25 +2566,31 @@ Sta::updateTiming(bool full) search_->findAllArrivals(); } +//////////////////////////////////////////////////////////////// + void Sta::reportClkSkew(ClockSet *clks, const Corner *corner, const SetupHold *setup_hold, int digits) { - ensureClkArrivals(); - if (clk_skews_ == nullptr) - clk_skews_ = new ClkSkews(this); + clkSkewPreamble(); clk_skews_->reportClkSkew(clks, corner, setup_hold, digits); } float Sta::findWorstClkSkew(const SetupHold *setup_hold) +{ + clkSkewPreamble(); + return clk_skews_->findWorstClkSkew(cmd_corner_, setup_hold); +} + +void +Sta::clkSkewPreamble() { ensureClkArrivals(); if (clk_skews_ == nullptr) clk_skews_ = new ClkSkews(this); - return clk_skews_->findWorstClkSkew(cmd_corner_, setup_hold); } //////////////////////////////////////////////////////////////// diff --git a/search/Tag.hh b/search/Tag.hh index 32e6a925..64bf8d28 100644 --- a/search/Tag.hh +++ b/search/Tag.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Vector.hh" #include "Set.hh" #include "Transition.hh" @@ -85,8 +84,6 @@ protected: void findHash(); private: - DISALLOW_COPY_AND_ASSIGN(Tag); - ClkInfo *clk_info_; InputDelay *input_delay_; ExceptionStateSet *states_; diff --git a/search/TagGroup.hh b/search/TagGroup.hh index b419b464..f191708e 100644 --- a/search/TagGroup.hh +++ b/search/TagGroup.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Vector.hh" #include "Map.hh" #include "Iterator.hh" @@ -72,9 +71,6 @@ protected: bool has_filter_tag_:1; bool has_loop_tag_:1; bool own_arrival_map_:1; - -private: - DISALLOW_COPY_AND_ASSIGN(TagGroup); }; class TagGroupHash @@ -140,9 +136,6 @@ protected: bool has_filter_tag_; bool has_loop_tag_; const StaState *sta_; - -private: - DISALLOW_COPY_AND_ASSIGN(TagGroupBldr); }; void diff --git a/util/ReportStd.cc b/util/ReportStd.cc index 708811a4..7d1b29b5 100644 --- a/util/ReportStd.cc +++ b/util/ReportStd.cc @@ -19,7 +19,6 @@ #include #include -#include "DisallowCopyAssign.hh" #include "Report.hh" namespace sta { @@ -33,9 +32,6 @@ public: protected: virtual size_t printConsole(const char *buffer, size_t length); virtual size_t printErrorConsole(const char *buffer, size_t length); - -private: - DISALLOW_COPY_AND_ASSIGN(ReportStd); }; Report * diff --git a/verilog/VerilogReader.cc b/verilog/VerilogReader.cc index f0b56145..8180139f 100644 --- a/verilog/VerilogReader.cc +++ b/verilog/VerilogReader.cc @@ -18,7 +18,6 @@ #include -#include "DisallowCopyAssign.hh" #include "Debug.hh" #include "Report.hh" #include "Error.hh" @@ -87,8 +86,6 @@ public: bool warn() const { return warn_; } private: - DISALLOW_COPY_AND_ASSIGN(VerilogError); - int id_; const char *filename_; int line_; @@ -1074,9 +1071,6 @@ public: VerilogNullNetNameIterator() {} virtual bool hasNext() { return false; } virtual const char *next() { return nullptr; } - -private: - DISALLOW_COPY_AND_ASSIGN(VerilogNullNetNameIterator); }; class VerilogOneNetNameIterator : public VerilogNetNameIterator @@ -1088,9 +1082,6 @@ public: protected: const char *name_; - -private: - DISALLOW_COPY_AND_ASSIGN(VerilogOneNetNameIterator); }; VerilogOneNetNameIterator::VerilogOneNetNameIterator(const char *name) : @@ -1126,9 +1117,6 @@ protected: int from_index_; int to_index_; int index_; - -private: - DISALLOW_COPY_AND_ASSIGN(VerilogBusNetNameIterator); }; VerilogBusNetNameIterator::VerilogBusNetNameIterator(const char *bus_name, @@ -1185,8 +1173,6 @@ public: virtual const char *next(); private: - DISALLOW_COPY_AND_ASSIGN(VerilogConstantNetNameIterator); - VerilogConstantValue *value_; const char *zero_; const char *one_; @@ -1227,8 +1213,6 @@ public: virtual const char *next(); private: - DISALLOW_COPY_AND_ASSIGN(VerilogNetConcatNameIterator); - VerilogModule *module_; VerilogReader *reader_; VerilogNetSeq::Iterator net_iter_; @@ -1696,8 +1680,6 @@ public: Net *net); private: - DISALLOW_COPY_AND_ASSIGN(VerilogBindingTbl); - const char *zero_net_name_; const char *one_net_name_; BindingMap map_; diff --git a/verilog/VerilogReaderPvt.hh b/verilog/VerilogReaderPvt.hh index 1b940114..beb37662 100644 --- a/verilog/VerilogReaderPvt.hh +++ b/verilog/VerilogReaderPvt.hh @@ -16,7 +16,6 @@ #pragma once -#include "DisallowCopyAssign.hh" #include "Zlib.hh" #include "Vector.hh" #include "Map.hh" @@ -169,7 +168,6 @@ public: netVerilogName(const char *net_name); protected: - DISALLOW_COPY_AND_ASSIGN(VerilogReader); void init(const char *filename); void makeCellPorts(Cell *cell, VerilogModule *module, @@ -317,8 +315,6 @@ public: int line() const { return line_; } private: - DISALLOW_COPY_AND_ASSIGN(VerilogStmt); - int line_; }; @@ -342,7 +338,6 @@ public: VerilogReader *reader); private: - DISALLOW_COPY_AND_ASSIGN(VerilogModule); void parseStmts(VerilogReader *reader); void checkInstanceName(VerilogInst *inst, StringSet &inst_names, @@ -375,8 +370,6 @@ public: void check(); private: - DISALLOW_COPY_AND_ASSIGN(VerilogDcl); - PortDirection *dir_; VerilogDclArgSeq *args_; }; @@ -400,8 +393,6 @@ public: virtual int size() const; private: - DISALLOW_COPY_AND_ASSIGN(VerilogDclBus); - int from_index_; int to_index_; }; @@ -417,8 +408,6 @@ public: VerilogAssign *assign() { return assign_; } private: - DISALLOW_COPY_AND_ASSIGN(VerilogDclArg); - const char *net_name_; VerilogAssign *assign_; }; @@ -436,8 +425,6 @@ public: VerilogNet *rhs() const { return rhs_; } private: - DISALLOW_COPY_AND_ASSIGN(VerilogAssign); - VerilogNet *lhs_; VerilogNet *rhs_; }; @@ -453,8 +440,6 @@ public: void setInstanceName(const char *inst_name); private: - DISALLOW_COPY_AND_ASSIGN(VerilogInst); - const char *inst_name_; }; @@ -473,8 +458,6 @@ public: bool hasPins(); private: - DISALLOW_COPY_AND_ASSIGN(VerilogModuleInst); - const char *module_name_; VerilogNetSeq *pins_; }; @@ -495,8 +478,6 @@ public: const char **netNames() const { return net_names_; } private: - DISALLOW_COPY_AND_ASSIGN(VerilogLibertyInst); - LibertyCell *cell_; const char **net_names_; }; @@ -516,7 +497,6 @@ public: VerilogReader *reader) = 0; private: - DISALLOW_COPY_AND_ASSIGN(VerilogNet); }; class VerilogNetUnnamed : public VerilogNet @@ -525,9 +505,6 @@ public: VerilogNetUnnamed() {} virtual bool isNamed() { return false; } virtual const char *name() { return nullptr; } - -private: - DISALLOW_COPY_AND_ASSIGN(VerilogNetUnnamed); }; class VerilogNetNamed : public VerilogNet @@ -543,9 +520,6 @@ public: protected: const char *name_; - -private: - DISALLOW_COPY_AND_ASSIGN(VerilogNetNamed); }; // Named net reference, which could be the name of a scalar or bus signal. @@ -557,9 +531,6 @@ public: virtual int size(VerilogModule *module); virtual VerilogNetNameIterator *nameIterator(VerilogModule *module, VerilogReader *reader); - -private: - DISALLOW_COPY_AND_ASSIGN(VerilogNetScalar); }; class VerilogNetBitSelect : public VerilogNetNamed @@ -573,10 +544,7 @@ public: virtual int size(VerilogModule *module); virtual VerilogNetNameIterator *nameIterator(VerilogModule *module, VerilogReader *reader); - private: - DISALLOW_COPY_AND_ASSIGN(VerilogNetBitSelect); - int index_; }; @@ -594,8 +562,6 @@ public: int toIndex() const { return to_index_; } private: - DISALLOW_COPY_AND_ASSIGN(VerilogNetPartSelect); - int from_index_; int to_index_; }; @@ -611,7 +577,6 @@ public: VerilogReader *reader); private: - DISALLOW_COPY_AND_ASSIGN(VerilogNetConstant); void parseConstant(const char *constant, VerilogReader *reader); void parseConstant(const char *constant, @@ -636,8 +601,6 @@ public: VerilogReader *reader); private: - DISALLOW_COPY_AND_ASSIGN(VerilogNetConcat); - VerilogNetSeq *nets_; }; @@ -648,9 +611,6 @@ public: explicit VerilogNetPortRef(const char *name); virtual bool isNamedPortRef() { return true; } virtual bool hasNet() = 0; - -private: - DISALLOW_COPY_AND_ASSIGN(VerilogNetPortRef); }; // Named scalar port reference to scalar net .port(net). @@ -689,8 +649,6 @@ public: virtual bool hasNet() { return net_ != nullptr; } private: - DISALLOW_COPY_AND_ASSIGN(VerilogNetPortRefScalar); - VerilogNet *net_; }; @@ -703,8 +661,6 @@ public: virtual const char *name(); private: - DISALLOW_COPY_AND_ASSIGN(VerilogNetPortRefBit); - int index_; }; @@ -719,8 +675,6 @@ public: int toIndex() const { return to_index_; } private: - DISALLOW_COPY_AND_ASSIGN(VerilogNetPortRefPart); - int to_index_; };