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

Eliminated unnecessary empty destructors from derived classes

Browse source 
See http://www.parashift.com/c++-faq-lite/virtual-dtors.html
This commit is contained in:
Ray Speth 2013-04-29 18:04:23 +00:00
parent 09e873b3bf
commit 0a059d406a
154 changed files with 3 additions and 628 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/cantera/Edge.h
View file

@ -33,9 +33,6 @@ public:
m_ok = true;
}
virtual ~Edge() {}
bool operator!() {
return !m_ok;
}

2
include/cantera/GRI30.h
View file

@ -33,8 +33,6 @@ public:
"buildSolutionFromXML returned false");
}
virtual ~GRI30() {}
bool operator!() {
return !m_ok;
}

2
include/cantera/IdealGasMix.h
View file

@ -45,8 +45,6 @@ public:
m_ok = buildSolutionFromXML(*m_r, m_id, "phase", this, this);
}
virtual ~IdealGasMix() {}
bool operator!() {
return !m_ok;
}

2
include/cantera/IncompressibleSolid.h
View file

@ -24,8 +24,6 @@ public:
"buildSolutionFromXML returned false");
}
virtual ~IncompressibleSolid() {}
bool operator!() {
return !m_ok;
}

4
include/cantera/Interface.h
View file

@ -88,10 +88,6 @@ public:
return *this;
}
//! Destructor. Does nothing.
virtual ~Interface() {
}
//! Not operator
bool operator!() {
return !m_ok;

2
include/cantera/Metal.h
View file

@ -23,8 +23,6 @@ public:
"buildSolutionFromXML returned false");
}
virtual ~Metal() {}
bool operator!() {
return !m_ok;
}

2
include/cantera/PureFluid.h
View file

@ -33,8 +33,6 @@ public:
m_ok = buildSolutionFromXML(root, id, "phase", this, 0);
}
virtual ~PureFluid() {}
bool operator!() {
return !m_ok;
}

4
include/cantera/kinetics/AqueousKinetics.h
View file

@ -57,10 +57,6 @@ public:
AqueousKinetics& operator=(const AqueousKinetics& right);
/// Destructor.
virtual ~AqueousKinetics();
//! Duplication routine for objects which inherit from Kinetics
/*!
* This virtual routine can be used to duplicate %Kinetics objects

3
include/cantera/kinetics/EdgeKinetics.h
View file

@ -23,9 +23,6 @@ public:
//! Constructor
EdgeKinetics() : InterfaceKinetics() {}
/// Destructor.
virtual ~EdgeKinetics() {}
EdgeKinetics(const EdgeKinetics& right) :
InterfaceKinetics(right) {
*this=right;

9
include/cantera/kinetics/FalloffFactory.h
View file

@ -118,15 +118,6 @@ public:
}
}
/**
* Destructor doesn't do anything. We do not delete statically created
* single instance of this class here, because it would create an infinite
* loop if destructor is called for that single instance. Instead, to
* delete single instance, we call delete[] from FalloffMng's destructor.
*/
virtual ~FalloffFactory() {
}
//! Return a pointer to a new falloff function calculator.
/*!
* @param type Integer flag specifying the type of falloff function. The

3
include/cantera/kinetics/GRI_30_Kinetics.h
View file

@ -24,9 +24,6 @@ public:
/// Default constructor.
GRI_30_Kinetics(thermo_t* th=0);
/// Destructor.
virtual ~GRI_30_Kinetics() {}
virtual int type() const {
return cGRI_30_Kinetics;
}

3
include/cantera/kinetics/GasKinetics.h
View file

@ -53,9 +53,6 @@ public:
//! Copy Constructor
GasKinetics(const GasKinetics& right);
//! Destructor.
virtual ~GasKinetics();
//! Assignment operator
GasKinetics& operator=(const GasKinetics& right);

6
include/cantera/kinetics/KineticsFactory.h
View file

@ -22,7 +22,6 @@ public:
CanteraError(proc, "Specified Kinetics model "
+ kineticsModel +
" does not match any known type.") {}
virtual ~UnknownKineticsModel() throw() {}
};
/**
@ -39,11 +38,6 @@ public:
return s_factory;
}
virtual ~KineticsFactory() {
//delete s_factory;
//s_factory = 0;
}
virtual void deleteFactory() {
ScopedLock lock(kinetics_mutex);
if (s_factory) {

3
include/cantera/numerics/BandMatrix.h
View file

@ -63,9 +63,6 @@ public:
*/
BandMatrix(const BandMatrix& y);
//! Destructor. Does nothing.
virtual ~BandMatrix();
//! assignment operator
/*!
* @param y reference to the matrix to be copied

3
include/cantera/numerics/DenseMatrix.h
View file

@ -97,9 +97,6 @@ public:
*/
DenseMatrix& operator=(const DenseMatrix& y);
//! Destructor. Does nothing.
virtual ~DenseMatrix();
//! Resize the matrix
/*!
* Resize the matrix to n rows by m cols.

21
include/cantera/numerics/Func1.h
View file

@ -147,8 +147,6 @@ public:
m_c = omega;
}
virtual ~Sin1() {}
Sin1(const Sin1& b) :
Func1(b) {
}
@ -187,7 +185,7 @@ public:
Func1() {
m_c = omega;
}
virtual ~Cos1() {}
Cos1(const Cos1& b) :
Func1(b) {
}
@ -224,8 +222,7 @@ public:
Func1() {
m_c = A;
}
virtual ~Exp1() {
}
Exp1(const Exp1& b) :
Func1(b) {
}
@ -261,7 +258,7 @@ public:
Func1() {
m_c = n;
}
virtual ~Pow1() {}
Pow1(const Pow1& b) :
Func1(b) {
}
@ -298,8 +295,6 @@ public:
Func1() {
m_c = A;
}
virtual ~Const1() {
}
Const1(const Const1& b) :
Func1(b) {
@ -819,8 +814,6 @@ public:
m_tau = fwhm/(2.0*std::sqrt(std::log(2.0)));
}
virtual ~Gaussian() {}
Gaussian(const Gaussian& b) :
Func1(b) {
*this = Gaussian::operator=(b);
@ -867,9 +860,6 @@ public:
std::copy(c, c+m_n, m_cpoly.begin());
}
virtual ~Poly1() {
}
Poly1(const Poly1& b) :
Func1(b) {
*this = Poly1::operator=(b);
@ -930,8 +920,6 @@ public:
std::copy(b, b+n, m_csin.begin());
}
virtual ~Fourier1() {}
Fourier1(const Fourier1& b) :
Func1(b) {
*this = Fourier1::operator=(b);
@ -996,9 +984,6 @@ public:
m_E[i] = c[loc+2];
}
}
virtual ~Arrhenius1() {
}
Arrhenius1(const Arrhenius1& b) :
Func1() {

3
include/cantera/numerics/ResidJacEval.h
View file

@ -67,9 +67,6 @@ public:
*/
ResidJacEval(const ResidJacEval& right);
/// Destructor. Does nothing.
virtual ~ResidJacEval();
//! Assignment operator
/*!
* This is NOT a virtual function.

4
include/cantera/numerics/SquareMatrix.h
View file

@ -53,10 +53,6 @@ public:
*/
SquareMatrix& operator=(const SquareMatrix& right);
//! Destructor. Does nothing.
virtual ~SquareMatrix();
//! Solves the Ax = b system returning x in the b spot.
/*!
* @param b Vector for the rhs of the equation system

10
include/cantera/oneD/Inlet1D.h
View file

@ -41,8 +41,6 @@ public:
Bdry1D();
virtual ~Bdry1D() {}
/// Initialize.
virtual void init() {
_init(1);
@ -133,7 +131,6 @@ public:
m_type = cInletType;
m_xstr = "";
}
virtual ~Inlet1D() {}
/// set spreading rate
virtual void setSpreadRate(doublereal V0) {
@ -211,7 +208,6 @@ public:
Empty1D() : Domain1D() {
m_type = cEmptyType;
}
virtual ~Empty1D() {}
virtual std::string componentName(size_t n) const;
virtual void showSolution(const doublereal* x) {}
@ -244,7 +240,6 @@ public:
Symm1D() : Bdry1D() {
m_type = cSymmType;
}
virtual ~Symm1D() {}
virtual std::string componentName(size_t n) const;
@ -277,7 +272,6 @@ public:
Outlet1D() : Bdry1D() {
m_type = cOutletType;
}
virtual ~Outlet1D() {}
virtual std::string componentName(size_t n) const;
@ -315,7 +309,6 @@ public:
m_type = cOutletResType;
m_xstr = "";
}
virtual ~OutletRes1D() {}
virtual void showSolution(const doublereal* x) {}
@ -366,7 +359,6 @@ public:
Surf1D() : Bdry1D() {
m_type = cSurfType;
}
virtual ~Surf1D() {}
virtual std::string componentName(size_t n) const;
@ -429,8 +421,6 @@ public:
m_enabled = docov;
}
virtual ~ReactingSurf1D() {}
virtual std::string componentName(size_t n) const;
virtual void init();

3
include/cantera/oneD/MultiJac.h
View file

@ -32,9 +32,6 @@ public:
*/
MultiJac(OneDim& r);
/// Destructor. Does nothing.
virtual ~MultiJac() {}
/**
* Evaluate the Jacobian at x0. The unperturbed residual
* function is resid0, which must be supplied on input. The

3
include/cantera/oneD/Sim1D.h
View file

@ -40,9 +40,6 @@ public:
*/
Sim1D(std::vector<Domain1D*>& domains);
/// Destructor. Does nothing.
virtual ~Sim1D() {}
/**
* @name Setting initial values
*

5
include/cantera/oneD/StFlow.h
View file

@ -60,9 +60,6 @@ public:
/// @param nsp Number of species.
StFlow(IdealGasPhase* ph = 0, size_t nsp = 1, size_t points = 1);
/// Destructor.
virtual ~StFlow() {}
/**
* @name Problem Specification
*/
@ -521,7 +518,6 @@ public:
StFlow(ph, nsp, points) {
m_dovisc = true;
}
virtual ~AxiStagnFlow() {}
virtual void evalRightBoundary(doublereal* x, doublereal* res,
integer* diag, doublereal rdt);
@ -544,7 +540,6 @@ public:
m_dovisc = false;
setID("flame");
}
virtual ~FreeFlame() {}
virtual void evalRightBoundary(doublereal* x, doublereal* res,
integer* diag, doublereal rdt);

3
include/cantera/thermo/AdsorbateThermo.h
View file

@ -67,9 +67,6 @@ public:
m_freq.begin());
}
//! destructor
virtual ~Adsorbate() {}
virtual SpeciesThermoInterpType*
duplMyselfAsSpeciesThermoInterpType() const {
Adsorbate* np = new Adsorbate(*this);

3
include/cantera/thermo/ConstDensityThermo.h
View file

@ -34,9 +34,6 @@ public:
//! Constructor.
ConstDensityThermo();
//! Destructor
virtual ~ConstDensityThermo() {}
//! Copy Constructor
/*!
* @param right Object to be copied

5
include/cantera/thermo/Crystal.h
View file

@ -20,11 +20,6 @@ public:
/// phases are added using method addPhase.
Crystal() : MultiPhase() {}
/// Destructor. Does nothing. Class MultiPhase does not take
/// "ownership" (i.e. responsibility for destroying) the
/// phase objects.
virtual ~Crystal() {}
void addLattices(std::vector<LatticePhase*>& lattices,
const vector_fp& latticeSiteDensity);

3
include/cantera/thermo/EdgePhase.h
View file

@ -49,9 +49,6 @@ public:
*/
EdgePhase& operator=(const EdgePhase& right);
//! Destructor
virtual ~EdgePhase() {}
//! Duplicator from a ThermoPhase object
ThermoPhase* duplMyselfAsThermoPhase() const;

3
include/cantera/thermo/FixedChemPotSSTP.h
View file

@ -198,9 +198,6 @@ public:
*/
FixedChemPotSSTP& operator=(const FixedChemPotSSTP& right);
//! Destructor for the routine
virtual ~FixedChemPotSSTP();
//! Duplication function
/*!
* This virtual function is used to create a duplicate of the

3
include/cantera/thermo/GibbsExcessVPSSTP.h
View file

@ -121,9 +121,6 @@ public:
*/
GibbsExcessVPSSTP& operator=(const GibbsExcessVPSSTP& b);
/// Destructor.
virtual ~GibbsExcessVPSSTP();
//! Duplication routine for objects which inherit from ThermoPhase.
/*!
* This virtual routine can be used to duplicate thermophase objects

3
include/cantera/thermo/IdealGasPhase.h
View file

@ -348,9 +348,6 @@ public:
*/
IdealGasPhase& operator=(const IdealGasPhase& right);
//! Destructor
virtual ~IdealGasPhase();
//! Duplicator from the ThermoPhase parent class
/*!
* Given a pointer to a ThermoPhase object, this function will

3
include/cantera/thermo/IdealMolalSoln.h
View file

@ -128,9 +128,6 @@ public:
*/
IdealMolalSoln(XML_Node& phaseRef, const std::string& id = "");
/// Destructor.
virtual ~IdealMolalSoln();
//! Duplication function
/*!
* This virtual function is used to create a duplicate of the

3
include/cantera/thermo/IdealSolidSolnPhase.h
View file

@ -111,9 +111,6 @@ public:
*/
virtual ThermoPhase* duplMyselfAsThermoPhase() const;
//! Destructor
virtual ~IdealSolidSolnPhase() {}
/**
* Equation of state flag. Returns a value depending upon the value of
* #m_formGC, which is defined at instantiation.

3
include/cantera/thermo/IdealSolnGasVPSS.h
View file

@ -60,9 +60,6 @@ public:
/// Assignment operator
IdealSolnGasVPSS& operator=(const IdealSolnGasVPSS&);
/// Destructor.
virtual ~IdealSolnGasVPSS();
//! Duplication routine
virtual ThermoPhase* duplMyselfAsThermoPhase() const;

3
include/cantera/thermo/LatticePhase.h
View file

@ -275,9 +275,6 @@ public:
*/
LatticePhase(XML_Node& phaseRef, const std::string& id = "");
//! Destructor
virtual ~LatticePhase();
//! Duplication function
/*!
* This virtual function is used to create a duplicate of the

3
include/cantera/thermo/MargulesVPSSTP.h
View file

@ -318,9 +318,6 @@ public:
*/
MargulesVPSSTP& operator=(const MargulesVPSSTP& b);
//! Destructor
virtual ~MargulesVPSSTP();
//! Duplication routine for objects which inherit from ThermoPhase.
/*!
* This virtual routine can be used to duplicate thermophase objects

2
include/cantera/thermo/MetalPhase.h
View file

@ -39,8 +39,6 @@ public:
return *this;
}
virtual ~MetalPhase() {}
//! Duplicator
virtual ThermoPhase* duplMyselfAsThermoPhase() const {
MetalPhase* idg = new MetalPhase(*this);

3
include/cantera/thermo/MineralEQ3.h
View file

@ -129,9 +129,6 @@ public:
*/
MineralEQ3& operator=(const MineralEQ3& right);
//! Destructor for the routine (virtual)
virtual ~MineralEQ3();
//! Duplication function
/*!
* This virtual function is used to create a duplicate of the

3
include/cantera/thermo/MixedSolventElectrolyte.h
View file

@ -310,9 +310,6 @@ public:
*/
MixedSolventElectrolyte& operator=(const MixedSolventElectrolyte& b);
//! Destructor
virtual ~MixedSolventElectrolyte();
//! Duplication routine for objects which inherit from ThermoPhase.
/*!
* This virtual routine can be used to duplicate thermophase objects

3
include/cantera/thermo/MixtureFugacityTP.h
View file

@ -94,9 +94,6 @@ public:
*/
MixtureFugacityTP& operator=(const MixtureFugacityTP& b);
//! Destructor.
virtual ~MixtureFugacityTP();
//! Duplication routine
/*!
* @return Returns a duplication

3
include/cantera/thermo/MolalityVPSSTP.h
View file

@ -212,9 +212,6 @@ public:
*/
MolalityVPSSTP& operator=(const MolalityVPSSTP& b);
/// Destructor.
virtual ~MolalityVPSSTP();
//! Duplication routine for objects which inherit from ThermoPhase.
/*!
* This virtual routine can be used to duplicate objects

3
include/cantera/thermo/MolarityIonicVPSSTP.h
View file

@ -101,9 +101,6 @@ public:
*/
MolarityIonicVPSSTP& operator=(const MolarityIonicVPSSTP& b);
/// Destructor.
virtual ~MolarityIonicVPSSTP();
//! Duplication routine for objects which inherit from ThermoPhase.
/*!
* This virtual routine can be used to duplicate thermophase objects

3
include/cantera/thermo/Mu0Poly.h
View file

@ -109,9 +109,6 @@ public:
//! Assignment operator
Mu0Poly& operator=(const Mu0Poly&);
//! Destructor
virtual ~Mu0Poly();
virtual SpeciesThermoInterpType*
duplMyselfAsSpeciesThermoInterpType() const;

3
include/cantera/thermo/Nasa9Poly1.h
View file

@ -96,9 +96,6 @@ public:
*/
Nasa9Poly1& operator=(const Nasa9Poly1& b);
//! Destructor
virtual ~Nasa9Poly1();
virtual SpeciesThermoInterpType*
duplMyselfAsSpeciesThermoInterpType() const;

3
include/cantera/thermo/NasaPoly1.h
View file

@ -103,9 +103,6 @@ public:
return *this;
}
//! Destructor
virtual ~NasaPoly1() {}
virtual SpeciesThermoInterpType*
duplMyselfAsSpeciesThermoInterpType() const {
NasaPoly1* np = new NasaPoly1(*this);

3
include/cantera/thermo/PDSS_ConstVol.h
View file

@ -78,9 +78,6 @@ public:
*/
PDSS_ConstVol& operator=(const PDSS_ConstVol& b);
//! Destructor
virtual ~PDSS_ConstVol();
virtual PDSS* duplMyselfAsPDSS() const;
//! @}

3
include/cantera/thermo/PDSS_IdealGas.h
View file

@ -80,9 +80,6 @@ public:
PDSS_IdealGas(VPStandardStateTP* vptp_ptr, size_t spindex, const XML_Node& speciesNode,
const XML_Node& phaseRef, bool spInstalled);
//! Destructor
virtual ~PDSS_IdealGas();
virtual PDSS* duplMyselfAsPDSS() const;
//! @}

3
include/cantera/thermo/PDSS_IonsFromNeutral.h
View file

@ -82,9 +82,6 @@ public:
*/
PDSS_IonsFromNeutral& operator=(const PDSS_IonsFromNeutral& b);
//! Destructor
virtual ~PDSS_IonsFromNeutral();
virtual PDSS* duplMyselfAsPDSS() const;
virtual void initAllPtrs(VPStandardStateTP* vptp_ptr, VPSSMgr* vpssmgr_ptr,
SpeciesThermo* spthermo_ptr);

3
include/cantera/thermo/PDSS_SSVol.h
View file

@ -211,9 +211,6 @@ public:
*/
PDSS_SSVol& operator=(const PDSS_SSVol& b);
//! Destructor
virtual ~PDSS_SSVol();
virtual PDSS* duplMyselfAsPDSS() const;
//! @}

3
include/cantera/thermo/PhaseCombo_Interaction.h
View file

@ -383,9 +383,6 @@ public:
*/
PhaseCombo_Interaction& operator=(const PhaseCombo_Interaction& b);
//! Destructor
virtual ~PhaseCombo_Interaction();
//! Duplication routine for objects which inherit from ThermoPhase.
/*!
* This virtual routine can be used to duplicate thermophase objects

3
include/cantera/thermo/PseudoBinaryVPSSTP.h
View file

@ -88,9 +88,6 @@ public:
*/
PseudoBinaryVPSSTP& operator=(const PseudoBinaryVPSSTP& b);
/// Destructor.
virtual ~PseudoBinaryVPSSTP();
//! Duplication routine for objects which inherit from ThermoPhase.
/*!
* This virtual routine can be used to duplicate thermophase objects

3
include/cantera/thermo/RedlichKisterVPSSTP.h
View file

@ -307,9 +307,6 @@ public:
*/
RedlichKisterVPSSTP& operator=(const RedlichKisterVPSSTP& b);
//! Destructor
virtual ~RedlichKisterVPSSTP();
//! Duplication routine for objects which inherit from ThermoPhase.
/*!
* This virtual routine can be used to duplicate thermophase objects

3
include/cantera/thermo/RedlichKwongMFTP.h
View file

@ -86,9 +86,6 @@ public:
*/
RedlichKwongMFTP& operator=(const RedlichKwongMFTP& right);
//! Destructor.
virtual ~RedlichKwongMFTP();
//! Duplicator from the ThermoPhase parent class
/*!
* Given a pointer to a ThermoPhase object, this function will

2
include/cantera/thermo/SemiconductorPhase.h
View file

@ -43,8 +43,6 @@ public:
return *this;
}
virtual ~SemiconductorPhase() {}
//! Duplicator
virtual ThermoPhase* duplMyselfAsThermoPhase() const {
SemiconductorPhase* idg = new SemiconductorPhase(*this);

3
include/cantera/thermo/SimpleThermo.h
View file

@ -58,9 +58,6 @@ public:
m_p0(-1.0),
m_nspData(0) {}
//! Destructor
virtual ~SimpleThermo() {}
//! Copy constructor
/*!
* @param right Object to be copied

3
include/cantera/thermo/SingleSpeciesTP.h
View file

@ -84,9 +84,6 @@ public:
*/
SingleSpeciesTP& operator=(const SingleSpeciesTP& right);
//! Destructor
virtual ~SingleSpeciesTP();
//! Duplication function
/*!
* This virtual function is used to create a duplicate of the

10
include/cantera/thermo/SpeciesThermoFactory.h
View file

@ -43,8 +43,6 @@ public:
": Specified speciesThermoPhase model "
+ speciesThermoModel +
" does not match any known type.") {}
//! destructor
virtual ~UnknownSpeciesThermoModel() throw() {}
};
//! Factory to build instances of classes that manage the
@ -96,14 +94,6 @@ public:
*/
void deleteFactory();
//! Destructor
/**
* Doesn't do anything. We do not delete statically created single
* instance of this class here, because it would create an infinite loop
* if destructor is called for that single instance.
*/
virtual ~SpeciesThermoFactory();
//! Create a new species property manager for the reference state.
/*!
* @param type the integer type to be created.

3
include/cantera/thermo/SpeciesThermoInterpType.h
View file

@ -312,9 +312,6 @@ public:
*/
STITbyPDSS(const STITbyPDSS& b);
//! Destructor
virtual ~STITbyPDSS();
virtual SpeciesThermoInterpType* duplMyselfAsSpeciesThermoInterpType() const;
//! Initialize and/or Reinitialize all the pointers for this object

5
include/cantera/thermo/SpeciesThermoMgr.h
View file

@ -43,8 +43,6 @@ public:
UnknownSpeciesThermo(const std::string& proc, const std::string& stype) :
CanteraError(proc, "Specified species parameterization type (" + stype
+ ") does not match any known type.") {}
//! destructor
virtual ~UnknownSpeciesThermo() throw() {}
};
/**
@ -62,9 +60,6 @@ public:
//! Constructor
SpeciesThermoDuo() {};
//! Destructor
virtual ~SpeciesThermoDuo() {};
//! copy constructor
/*!
* @param right Object to be copied

3
include/cantera/thermo/StatMech.h
View file

@ -58,9 +58,6 @@ public:
*/
StatMech& operator=(const StatMech& b);
//! Destructor
virtual ~StatMech();
//! duplicator
virtual SpeciesThermoInterpType*
duplMyselfAsSpeciesThermoInterpType() const;

3
include/cantera/thermo/StoichSubstance.h
View file

@ -50,9 +50,6 @@ public:
*/
StoichSubstance& operator=(const StoichSubstance& right);
//! Destructor
virtual ~StoichSubstance();
//! Duplicator from the %ThermoPhase parent class
/*
* Given a pointer to a %ThermoPhase object, this function will

3
include/cantera/thermo/StoichSubstanceSSTP.h
View file

@ -191,9 +191,6 @@ public:
*/
StoichSubstanceSSTP& operator=(const StoichSubstanceSSTP& right);
//! Destructor
virtual ~StoichSubstanceSSTP();
//! Duplication function
/*!
* This virtual function is used to create a duplicate of the

3
include/cantera/thermo/SurfPhase.h
View file

@ -187,9 +187,6 @@ public:
*/
SurfPhase& operator=(const SurfPhase& right);
//! Destructor.
virtual ~SurfPhase();
//! Duplicator from the %ThermoPhase parent class
/*
* Given a pointer to a %ThermoPhase object, this function will

10
include/cantera/thermo/ThermoFactory.h
View file

@ -47,8 +47,6 @@ public:
CanteraError(proc, "Specified ThermoPhase model "
+ thermoModel +
" does not match any known type.") {}
//! destructor
virtual ~UnknownThermoPhaseModel() throw() {}
};
@ -80,14 +78,6 @@ public:
}
}
//! Destructor doesn't do anything.
/*!
* We do not delete statically created single instance of this
* class here, because it would create an infinite loop if
* destructor is called for that single instance.
*/
virtual ~ThermoFactory() { }
//! Create a new thermodynamic property manager.
/*!
* @param model String to look up the model against

3
include/cantera/thermo/VPSSMgr_ConstVol.h
View file

@ -47,9 +47,6 @@ public:
*/
VPSSMgr_ConstVol(VPStandardStateTP* vp_ptr, SpeciesThermo* spth);
//! Destructor
virtual ~VPSSMgr_ConstVol();
//! Copy Constructor
VPSSMgr_ConstVol(const VPSSMgr_ConstVol& right);

3
include/cantera/thermo/VPSSMgr_General.h
View file

@ -50,9 +50,6 @@ public:
VPSSMgr_General(VPStandardStateTP* vp_ptr,
SpeciesThermo* spth);
//! Destructor
virtual ~VPSSMgr_General();
//! Copy Constructor
VPSSMgr_General(const VPSSMgr_General& right);

3
include/cantera/thermo/VPSSMgr_IdealGas.h
View file

@ -38,9 +38,6 @@ public:
*/
VPSSMgr_IdealGas(VPStandardStateTP* vp_ptr, SpeciesThermo* spth);
//! Destructor
virtual ~VPSSMgr_IdealGas();
//! Copy Constructor
VPSSMgr_IdealGas(const VPSSMgr_IdealGas& right);

3
include/cantera/thermo/VPSSMgr_Water_ConstVol.h
View file

@ -42,9 +42,6 @@ public:
*/
VPSSMgr_Water_ConstVol(VPStandardStateTP* vp_ptr, SpeciesThermo* sp_ptr);
//! Destructor
virtual ~VPSSMgr_Water_ConstVol();
//! Copy Constructor
VPSSMgr_Water_ConstVol(const VPSSMgr_Water_ConstVol& right);

3
include/cantera/thermo/VPSSMgr_Water_HKFT.h
View file

@ -43,9 +43,6 @@ public:
VPSSMgr_Water_HKFT(VPStandardStateTP* vptp_ptr,
SpeciesThermo* spth);
//! Destructor
virtual ~VPSSMgr_Water_HKFT();
//! Copy Constructor
VPSSMgr_Water_HKFT(const VPSSMgr_Water_HKFT& right);

3
include/cantera/transport/AqueousTransport.h
View file

@ -127,9 +127,6 @@ public:
//! default constructor
AqueousTransport();
//! virtual destructor
virtual ~AqueousTransport() {}
//! Return the model id for this transport parameterization
virtual int model() const {
return cAqueousTransport;

1
include/cantera/transport/GasTransport.h
View file

@ -15,7 +15,6 @@ namespace Cantera
class GasTransport : public Transport
{
public:
virtual ~GasTransport() {}
GasTransport(const GasTransport& right);
GasTransport& operator=(const GasTransport& right);

12
include/cantera/transport/LTPspecies.h
View file

@ -242,9 +242,6 @@ public:
*/
LTPspecies_Const& operator=(const LTPspecies_Const& right);
//! Destructor
virtual ~LTPspecies_Const();
//! duplication routine
/*!
* @return Returns a copy of this routine as a pointer to LTPspecies
@ -327,9 +324,6 @@ public:
*/
LTPspecies_Arrhenius& operator=(const LTPspecies_Arrhenius& right);
//! Destructor
virtual ~LTPspecies_Arrhenius();
//! duplication routine
/*!
* @return Returns a copy of this routine as a pointer to LTPspecies
@ -434,9 +428,6 @@ public:
*/
LTPspecies_Poly& operator=(const LTPspecies_Poly& right);
//! Destructor
virtual ~LTPspecies_Poly();
//! Duplication routine
/*!
* @return Returns a copy of this routine as a pointer to LTPspecies
@ -524,9 +515,6 @@ public:
*/
LTPspecies_ExpT& operator=(const LTPspecies_ExpT& right);
//! Destructor
virtual ~LTPspecies_ExpT();
//! Duplication routine
/*!
* @return Returns a copy of this routine as a pointer to LTPspecies

16
include/cantera/transport/LiquidTranInteraction.h
View file

@ -201,8 +201,6 @@ public:
//! Assignment operator
// LTI_Solvent& operator=( const LTI_Solvent &right );
virtual ~LTI_Solvent() { }
//! Return the mixture transport property value.
/**
* Takes the separate species transport properties
@ -249,8 +247,6 @@ public:
//! Assignment operator
// LTI_MoleFracs& operator=( const LTI_MoleFracs &right );
virtual ~LTI_MoleFracs() { }
//! Return the mixture transport property value.
/**
* Takes the separate species transport properties
@ -302,8 +298,6 @@ public:
//! Assignment operator
// LTI_MassFracs& operator=( const LTI_MassFracs &right );
virtual ~LTI_MassFracs() { }
//! Return the mixture transport property value.
/**
* Takes the separate species transport properties
@ -383,8 +377,6 @@ public:
//! Assignment operator
// LTI_Log_MoleFracs& operator=( const LTI_Log_MoleFracs &right );
virtual ~LTI_Log_MoleFracs() { }
//! Return the mixture transport property value.
/**
* Takes the separate species transport properties
@ -447,8 +439,6 @@ public:
//! Assignment operator
// LTI_Pairwise_Interaction& operator=( const LTI_Pairwise_Interaction &right );
virtual ~LTI_Pairwise_Interaction() { }
void setParameters(LiquidTransportParams& trParam) ;
//! Return the mixture transport property value.
@ -558,8 +548,6 @@ public:
//! Assignment operator
// LTI_StefanMaxwell_PPN& operator=( const LTI_StefanMaxwell_PPN &right );
virtual ~LTI_StefanMaxwell_PPN() { }
void setParameters(LiquidTransportParams& trParam) ;
//! Return the mixture transport property value.
@ -610,8 +598,6 @@ public:
//! Assignment operator
// LTI_StokesEinstein& operator=( const LTI_StokesEinstein &right );
virtual ~LTI_StokesEinstein() { }
void setParameters(LiquidTransportParams& trParam);
//! Return the mixture transport property value.
@ -661,8 +647,6 @@ public:
//! Assignment operator
// LTI_MoleFracs_ExpT& operator=( const LTI_MoleFracs_ExpT &right );
virtual ~LTI_MoleFracs_ExpT() { }
//! Return the mixture transport property value.
/**
* Takes the separate species transport properties

3
include/cantera/transport/MixTransport.h
View file

@ -101,9 +101,6 @@ public:
*/
virtual Transport* duplMyselfAsTransport() const;
//! Destructor
virtual ~MixTransport() {}
//! Return the model id for transport
/*!
* @return cMixtureAverage

4
include/cantera/transport/MultiTransport.h
View file

@ -45,10 +45,6 @@ protected:
MultiTransport(thermo_t* thermo=0);
public:
//! Destructor
virtual ~MultiTransport() {}
// overloaded base class methods
virtual int model() const {
if (m_mode == CK_Mode) {

3
include/cantera/transport/PecosTransport.h
View file

@ -44,9 +44,6 @@ class PecosTransport : public Transport
{
public:
virtual ~PecosTransport() {}
virtual int model() const {
return cPecosTransport;
}

3
include/cantera/transport/SolidTransport.h
View file

@ -39,9 +39,6 @@ public:
*/
SolidTransport(const SolidTransport& right);
//! Destructor
virtual ~SolidTransport();
//! Assignment operator
/*!
* This is NOT a virtual function.

9
include/cantera/transport/TransportFactory.h
View file

@ -69,15 +69,6 @@ public:
//! Deletes the statically malloced instance.
virtual void deleteFactory();
/*!
* Destructor
*
* We do not delete statically created single instance of this
* class here, because it would create an infinite loop if
* destructor is called for that single instance.
*/
virtual ~TransportFactory() {}
//! Get the name of the transport model corresponding to the specified constant.
/*!
* @param model Integer representing the model name

3
include/cantera/transport/TransportParams.h
View file

@ -98,9 +98,6 @@ public:
//! Constructor
GasTransportParams();
//! Destructor
virtual ~GasTransportParams();
// polynomial fits
//! temperature-fit of the viscosity

3
include/cantera/transport/WaterTransport.h
View file

@ -81,9 +81,6 @@ public:
*/
virtual Transport* duplMyselfAsTransport() const;
//! virtual destructor
virtual ~WaterTransport();
//! Return the model id for this transport parameterization
virtual int model() const {
return cWaterTransport;

6
include/cantera/zeroD/ConstPressureReactor.h
View file

@ -32,12 +32,6 @@ public:
*/
ConstPressureReactor();
/**
* Destructor. Deletes the integrator.
*/
virtual ~ConstPressureReactor() {}
virtual int type() const {
return ConstPressureReactorType;
}

5
include/cantera/zeroD/FlowReactor.h
View file

@ -25,11 +25,6 @@ public:
*/
FlowReactor();
/**
* Destructor.
*/
virtual ~FlowReactor() {}
virtual int type() const {
return FlowReactorType;
}

5
include/cantera/zeroD/Reactor.h
View file

@ -54,11 +54,6 @@ public:
//! Default constructor.
Reactor();
/**
* Destructor. Deletes the integrator.
*/
virtual ~Reactor() {}
virtual int type() const {
return ReactorType;
}

5
include/cantera/zeroD/ReactorFactory.h
View file

@ -35,11 +35,6 @@ public:
}
}
/**
* Destructor doesn't do anything.
*/
virtual ~ReactorFactory() {}
/**
* Create a new reactor.
* @param n the type to be created.

1
include/cantera/zeroD/Reservoir.h
View file

@ -18,7 +18,6 @@ class Reservoir : public ReactorBase
public:
Reservoir() {}
virtual ~Reservoir() {}
virtual int type() const {
return ReservoirType;
}

6
include/cantera/zeroD/flowControllers.h
View file

@ -27,8 +27,6 @@ public:
m_type = MFC_Type;
}
virtual ~MassFlowController() {}
virtual bool ready() {
return FlowDevice::ready() && m_mdot >= 0.0;
}
@ -63,8 +61,6 @@ public:
m_type = PressureController_Type;
}
virtual ~PressureController() {}
virtual bool ready() {
return FlowDevice::ready() && m_master != 0;
}
@ -102,8 +98,6 @@ public:
m_type = Valve_Type;
}
virtual ~Valve() {}
virtual bool ready() {
return FlowDevice::ready() && m_coeffs.size() >= 1;
}

6
src/base/xml.cpp
View file

@ -76,9 +76,6 @@ public:
m_msg += "<" + opentag + "> paired with </" + closetag + ">.\n";
setError("XML_TagMismatch", m_msg);
}
//! Destructor
virtual ~XML_TagMismatch() throw() {}
};
//! Class representing a specific type of XML file formatting error
@ -109,9 +106,6 @@ public:
m_msg += ss.str() + "\n";
setError("XML_NoChild", m_msg);
}
//! Destructor
virtual ~XML_NoChild() throw() {}
};
//////////////////// XML_Reader methods ///////////////////////

4
src/kinetics/AqueousKinetics.cpp
View file

@ -48,10 +48,6 @@ AqueousKinetics::AqueousKinetics(const AqueousKinetics& right) :
*this = right;
}
AqueousKinetics::~AqueousKinetics()
{
}
AqueousKinetics& AqueousKinetics::operator=(const AqueousKinetics& right)
{
if (this == &right) {

15
src/kinetics/FalloffFactory.cpp
View file

@ -51,9 +51,6 @@ public:
//! Default constructor.
Troe3() : m_a(0.0), m_rt3(0.0), m_rt1(0.0) {}
//! Destructor.
virtual ~Troe3() {}
/**
* Initialize.
* @param c Coefficient vector of length 3,
@ -163,9 +160,6 @@ public:
Troe4() : m_a(0.0), m_rt3(0.0), m_rt1(0.0),
m_t2(0.0) {}
//! Destructor
virtual ~Troe4() {}
//! Initialization of the object
/*!
* @param c Vector of four doubles: The doubles are the parameters,
@ -266,9 +260,6 @@ public:
//! Constructor
SRI3() {}
//! Destructor
virtual ~SRI3() {}
//! Initialization of the object
/*!
* @param c Vector of three doubles: The doubles are the parameters,
@ -354,9 +345,6 @@ public:
//! Constructor
SRI5() {}
//! Destructor
virtual ~SRI5() {}
//! Initialization of the object
/*!
* @param c Vector of five doubles: The doubles are the parameters,
@ -453,9 +441,6 @@ public:
//! Default constructor
WF93() {}
//! Destructor
virtual ~WF93() {}
//! Initialization routine
/*!
* @param c Vector of 10 doubles with the following ordering: a, T_1,

4
src/kinetics/GasKinetics.cpp
View file

@ -53,10 +53,6 @@ GasKinetics::GasKinetics(const GasKinetics& right) :
*this = right;
}
GasKinetics::~GasKinetics()
{
}
GasKinetics& GasKinetics::operator=(const GasKinetics& right)
{
if (this == &right) {

5
src/numerics/BandMatrix.cpp
View file

@ -74,11 +74,6 @@ BandMatrix::BandMatrix(const BandMatrix& y) :
for (size_t j = 0; j < m_n; j++) {
m_colPtrs[j] = &(data[ldab * j]);
}
}
//====================================================================================================================
BandMatrix::~BandMatrix()
{
}
//====================================================================================================================
BandMatrix& BandMatrix::operator=(const BandMatrix& y)

5
src/numerics/DenseMatrix.cpp
View file

@ -78,11 +78,6 @@ DenseMatrix& DenseMatrix::operator=(const DenseMatrix& y)
return *this;
}
//====================================================================================================================
// Destructor. Does nothing.
DenseMatrix::~DenseMatrix()
{
}
//====================================================================================================================
void DenseMatrix::resize(size_t n, size_t m, doublereal v)
{
Array2D::resize(n,m,v);

4
src/numerics/ResidJacEval.cpp
View file

@ -37,10 +37,6 @@ ResidJacEval::ResidJacEval(const ResidJacEval& right) :
*this = operator=(right);
}
//====================================================================================================================
ResidJacEval::~ResidJacEval()
{
}
//====================================================================================================================
ResidJacEval& ResidJacEval::operator=(const ResidJacEval& right)
{
if (this == &right) {

4
src/numerics/SquareMatrix.cpp
View file

@ -83,10 +83,6 @@ SquareMatrix& SquareMatrix::operator=(const SquareMatrix& y)
return *this;
}
//====================================================================================================================
SquareMatrix::~SquareMatrix()
{
}
//====================================================================================================================
/*
* Solve Ax = b. Vector b is overwritten on exit with x.
*/

2
src/thermo/ConstCpPoly.cpp
View file

@ -68,8 +68,6 @@ ConstCpPoly& ConstCpPoly::operator=(const ConstCpPoly& b)
return *this;
}
ConstCpPoly::~ConstCpPoly() {}
SpeciesThermoInterpType*
ConstCpPoly::duplMyselfAsSpeciesThermoInterpType() const
{

3
src/thermo/ConstCpPoly.h
View file

@ -74,9 +74,6 @@ public:
//! Assignment operator
ConstCpPoly& operator=(const ConstCpPoly&);
//! Destructor
virtual ~ConstCpPoly();
virtual SpeciesThermoInterpType*
duplMyselfAsSpeciesThermoInterpType() const;

4
src/thermo/FixedChemPotSSTP.cpp
View file

@ -145,10 +145,6 @@ FixedChemPotSSTP::operator=(const FixedChemPotSSTP& right)
return *this;
}
FixedChemPotSSTP::~FixedChemPotSSTP()
{
}
ThermoPhase* FixedChemPotSSTP::duplMyselfAsThermoPhase() const
{
return new FixedChemPotSSTP(*this);

4
src/thermo/GibbsExcessVPSSTP.cpp
View file

@ -74,10 +74,6 @@ operator=(const GibbsExcessVPSSTP& b)
return *this;
}
GibbsExcessVPSSTP::~GibbsExcessVPSSTP()
{
}
ThermoPhase*
GibbsExcessVPSSTP::duplMyselfAsThermoPhase() const
{

4
src/thermo/IdealGasPhase.cpp
View file

@ -38,10 +38,6 @@ IdealGasPhase::IdealGasPhase(XML_Node& phaseRef, const std::string& id_) :
initThermoXML(phaseRef, id_);
}
IdealGasPhase::~IdealGasPhase()
{
}
IdealGasPhase::IdealGasPhase(const IdealGasPhase& right) :
m_p0(right.m_p0),
m_tlast(right.m_tlast),

4
src/thermo/IdealMolalSoln.cpp
View file

@ -133,10 +133,6 @@ IdealMolalSoln::IdealMolalSoln(XML_Node& root, const std::string& id_) :
importPhase(*findXMLPhase(&root, id_), this);
}
IdealMolalSoln::~IdealMolalSoln()
{
}
ThermoPhase* IdealMolalSoln::duplMyselfAsThermoPhase() const
{
return new IdealMolalSoln(*this);

4
src/thermo/IdealSolnGasVPSS.cpp
View file

@ -74,10 +74,6 @@ operator=(const IdealSolnGasVPSS& b)
return *this;
}
IdealSolnGasVPSS::~IdealSolnGasVPSS()
{
}
ThermoPhase* IdealSolnGasVPSS::duplMyselfAsThermoPhase() const
{
return new IdealSolnGasVPSS(*this);

4
src/thermo/LatticePhase.cpp
View file

@ -58,10 +58,6 @@ LatticePhase& LatticePhase::operator=(const LatticePhase& right)
return *this;
}
LatticePhase::~LatticePhase()
{
}
LatticePhase::LatticePhase(const std::string& inputFile, const std::string& id_)
{
initThermoFile(inputFile, id_);

Some files were not shown because too many files have changed in this diff Show more