diff --git a/include/cantera/thermo/MetalPhase.h b/include/cantera/thermo/MetalPhase.h index d743a8e84..c423ec872 100644 --- a/include/cantera/thermo/MetalPhase.h +++ b/include/cantera/thermo/MetalPhase.h @@ -28,7 +28,7 @@ public: MetalPhase() {} MetalPhase(const MetalPhase& right) { - *this = operator=(right); + *this = right; } MetalPhase& operator=(const MetalPhase& right) { diff --git a/include/cantera/thermo/SemiconductorPhase.h b/include/cantera/thermo/SemiconductorPhase.h index 1ab4021a0..467d491d8 100644 --- a/include/cantera/thermo/SemiconductorPhase.h +++ b/include/cantera/thermo/SemiconductorPhase.h @@ -33,7 +33,7 @@ public: SemiconductorPhase(std::string infile, std::string id=""); SemiconductorPhase(const SemiconductorPhase& right) { - *this = operator=(right); + *this = right; } SemiconductorPhase& operator=(const SemiconductorPhase& right) { diff --git a/include/cantera/thermo/SimpleThermo.h b/include/cantera/thermo/SimpleThermo.h index 92fd700f5..0d8b07612 100644 --- a/include/cantera/thermo/SimpleThermo.h +++ b/include/cantera/thermo/SimpleThermo.h @@ -72,7 +72,7 @@ public: /* * Call the assignment operator */ - *this = operator=(right); + *this = right; } //! Assignment operator diff --git a/include/cantera/thermo/SpeciesThermoMgr.h b/include/cantera/thermo/SpeciesThermoMgr.h index d026dbf9a..4780e10fd 100644 --- a/include/cantera/thermo/SpeciesThermoMgr.h +++ b/include/cantera/thermo/SpeciesThermoMgr.h @@ -63,7 +63,7 @@ public: * @param right Object to be copied */ SpeciesThermoDuo(const SpeciesThermoDuo& right) { - *this = operator=(right); + *this = right; } //! Assignment operator diff --git a/src/numerics/ResidJacEval.cpp b/src/numerics/ResidJacEval.cpp index 58d59648c..6557bed34 100644 --- a/src/numerics/ResidJacEval.cpp +++ b/src/numerics/ResidJacEval.cpp @@ -25,7 +25,7 @@ ResidJacEval::ResidJacEval(doublereal atol) : ResidJacEval::ResidJacEval(const ResidJacEval& right) : ResidEval() { - *this = operator=(right); + *this = right; } ResidJacEval& ResidJacEval::operator=(const ResidJacEval& right) diff --git a/src/thermo/ConstDensityThermo.cpp b/src/thermo/ConstDensityThermo.cpp index dba0dadde..5a7093e1b 100644 --- a/src/thermo/ConstDensityThermo.cpp +++ b/src/thermo/ConstDensityThermo.cpp @@ -22,7 +22,7 @@ ConstDensityThermo::ConstDensityThermo() ConstDensityThermo::ConstDensityThermo(const ConstDensityThermo& right) { - *this = operator=(right); + *this = right; } ConstDensityThermo& ConstDensityThermo::operator=(const ConstDensityThermo& right) diff --git a/src/thermo/Elements.cpp b/src/thermo/Elements.cpp index dd85acd3c..b099e5ee9 100644 --- a/src/thermo/Elements.cpp +++ b/src/thermo/Elements.cpp @@ -233,7 +233,7 @@ Elements::Elements(const Elements& right) : m_elementsFrozen(false), numSubscribers(0) { - *this = operator=(right); + *this = right; } Elements& Elements::operator=(const Elements& right) diff --git a/src/thermo/FixedChemPotSSTP.cpp b/src/thermo/FixedChemPotSSTP.cpp index 2c749e282..48d042c64 100644 --- a/src/thermo/FixedChemPotSSTP.cpp +++ b/src/thermo/FixedChemPotSSTP.cpp @@ -126,7 +126,7 @@ FixedChemPotSSTP::FixedChemPotSSTP(const std::string& Ename, doublereal val) : FixedChemPotSSTP::FixedChemPotSSTP(const FixedChemPotSSTP& right) : SingleSpeciesTP() { - *this = operator=(right); + *this = right; } FixedChemPotSSTP& diff --git a/src/thermo/LatticePhase.cpp b/src/thermo/LatticePhase.cpp index c92ad0781..d753e47c9 100644 --- a/src/thermo/LatticePhase.cpp +++ b/src/thermo/LatticePhase.cpp @@ -30,7 +30,7 @@ LatticePhase::LatticePhase(const LatticePhase& right) : m_speciesMolarVolume(0), m_site_density(0.0) { - *this = operator=(right); + *this = right; } LatticePhase& LatticePhase::operator=(const LatticePhase& right) diff --git a/src/thermo/LatticeSolidPhase.cpp b/src/thermo/LatticeSolidPhase.cpp index 5bc5d8c1f..e2b215728 100644 --- a/src/thermo/LatticeSolidPhase.cpp +++ b/src/thermo/LatticeSolidPhase.cpp @@ -37,7 +37,7 @@ LatticeSolidPhase::LatticeSolidPhase(const LatticeSolidPhase& right) : theta_(0), tmpV_(0) { - *this = operator=(right); + *this = right; } LatticeSolidPhase& diff --git a/src/thermo/MineralEQ3.cpp b/src/thermo/MineralEQ3.cpp index 863652a09..94f676ec8 100644 --- a/src/thermo/MineralEQ3.cpp +++ b/src/thermo/MineralEQ3.cpp @@ -75,7 +75,7 @@ MineralEQ3::MineralEQ3(XML_Node& xmlphase, const std::string& id_) : MineralEQ3::MineralEQ3(const MineralEQ3& right) : StoichSubstanceSSTP() { - *this = operator=(right); + *this = right; } MineralEQ3& diff --git a/src/thermo/MolalityVPSSTP.cpp b/src/thermo/MolalityVPSSTP.cpp index c76299649..06b98e0c9 100644 --- a/src/thermo/MolalityVPSSTP.cpp +++ b/src/thermo/MolalityVPSSTP.cpp @@ -53,7 +53,7 @@ MolalityVPSSTP::MolalityVPSSTP(const MolalityVPSSTP& b) : m_Mnaught(b.m_Mnaught), m_molalities(b.m_molalities) { - *this = operator=(b); + *this = b; } MolalityVPSSTP& MolalityVPSSTP::operator=(const MolalityVPSSTP& b) diff --git a/src/thermo/MolarityIonicVPSSTP.cpp b/src/thermo/MolarityIonicVPSSTP.cpp index e77cc1615..c42ca8581 100644 --- a/src/thermo/MolarityIonicVPSSTP.cpp +++ b/src/thermo/MolarityIonicVPSSTP.cpp @@ -77,7 +77,7 @@ MolarityIonicVPSSTP::MolarityIonicVPSSTP(const MolarityIonicVPSSTP& b) : numPassThroughSpecies_(0), neutralPBindexStart(0) { - *this = operator=(b); + *this = b; } MolarityIonicVPSSTP& MolarityIonicVPSSTP::operator=(const MolarityIonicVPSSTP& b) diff --git a/src/thermo/NasaThermo.cpp b/src/thermo/NasaThermo.cpp index 61282cd9f..740b0066a 100644 --- a/src/thermo/NasaThermo.cpp +++ b/src/thermo/NasaThermo.cpp @@ -24,7 +24,7 @@ NasaThermo::NasaThermo(const NasaThermo& right) : m_thigh_min(1.e30), m_p0(-1.0), m_ngroups(0) { - *this = operator=(right); + *this = right; } NasaThermo& NasaThermo::operator=(const NasaThermo& right) diff --git a/src/thermo/PseudoBinaryVPSSTP.cpp b/src/thermo/PseudoBinaryVPSSTP.cpp index b07023206..7346a6b25 100644 --- a/src/thermo/PseudoBinaryVPSSTP.cpp +++ b/src/thermo/PseudoBinaryVPSSTP.cpp @@ -51,7 +51,7 @@ PseudoBinaryVPSSTP::PseudoBinaryVPSSTP(const PseudoBinaryVPSSTP& b) : cationPhase_(0), anionPhase_(0) { - *this = operator=(b); + *this = b; } PseudoBinaryVPSSTP& PseudoBinaryVPSSTP::operator=(const PseudoBinaryVPSSTP& b) diff --git a/src/thermo/ShomateThermo.h b/src/thermo/ShomateThermo.h index 9ba1bbd6d..2723ad57f 100644 --- a/src/thermo/ShomateThermo.h +++ b/src/thermo/ShomateThermo.h @@ -85,7 +85,7 @@ public: m_thigh_min(1.e30), m_p0(-1.0), m_ngroups(0) { - *this = operator=(right); + *this = right; } //! Assignment Operator diff --git a/src/thermo/SingleSpeciesTP.cpp b/src/thermo/SingleSpeciesTP.cpp index fc4aa669b..d373a1301 100644 --- a/src/thermo/SingleSpeciesTP.cpp +++ b/src/thermo/SingleSpeciesTP.cpp @@ -30,7 +30,7 @@ SingleSpeciesTP::SingleSpeciesTP(const SingleSpeciesTP& right): m_press(OneAtm), m_p0(OneAtm) { - *this = operator=(right); + *this = right; } SingleSpeciesTP& SingleSpeciesTP::operator=(const SingleSpeciesTP& right) diff --git a/src/thermo/StoichSubstance.cpp b/src/thermo/StoichSubstance.cpp index 3bf970d1c..24393d5eb 100644 --- a/src/thermo/StoichSubstance.cpp +++ b/src/thermo/StoichSubstance.cpp @@ -21,7 +21,7 @@ StoichSubstance::StoichSubstance(const StoichSubstance& right) : m_press(OneAtm), m_p0(OneAtm) { - *this = operator=(right); + *this = right; } StoichSubstance& StoichSubstance::operator=(const StoichSubstance& right) diff --git a/src/thermo/StoichSubstanceSSTP.cpp b/src/thermo/StoichSubstanceSSTP.cpp index 0556a8c43..d152e679c 100644 --- a/src/thermo/StoichSubstanceSSTP.cpp +++ b/src/thermo/StoichSubstanceSSTP.cpp @@ -73,7 +73,7 @@ StoichSubstanceSSTP::StoichSubstanceSSTP(XML_Node& xmlphase, const std::string& StoichSubstanceSSTP::StoichSubstanceSSTP(const StoichSubstanceSSTP& right) : SingleSpeciesTP() { - *this = operator=(right); + *this = right; } StoichSubstanceSSTP& @@ -324,7 +324,7 @@ electrodeElectron::electrodeElectron(XML_Node& xmlphase, const std::string& id_) electrodeElectron::electrodeElectron(const electrodeElectron& right) : StoichSubstanceSSTP() { - *this = operator=(right); + *this = right; } electrodeElectron& diff --git a/src/thermo/SurfPhase.cpp b/src/thermo/SurfPhase.cpp index 2b0109fc8..34ae49984 100644 --- a/src/thermo/SurfPhase.cpp +++ b/src/thermo/SurfPhase.cpp @@ -415,7 +415,7 @@ EdgePhase::EdgePhase(const EdgePhase& right) : SurfPhase(right.m_n0) { setNDim(1); - *this = operator=(right); + *this = right; } EdgePhase& EdgePhase::operator=(const EdgePhase& right) diff --git a/src/thermo/ThermoPhase.cpp b/src/thermo/ThermoPhase.cpp index 4f318f72e..ca65349a6 100644 --- a/src/thermo/ThermoPhase.cpp +++ b/src/thermo/ThermoPhase.cpp @@ -51,7 +51,7 @@ ThermoPhase::ThermoPhase(const ThermoPhase& right) : /* * Call the assignment operator */ - *this = operator=(right); + *this = right; } ThermoPhase& ThermoPhase::operator=(const ThermoPhase& right)