From 187fd27cefcde0a1369baf64647a638f8905f5d1 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 27 Jul 2015 17:56:57 -0400 Subject: [PATCH] Remove unnecessary use of (void) --- include/cantera/equil/vcs_solve.h | 4 ++-- src/base/xml.cpp | 4 ++-- src/equil/vcs_TP.cpp | 2 +- src/equil/vcs_VolPhase.cpp | 2 +- src/equil/vcs_inest.cpp | 2 +- src/equil/vcs_nondim.cpp | 2 +- src/thermo/HMWSoln.cpp | 2 +- src/thermo/ThermoPhase.cpp | 2 +- src/transport/GasTransport.cpp | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/cantera/equil/vcs_solve.h b/include/cantera/equil/vcs_solve.h index c450a8588..56af4607f 100644 --- a/include/cantera/equil/vcs_solve.h +++ b/include/cantera/equil/vcs_solve.h @@ -863,7 +863,7 @@ public: * * NOTE: currently this routine is not used. */ - int vcs_rxn_adj_cg(void); + int vcs_rxn_adj_cg(); //! Calculates the diagonal contribution to the Hessian due to //! the dependence of the activity coefficients on the mole numbers. @@ -1359,7 +1359,7 @@ private: double* const ss, double test); //! Calculate the status of single species phases. - void vcs_SSPhase(void); + void vcs_SSPhase(); //! This function recalculates the deltaG for reaction, irxn /*! diff --git a/src/base/xml.cpp b/src/base/xml.cpp index 28f9668f6..092e35f55 100644 --- a/src/base/xml.cpp +++ b/src/base/xml.cpp @@ -857,7 +857,7 @@ void XML_Node::copyUnion(XML_Node* const node_dest) const } } if (!dc) { - (void) node_dest->addChild(sc->name()); + node_dest->addChild(sc->name()); dc = vsc[ndc]; } sc->copyUnion(dc); @@ -883,7 +883,7 @@ void XML_Node::copy(XML_Node* const node_dest) const sc = m_children[n]; size_t ndc = node_dest->nChildren(); // Here is where we do a malloc of the child node. - (void) node_dest->addChild(sc->name()); + node_dest->addChild(sc->name()); dc = vsc[ndc]; sc->copy(dc); } diff --git a/src/equil/vcs_TP.cpp b/src/equil/vcs_TP.cpp index 9ec9ac981..0bf247fa9 100644 --- a/src/equil/vcs_TP.cpp +++ b/src/equil/vcs_TP.cpp @@ -82,7 +82,7 @@ int VCS_SOLVE::vcs_evalSS_TP(int ipr, int ip1, double Temp, double pres) return VCS_SUCCESS; } -void VCS_SOLVE::vcs_fePrep_TP(void) +void VCS_SOLVE::vcs_fePrep_TP() { for (size_t i = 0; i < m_numSpeciesTot; ++i) { /* diff --git a/src/equil/vcs_VolPhase.cpp b/src/equil/vcs_VolPhase.cpp index 6a227a88f..ff5abcae9 100644 --- a/src/equil/vcs_VolPhase.cpp +++ b/src/equil/vcs_VolPhase.cpp @@ -563,7 +563,7 @@ void vcs_VolPhase::sendToVCS_ActCoeff(const int vcsStateStatus, double vcs_VolPhase::sendToVCS_VolPM(double* const VolPM) const { if (!m_UpToDate_VolPM) { - (void) _updateVolPM(); + _updateVolPM(); } for (size_t k = 0; k < m_numSpecies; k++) { size_t kglob = IndSpecies[k]; diff --git a/src/equil/vcs_inest.cpp b/src/equil/vcs_inest.cpp index d2b756a07..ce52dbdbc 100644 --- a/src/equil/vcs_inest.cpp +++ b/src/equil/vcs_inest.cpp @@ -85,7 +85,7 @@ void VCS_SOLVE::vcs_inest(double* const aw, double* const sa, double* const sm, * coefficient matrix */ bool conv; - (void) vcs_basopt(false, aw, sa, sm, ss, test, &conv); + vcs_basopt(false, aw, sa, sm, ss, test, &conv); /* ***************************************************************** */ /* **** CALCULATE TOTAL MOLES, ****************** */ diff --git a/src/equil/vcs_nondim.cpp b/src/equil/vcs_nondim.cpp index 6804b23bc..79e24c692 100644 --- a/src/equil/vcs_nondim.cpp +++ b/src/equil/vcs_nondim.cpp @@ -142,7 +142,7 @@ void VCS_SOLVE::vcs_nondim_TP() } } -void VCS_SOLVE::vcs_redim_TP(void) +void VCS_SOLVE::vcs_redim_TP() { if (m_unitsState != VCS_DIMENSIONAL_G) { m_unitsState = VCS_DIMENSIONAL_G; diff --git a/src/thermo/HMWSoln.cpp b/src/thermo/HMWSoln.cpp index e9d5c1910..1d295ffb5 100644 --- a/src/thermo/HMWSoln.cpp +++ b/src/thermo/HMWSoln.cpp @@ -1352,7 +1352,7 @@ void HMWSoln::calcMolalitiesCropped() const } -void HMWSoln::counterIJ_setup(void) const +void HMWSoln::counterIJ_setup() const { m_CounterIJ.resize(m_kk * m_kk); int counter = 0; diff --git a/src/thermo/ThermoPhase.cpp b/src/thermo/ThermoPhase.cpp index ae29d5c99..647f345cc 100644 --- a/src/thermo/ThermoPhase.cpp +++ b/src/thermo/ThermoPhase.cpp @@ -76,7 +76,7 @@ ThermoPhase& ThermoPhase::operator=(const ThermoPhase& right) /* * Call the base class assignment operator */ - (void)Phase::operator=(right); + Phase::operator=(right); /* * Pointer to the species thermodynamic property manager diff --git a/src/transport/GasTransport.cpp b/src/transport/GasTransport.cpp index 74f4e9bf9..e7136a63e 100644 --- a/src/transport/GasTransport.cpp +++ b/src/transport/GasTransport.cpp @@ -99,7 +99,7 @@ GasTransport& GasTransport::operator=(const GasTransport& right) return *this; } -void GasTransport::update_T(void) +void GasTransport::update_T() { double T = m_thermo->temperature(); if (T == m_temp) {