From afe9ccb03ec386aecd3ebe3dc1f964fdfc2495ed Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 1 Oct 2014 17:52:23 +0000 Subject: [PATCH] Remove unnecessary checks before deleting pointers --- src/thermo/GeneralSpeciesThermo.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/thermo/GeneralSpeciesThermo.cpp b/src/thermo/GeneralSpeciesThermo.cpp index fdc78f895..9ea6723de 100644 --- a/src/thermo/GeneralSpeciesThermo.cpp +++ b/src/thermo/GeneralSpeciesThermo.cpp @@ -54,14 +54,10 @@ GeneralSpeciesThermo::operator=(const GeneralSpeciesThermo& b) m_thigh_min = b.m_thigh_min; for (size_t k = 0; k < m_kk; k++) { - SpeciesThermoInterpType* sp = m_sp[k]; - if (sp) { - delete sp; - m_sp[k] = 0; - } + delete m_sp[k]; } m_kk = b.m_kk; - m_sp.resize(m_kk, 0); + m_sp.assign(m_kk, 0); for (size_t k = 0; k < m_kk; k++) { SpeciesThermoInterpType* bk = b.m_sp[k]; if (bk) { @@ -75,15 +71,10 @@ GeneralSpeciesThermo::operator=(const GeneralSpeciesThermo& b) GeneralSpeciesThermo::~GeneralSpeciesThermo() { for (size_t k = 0; k < m_kk; k++) { - SpeciesThermoInterpType* sp = m_sp[k]; - if (sp) { - delete sp; - m_sp[k] = 0; - } + delete m_sp[k]; } } - SpeciesThermo* GeneralSpeciesThermo::duplMyselfAsSpeciesThermo() const {