From f7f2b0cadff9a21fb2cb905bb2cd44318ba05747 Mon Sep 17 00:00:00 2001 From: James Cherry Date: Wed, 10 May 2023 10:12:43 -0700 Subject: [PATCH] leak Signed-off-by: James Cherry --- include/sta/Units.hh | 2 +- liberty/Units.cc | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/sta/Units.hh b/include/sta/Units.hh index 61355954..d8b1b509 100644 --- a/include/sta/Units.hh +++ b/include/sta/Units.hh @@ -83,9 +83,9 @@ public: private: Unit time_unit_; + Unit resistance_unit_; Unit capacitance_unit_; Unit voltage_unit_; - Unit resistance_unit_; Unit current_unit_; Unit power_unit_; Unit distance_unit_; diff --git a/liberty/Units.cc b/liberty/Units.cc index 91d13705..ecd17846 100644 --- a/liberty/Units.cc +++ b/liberty/Units.cc @@ -67,6 +67,7 @@ Unit::operator=(const Unit &unit) scale_ = unit.scale_; stringDelete(suffix_); suffix_ = stringCopy(unit.suffix_); + stringDelete(scaled_suffix_); scaled_suffix_ = stringCopy(unit.scaled_suffix_); digits_ = unit.digits_; } @@ -165,9 +166,9 @@ Unit::asString(float value, Units::Units() : time_unit_("s"), + resistance_unit_("ohm"), capacitance_unit_("F"), voltage_unit_("v"), - resistance_unit_("ohm"), current_unit_("A"), power_unit_("W"), distance_unit_("m"), @@ -180,10 +181,10 @@ Units::find(const char *unit_name) { if (stringEq(unit_name, "time")) return &time_unit_; - else if (stringEq(unit_name, "capacitance")) - return &capacitance_unit_; else if (stringEq(unit_name, "resistance")) return &resistance_unit_; + else if (stringEq(unit_name, "capacitance")) + return &capacitance_unit_; else if (stringEq(unit_name, "voltage")) return &voltage_unit_; else if (stringEq(unit_name, "current")) @@ -200,8 +201,8 @@ void Units::operator=(const Units &units) { time_unit_ = *units.timeUnit(); - capacitance_unit_ = *units.capacitanceUnit(); resistance_unit_ = *units.resistanceUnit(); + capacitance_unit_ = *units.capacitanceUnit(); voltage_unit_ = *units.voltageUnit(); current_unit_ = *units.currentUnit(); power_unit_ = *units.powerUnit();