Remove unnecessary checks before deleting pointers

This commit is contained in:
Ray Speth 2014-10-01 17:52:23 +00:00
parent 1a5f75dd2d
commit afe9ccb03e

View file

@ -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
{