research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed the useless SAFE_DELETE macro

Browse source
This commit is contained in:
Ray Speth 2013-04-12 23:06:45 +00:00
parent acdf1e3900
commit 59d615c8d2
5 changed files with 18 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/cantera/base/mdp_allo.h
View file

@ -120,15 +120,6 @@ extern int MDP_MP_Nprocs;
extern int MDP_MP_myproc;
#endif
/****************************************************************************/
/*
* MDP_SAFE_DELETE()
* This useful define is great for delete single instances of
* mallocing using new.
*/
#define MDP_SAFE_DELETE(a) if (a) { delete (a); a = 0; }
/****************************************************************************/
#define mdp_alloc_struct(x, num) (x *) mdp_array_alloc(1, (num), sizeof(x))

5
src/numerics/BEulerInt.cpp
View file

@ -18,9 +18,6 @@
using namespace std;
using namespace mdp;
#define SAFE_DELETE(a) if (a) { delete (a); a = 0; }
/*
* Blas routines
*/
@ -121,7 +118,7 @@ BEulerInt::~BEulerInt()
mdp::mdp_safe_free((void**) &m_abstol);
mdp::mdp_safe_free((void**) &m_rowScales);
mdp::mdp_safe_free((void**) &m_colScales);
SAFE_DELETE(tdjac_ptr);
delete tdjac_ptr;
}
//================================================================================================
void BEulerInt::setTolerances(double reltol, size_t n, double* abstol)

21
src/transport/LiquidTransportData.cpp
View file

@ -6,9 +6,6 @@
#include "cantera/transport/LiquidTransportData.h"
using namespace std;
#ifndef SAFE_DELETE
#define SAFE_DELETE(x) if (x) { delete (x); x = 0; }
#endif
namespace Cantera
{
@ -87,26 +84,24 @@ LiquidTransportData& LiquidTransportData::operator=(const LiquidTransportData& r
//====================================================================================================================
LiquidTransportData::~LiquidTransportData()
{
SAFE_DELETE(hydroRadius);
SAFE_DELETE(viscosity);
SAFE_DELETE(ionConductivity);
delete hydroRadius;
delete viscosity;
delete ionConductivity;
for (size_t k = 0; k < mobilityRatio.size(); k++) {
if (mobilityRatio[k]) {
SAFE_DELETE(mobilityRatio[k]);
delete mobilityRatio[k];
}
}
for (size_t k = 0; k < selfDiffusion.size(); k++) {
if (selfDiffusion[k]) {
SAFE_DELETE(selfDiffusion[k]);
delete selfDiffusion[k];
}
}
SAFE_DELETE(thermalCond);
SAFE_DELETE(electCond);
SAFE_DELETE(speciesDiffusivity);
delete thermalCond;
delete electCond;
delete speciesDiffusivity;
}
//====================================================================================================================
}

14
src/transport/SimpleTransport.cpp
View file

@ -14,12 +14,6 @@
#include <iostream>
using namespace std;
#ifndef SAFE_DELETE
//! \cond
#define SAFE_DELETE(x) if (x) { delete (x); x = 0; }
//! \endcond
#endif
namespace Cantera
{
//================================================================================================
@ -151,16 +145,16 @@ Transport* SimpleTransport::duplMyselfAsTransport() const
SimpleTransport::~SimpleTransport()
{
for (size_t k = 0; k < m_coeffVisc_Ns.size() ; k++) {
SAFE_DELETE(m_coeffVisc_Ns[k]);
delete m_coeffVisc_Ns[k];
}
for (size_t k = 0; k < m_coeffLambda_Ns.size(); k++) {
SAFE_DELETE(m_coeffLambda_Ns[k]);
delete m_coeffLambda_Ns[k];
}
for (size_t k = 0; k < m_coeffDiff_Ns.size(); k++) {
SAFE_DELETE(m_coeffDiff_Ns[k]);
delete m_coeffDiff_Ns[k];
}
for (size_t k = 0; k < m_coeffHydroRadius_Ns.size(); k++) {
SAFE_DELETE(m_coeffHydroRadius_Ns[k]);
delete m_coeffHydroRadius_Ns[k];
}
}
//================================================================================================

15
src/transport/SolidTransportData.cpp
View file

@ -12,9 +12,6 @@
using namespace std;
#ifndef SAFE_DELETE
#define SAFE_DELETE(x) if (x) { delete (x); x = 0; }
#endif
namespace Cantera
{
@ -70,13 +67,11 @@ SolidTransportData& SolidTransportData::operator=(const SolidTransportData& righ
//====================================================================================================================
SolidTransportData::~SolidTransportData()
{
SAFE_DELETE(ionConductivity);
SAFE_DELETE(thermalConductivity);
SAFE_DELETE(electConductivity);
SAFE_DELETE(defectDiffusivity);
SAFE_DELETE(defectActivity);
delete ionConductivity;
delete thermalConductivity;
delete electConductivity;
delete defectDiffusivity;
delete defectActivity;
}
//====================================================================================================================
}