diff --git a/include/cantera/base/AnyMap.h b/include/cantera/base/AnyMap.h index f9f46a3293..204a159214 100644 --- a/include/cantera/base/AnyMap.h +++ b/include/cantera/base/AnyMap.h @@ -11,8 +11,6 @@ #include "cantera/base/Units.h" #include -#include -#include #include namespace boost diff --git a/include/cantera/base/AnyMap.inl.h b/include/cantera/base/AnyMap.inl.h index 014b52c148..14f845598f 100644 --- a/include/cantera/base/AnyMap.inl.h +++ b/include/cantera/base/AnyMap.inl.h @@ -179,7 +179,6 @@ template bool AnyValue::eq_comparer(const boost::any& lhs, const boost::any& rhs) { using boost::any_cast; - using std::vector; typedef vector vd; typedef vector vi; typedef vector va; diff --git a/include/cantera/base/ExtensionManager.h b/include/cantera/base/ExtensionManager.h index 4d9b34b2a6..2fd262425b 100644 --- a/include/cantera/base/ExtensionManager.h +++ b/include/cantera/base/ExtensionManager.h @@ -7,7 +7,6 @@ // at https://cantera.org/license.txt for license and copyright information. #include "cantera/base/ctexceptions.h" -#include namespace Cantera { diff --git a/include/cantera/base/FactoryBase.h b/include/cantera/base/FactoryBase.h index 99c15c6844..b504158c2e 100644 --- a/include/cantera/base/FactoryBase.h +++ b/include/cantera/base/FactoryBase.h @@ -11,7 +11,6 @@ #include #include -#include #include "cantera/base/ctexceptions.h" #include "cantera/base/global.h" diff --git a/include/cantera/base/NoExitLogger.h b/include/cantera/base/NoExitLogger.h index 086d93768e..1eb703e6e1 100644 --- a/include/cantera/base/NoExitLogger.h +++ b/include/cantera/base/NoExitLogger.h @@ -6,7 +6,6 @@ #ifndef NOEXITLOGGER_H #define NOEXITLOGGER_H -#include #include "cantera/base/logger.h" namespace Cantera { diff --git a/include/cantera/base/Storage.h b/include/cantera/base/Storage.h index 8ea9501960..51d6eabe09 100644 --- a/include/cantera/base/Storage.h +++ b/include/cantera/base/Storage.h @@ -8,7 +8,6 @@ #include "cantera/base/ct_defs.h" #include "cantera/base/stringUtils.h" -#include #if CT_USE_HDF5 diff --git a/include/cantera/equil/ChemEquil.h b/include/cantera/equil/ChemEquil.h index b50f3eb0b7..d51e9785e9 100644 --- a/include/cantera/equil/ChemEquil.h +++ b/include/cantera/equil/ChemEquil.h @@ -9,7 +9,6 @@ #define CT_CHEM_EQUIL_H #include "cantera/base/ct_defs.h" -#include namespace Cantera { diff --git a/include/cantera/tpx/Sub.h b/include/cantera/tpx/Sub.h index fd037cf36e..0adccdd38f 100644 --- a/include/cantera/tpx/Sub.h +++ b/include/cantera/tpx/Sub.h @@ -7,7 +7,6 @@ #define TPX_SUB_H #include "cantera/base/ctexceptions.h" -#include namespace tpx { diff --git a/samples/f77/demo_ftnlib.cpp b/samples/f77/demo_ftnlib.cpp index 5b29747a1a..7581ef2a3d 100644 --- a/samples/f77/demo_ftnlib.cpp +++ b/samples/f77/demo_ftnlib.cpp @@ -36,7 +36,6 @@ #include using namespace Cantera; -using std::string; // store a pointer to a Solution object // provides access to the pointers for functions in other libraries diff --git a/src/base/AnyMap.cpp b/src/base/AnyMap.cpp index 188dc42dd2..dcdf40e77c 100644 --- a/src/base/AnyMap.cpp +++ b/src/base/AnyMap.cpp @@ -15,8 +15,6 @@ #include namespace ba = boost::algorithm; -using std::vector; -using std::string; namespace { // helper functions diff --git a/src/base/ExtensionManager.cpp b/src/base/ExtensionManager.cpp index a66f2d3182..35865eb011 100644 --- a/src/base/ExtensionManager.cpp +++ b/src/base/ExtensionManager.cpp @@ -6,8 +6,6 @@ #include "cantera/base/ExtensionManager.h" #include "cantera/base/global.h" -using namespace std; - namespace Cantera { diff --git a/src/base/Interface.cpp b/src/base/Interface.cpp index 6d2104e60e..0b0143d091 100644 --- a/src/base/Interface.cpp +++ b/src/base/Interface.cpp @@ -10,9 +10,6 @@ namespace Cantera { -using std::string; -using std::vector; - void Interface::setThermo(shared_ptr thermo) { Solution::setThermo(thermo); auto surf = std::dynamic_pointer_cast(thermo); diff --git a/src/base/YamlWriter.cpp b/src/base/YamlWriter.cpp index 0f14f175c4..cc5f6c1b7c 100644 --- a/src/base/YamlWriter.cpp +++ b/src/base/YamlWriter.cpp @@ -11,7 +11,6 @@ #include "cantera/kinetics/Reaction.h" #include "cantera/transport/Transport.h" -#include #include #include diff --git a/src/base/application.cpp b/src/base/application.cpp index adf610416e..436de14e8d 100644 --- a/src/base/application.cpp +++ b/src/base/application.cpp @@ -16,8 +16,6 @@ #include #include -using std::string; -using std::endl; namespace ba = boost::algorithm; #ifdef _WIN32 @@ -204,7 +202,7 @@ std::string Application::Messages::lastErrorMessage() void Application::Messages::getErrors(std::ostream& f) { for (size_t j = 0; j < errorMessage.size(); j++) { - f << errorMessage[j] << endl; + f << errorMessage[j] << std::endl; } errorMessage.clear(); } diff --git a/src/base/application.h b/src/base/application.h index 7fa94ae3c5..010bf1ca04 100644 --- a/src/base/application.h +++ b/src/base/application.h @@ -11,7 +11,6 @@ #include -#include #include namespace Cantera diff --git a/src/base/global.cpp b/src/base/global.cpp index 2dbeae2800..621401e46d 100644 --- a/src/base/global.cpp +++ b/src/base/global.cpp @@ -10,8 +10,6 @@ #include #endif -using namespace std; - namespace Cantera { diff --git a/src/clib/ct.cpp b/src/clib/ct.cpp index 8bb42c78eb..b955eda183 100644 --- a/src/clib/ct.cpp +++ b/src/clib/ct.cpp @@ -25,7 +25,6 @@ #include "cantera/thermo/PureFluidPhase.h" #include "cantera/base/ExternalLogger.h" -using namespace std; using namespace Cantera; typedef SharedCabinet ThermoCabinet; diff --git a/src/clib/ctfunc.cpp b/src/clib/ctfunc.cpp index 7f9bf20fa1..2edf9cd561 100644 --- a/src/clib/ctfunc.cpp +++ b/src/clib/ctfunc.cpp @@ -14,7 +14,6 @@ #include "clib_utils.h" using namespace Cantera; -using namespace std; typedef Func1 func_t; diff --git a/src/clib/ctmultiphase.cpp b/src/clib/ctmultiphase.cpp index 5c3b15d3f1..5469096a2e 100644 --- a/src/clib/ctmultiphase.cpp +++ b/src/clib/ctmultiphase.cpp @@ -12,7 +12,6 @@ #include "cantera/thermo/ThermoPhase.h" #include "clib_utils.h" -using namespace std; using namespace Cantera; typedef Cabinet mixCabinet; diff --git a/src/clib/ctreactor.cpp b/src/clib/ctreactor.cpp index 4cd956e5f1..177a6494ff 100644 --- a/src/clib/ctreactor.cpp +++ b/src/clib/ctreactor.cpp @@ -15,7 +15,6 @@ #include "clib_utils.h" using namespace Cantera; -using namespace std; typedef Cabinet ReactorCabinet; typedef Cabinet NetworkCabinet; diff --git a/src/clib/ctsurf.cpp b/src/clib/ctsurf.cpp index f6aee880c0..46d281d82f 100644 --- a/src/clib/ctsurf.cpp +++ b/src/clib/ctsurf.cpp @@ -12,7 +12,6 @@ #include "cantera/thermo/SurfPhase.h" #include "clib_utils.h" -using namespace std; using namespace Cantera; typedef SharedCabinet ThermoCabinet; diff --git a/src/equil/BasisOptimize.cpp b/src/equil/BasisOptimize.cpp index 123765655b..61c99a2a97 100644 --- a/src/equil/BasisOptimize.cpp +++ b/src/equil/BasisOptimize.cpp @@ -10,8 +10,6 @@ #include "cantera/base/utilities.h" #include "cantera/base/global.h" -using namespace std; - namespace Cantera { int BasisOptimize_print_lvl = 0; diff --git a/src/equil/ChemEquil.cpp b/src/equil/ChemEquil.cpp index 64846f3c3e..3397e73a28 100644 --- a/src/equil/ChemEquil.cpp +++ b/src/equil/ChemEquil.cpp @@ -14,8 +14,6 @@ #include "cantera/base/utilities.h" #include "cantera/base/global.h" -using namespace std; - namespace Cantera { diff --git a/src/equil/MultiPhaseEquil.cpp b/src/equil/MultiPhaseEquil.cpp index 6cbf592bc9..2eade9dbef 100644 --- a/src/equil/MultiPhaseEquil.cpp +++ b/src/equil/MultiPhaseEquil.cpp @@ -12,8 +12,6 @@ #include #include -using namespace std; - namespace Cantera { diff --git a/src/equil/vcs_MultiPhaseEquil.cpp b/src/equil/vcs_MultiPhaseEquil.cpp index 525bdc1a3e..aeab1b0e64 100644 --- a/src/equil/vcs_MultiPhaseEquil.cpp +++ b/src/equil/vcs_MultiPhaseEquil.cpp @@ -17,8 +17,6 @@ #include -using namespace std; - namespace Cantera { vcs_MultiPhaseEquil::vcs_MultiPhaseEquil(MultiPhase* mix, int printLvl) : diff --git a/src/equil/vcs_util.cpp b/src/equil/vcs_util.cpp index 515251584a..2dff04af09 100644 --- a/src/equil/vcs_util.cpp +++ b/src/equil/vcs_util.cpp @@ -13,8 +13,6 @@ #include #include -using namespace std; - namespace Cantera { diff --git a/src/kinetics/GasKinetics.cpp b/src/kinetics/GasKinetics.cpp index 5eae632196..fd821a35f2 100644 --- a/src/kinetics/GasKinetics.cpp +++ b/src/kinetics/GasKinetics.cpp @@ -8,8 +8,6 @@ #include "cantera/kinetics/GasKinetics.h" #include "cantera/thermo/ThermoPhase.h" -using namespace std; - namespace Cantera { diff --git a/src/kinetics/ImplicitSurfChem.cpp b/src/kinetics/ImplicitSurfChem.cpp index 80d512d23f..da561be9ee 100644 --- a/src/kinetics/ImplicitSurfChem.cpp +++ b/src/kinetics/ImplicitSurfChem.cpp @@ -12,8 +12,6 @@ #include "cantera/kinetics/solveSP.h" #include "cantera/thermo/SurfPhase.h" -using namespace std; - namespace Cantera { diff --git a/src/kinetics/InterfaceKinetics.cpp b/src/kinetics/InterfaceKinetics.cpp index 38ae27e4fa..29caf11d19 100644 --- a/src/kinetics/InterfaceKinetics.cpp +++ b/src/kinetics/InterfaceKinetics.cpp @@ -11,8 +11,6 @@ #include "cantera/thermo/SurfPhase.h" #include "cantera/base/utilities.h" -using namespace std; - namespace Cantera { diff --git a/src/kinetics/KineticsFactory.cpp b/src/kinetics/KineticsFactory.cpp index 2e450a951e..7495540361 100644 --- a/src/kinetics/KineticsFactory.cpp +++ b/src/kinetics/KineticsFactory.cpp @@ -12,8 +12,6 @@ #include "cantera/thermo/ThermoPhase.h" #include "cantera/base/stringUtils.h" -using namespace std; - namespace Cantera { diff --git a/src/kinetics/Reaction.cpp b/src/kinetics/Reaction.cpp index 66725bf787..7d319d860d 100644 --- a/src/kinetics/Reaction.cpp +++ b/src/kinetics/Reaction.cpp @@ -18,7 +18,6 @@ #include "cantera/base/stringUtils.h" #include #include -#include #include diff --git a/src/kinetics/ReactionRateDelegator.cpp b/src/kinetics/ReactionRateDelegator.cpp index 1bb0658a4d..e4180f207b 100644 --- a/src/kinetics/ReactionRateDelegator.cpp +++ b/src/kinetics/ReactionRateDelegator.cpp @@ -7,8 +7,6 @@ #include "cantera/kinetics/Kinetics.h" #include "cantera/base/Solution.h" -using namespace std; - namespace Cantera { diff --git a/src/kinetics/solveSP.cpp b/src/kinetics/solveSP.cpp index 344137fb08..cf1f14ac77 100644 --- a/src/kinetics/solveSP.cpp +++ b/src/kinetics/solveSP.cpp @@ -9,7 +9,6 @@ #include "cantera/thermo/SurfPhase.h" #include "cantera/kinetics/ImplicitSurfChem.h" -using namespace std; namespace Cantera { diff --git a/src/matlab/ctfunctions.cpp b/src/matlab/ctfunctions.cpp index 6a9c0c8c2a..219c15c74e 100644 --- a/src/matlab/ctfunctions.cpp +++ b/src/matlab/ctfunctions.cpp @@ -16,8 +16,6 @@ #include "cantera/clib/ctrpath.h" #include "ctmatutils.h" -using namespace std; - void reportError() { int buflen = 0; diff --git a/src/matlab/mixturemethods.cpp b/src/matlab/mixturemethods.cpp index 6cd88caaa3..4bb33d76a2 100644 --- a/src/matlab/mixturemethods.cpp +++ b/src/matlab/mixturemethods.cpp @@ -11,7 +11,6 @@ #include "cantera/clib/ctmultiphase.h" #include "cantera/clib/ct.h" #include "ctmatutils.h" -using namespace std; void mixturemethods(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) diff --git a/src/matlab/onedimmethods.cpp b/src/matlab/onedimmethods.cpp index 7a20be0b21..adec1ef6c1 100644 --- a/src/matlab/onedimmethods.cpp +++ b/src/matlab/onedimmethods.cpp @@ -8,8 +8,6 @@ #include "ctmatutils.h" #include "cantera/clib/ctonedim.h" -using namespace std; - void onedimmethods(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) { diff --git a/src/matlab/surfmethods.cpp b/src/matlab/surfmethods.cpp index 02c572dbb7..12784f974c 100644 --- a/src/matlab/surfmethods.cpp +++ b/src/matlab/surfmethods.cpp @@ -9,8 +9,6 @@ #include "cantera/clib/ctsurf.h" #include "cantera/clib/ct.h" -using namespace std; - void surfmethods(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) { diff --git a/src/numerics/IDA_Solver.cpp b/src/numerics/IDA_Solver.cpp index bed5c509c1..4179b685ec 100644 --- a/src/numerics/IDA_Solver.cpp +++ b/src/numerics/IDA_Solver.cpp @@ -23,8 +23,6 @@ #include "ida/ida_spils.h" #include "nvector/nvector_serial.h" -using namespace std; - typedef long int sd_size_t; namespace Cantera diff --git a/src/numerics/PreconditionerFactory.cpp b/src/numerics/PreconditionerFactory.cpp index 9c450a9ffb..0ffa42dd86 100644 --- a/src/numerics/PreconditionerFactory.cpp +++ b/src/numerics/PreconditionerFactory.cpp @@ -6,8 +6,6 @@ #include "cantera/numerics/PreconditionerFactory.h" #include "cantera/numerics/AdaptivePreconditioner.h" - -using namespace std; namespace Cantera { diff --git a/src/numerics/ResidJacEval.cpp b/src/numerics/ResidJacEval.cpp index 25cbb952e3..fa176032c5 100644 --- a/src/numerics/ResidJacEval.cpp +++ b/src/numerics/ResidJacEval.cpp @@ -6,8 +6,6 @@ #include "cantera/numerics/ResidJacEval.h" #include "cantera/base/global.h" -using namespace std; - namespace Cantera { ResidJacEval::ResidJacEval(doublereal atol) : diff --git a/src/numerics/funcs.cpp b/src/numerics/funcs.cpp index e2316b57c7..b8153427d6 100644 --- a/src/numerics/funcs.cpp +++ b/src/numerics/funcs.cpp @@ -7,8 +7,6 @@ #include "cantera/numerics/polyfit.h" #include "cantera/base/ctexceptions.h" -using namespace std; - namespace Cantera { diff --git a/src/oneD/Domain1D.cpp b/src/oneD/Domain1D.cpp index 474437e2a8..4cda1179a5 100644 --- a/src/oneD/Domain1D.cpp +++ b/src/oneD/Domain1D.cpp @@ -11,10 +11,6 @@ #include "cantera/base/AnyMap.h" #include "cantera/base/SolutionArray.h" -#include - -using namespace std; - namespace Cantera { diff --git a/src/oneD/IonFlow.cpp b/src/oneD/IonFlow.cpp index b899b4fe17..7778f10fb3 100644 --- a/src/oneD/IonFlow.cpp +++ b/src/oneD/IonFlow.cpp @@ -12,8 +12,6 @@ #include "cantera/base/utilities.h" #include "cantera/base/global.h" -using namespace std; - namespace Cantera { diff --git a/src/oneD/MultiJac.cpp b/src/oneD/MultiJac.cpp index de3a6af605..7e0fea7a44 100644 --- a/src/oneD/MultiJac.cpp +++ b/src/oneD/MultiJac.cpp @@ -6,8 +6,6 @@ #include "cantera/oneD/MultiJac.h" #include -using namespace std; - namespace Cantera { diff --git a/src/oneD/StFlow.cpp b/src/oneD/StFlow.cpp index b88ed238da..0f8a4c5a9d 100644 --- a/src/oneD/StFlow.cpp +++ b/src/oneD/StFlow.cpp @@ -11,8 +11,6 @@ #include "cantera/numerics/funcs.h" #include "cantera/base/global.h" -#include - using namespace std; namespace Cantera diff --git a/src/thermo/DebyeHuckel.cpp b/src/thermo/DebyeHuckel.cpp index 78f7de22a8..50b6d089af 100644 --- a/src/thermo/DebyeHuckel.cpp +++ b/src/thermo/DebyeHuckel.cpp @@ -21,8 +21,6 @@ #include -using namespace std; - namespace Cantera { diff --git a/src/thermo/Elements.cpp b/src/thermo/Elements.cpp index 2673bbc03e..4a6d276081 100644 --- a/src/thermo/Elements.cpp +++ b/src/thermo/Elements.cpp @@ -10,8 +10,6 @@ #include "cantera/base/stringUtils.h" #include "cantera/base/ctexceptions.h" -using namespace std; - namespace Cantera { diff --git a/src/thermo/GibbsExcessVPSSTP.cpp b/src/thermo/GibbsExcessVPSSTP.cpp index 05b8949b25..a8151e45c1 100644 --- a/src/thermo/GibbsExcessVPSSTP.cpp +++ b/src/thermo/GibbsExcessVPSSTP.cpp @@ -18,8 +18,6 @@ #include "cantera/base/global.h" #include -using namespace std; - namespace Cantera { diff --git a/src/thermo/HMWSoln.cpp b/src/thermo/HMWSoln.cpp index 769e93761b..dfc4a257ca 100644 --- a/src/thermo/HMWSoln.cpp +++ b/src/thermo/HMWSoln.cpp @@ -21,8 +21,6 @@ #include "cantera/thermo/electrolytes.h" #include "cantera/base/stringUtils.h" -using namespace std; - namespace Cantera { diff --git a/src/thermo/IdealGasPhase.cpp b/src/thermo/IdealGasPhase.cpp index dc6d7cb3d6..845fff1047 100644 --- a/src/thermo/IdealGasPhase.cpp +++ b/src/thermo/IdealGasPhase.cpp @@ -12,8 +12,6 @@ #include "cantera/thermo/ThermoFactory.h" #include "cantera/base/utilities.h" -using namespace std; - namespace Cantera { diff --git a/src/thermo/IdealSolidSolnPhase.cpp b/src/thermo/IdealSolidSolnPhase.cpp index 8015daaa5c..aa2a1944b9 100644 --- a/src/thermo/IdealSolidSolnPhase.cpp +++ b/src/thermo/IdealSolidSolnPhase.cpp @@ -14,8 +14,6 @@ #include "cantera/base/stringUtils.h" #include "cantera/base/utilities.h" -using namespace std; - namespace Cantera { diff --git a/src/thermo/IdealSolnGasVPSS.cpp b/src/thermo/IdealSolnGasVPSS.cpp index 43a9cf9a0f..32cf7f5786 100644 --- a/src/thermo/IdealSolnGasVPSS.cpp +++ b/src/thermo/IdealSolnGasVPSS.cpp @@ -15,8 +15,6 @@ #include "cantera/base/stringUtils.h" #include "cantera/base/utilities.h" -using namespace std; - namespace Cantera { diff --git a/src/thermo/IonsFromNeutralVPSSTP.cpp b/src/thermo/IonsFromNeutralVPSSTP.cpp index 41b082aba2..542f936d07 100644 --- a/src/thermo/IonsFromNeutralVPSSTP.cpp +++ b/src/thermo/IonsFromNeutralVPSSTP.cpp @@ -22,8 +22,6 @@ #include -using namespace std; - namespace Cantera { diff --git a/src/thermo/LatticeSolidPhase.cpp b/src/thermo/LatticeSolidPhase.cpp index a537bf102a..f91518677e 100644 --- a/src/thermo/LatticeSolidPhase.cpp +++ b/src/thermo/LatticeSolidPhase.cpp @@ -18,7 +18,6 @@ #include -using namespace std; namespace ba = boost::algorithm; namespace Cantera diff --git a/src/thermo/MargulesVPSSTP.cpp b/src/thermo/MargulesVPSSTP.cpp index a60374448f..eaf40a5c47 100644 --- a/src/thermo/MargulesVPSSTP.cpp +++ b/src/thermo/MargulesVPSSTP.cpp @@ -13,8 +13,6 @@ #include "cantera/thermo/ThermoFactory.h" #include "cantera/base/stringUtils.h" -using namespace std; - namespace Cantera { MargulesVPSSTP::MargulesVPSSTP(const string& inputFile, const string& id_) diff --git a/src/thermo/MolalityVPSSTP.cpp b/src/thermo/MolalityVPSSTP.cpp index b433d0a25b..1f979d2897 100644 --- a/src/thermo/MolalityVPSSTP.cpp +++ b/src/thermo/MolalityVPSSTP.cpp @@ -15,8 +15,6 @@ #include -using namespace std; - namespace Cantera { diff --git a/src/thermo/Mu0Poly.cpp b/src/thermo/Mu0Poly.cpp index 90ae010bc1..27f3c7accb 100644 --- a/src/thermo/Mu0Poly.cpp +++ b/src/thermo/Mu0Poly.cpp @@ -13,8 +13,6 @@ #include "cantera/base/stringUtils.h" #include "cantera/base/AnyMap.h" -using namespace std; - namespace Cantera { Mu0Poly::Mu0Poly() diff --git a/src/thermo/Nasa9PolyMultiTempRegion.cpp b/src/thermo/Nasa9PolyMultiTempRegion.cpp index 091eae2cc6..201c9da6d5 100644 --- a/src/thermo/Nasa9PolyMultiTempRegion.cpp +++ b/src/thermo/Nasa9PolyMultiTempRegion.cpp @@ -19,8 +19,6 @@ #include "cantera/thermo/speciesThermoTypes.h" #include "cantera/base/AnyMap.h" -using namespace std; - namespace Cantera { diff --git a/src/thermo/PDSS_ConstVol.cpp b/src/thermo/PDSS_ConstVol.cpp index 7c719f5065..c1874f74a2 100644 --- a/src/thermo/PDSS_ConstVol.cpp +++ b/src/thermo/PDSS_ConstVol.cpp @@ -10,8 +10,6 @@ #include "cantera/thermo/PDSS_ConstVol.h" #include "cantera/thermo/VPStandardStateTP.h" -using namespace std; - namespace Cantera { diff --git a/src/thermo/PDSS_HKFT.cpp b/src/thermo/PDSS_HKFT.cpp index 06737fd7b2..811ef1c17e 100644 --- a/src/thermo/PDSS_HKFT.cpp +++ b/src/thermo/PDSS_HKFT.cpp @@ -15,8 +15,6 @@ #include "cantera/base/stringUtils.h" #include "cantera/base/global.h" -using namespace std; - namespace Cantera { // Set the default to error exit if there is an input file inconsistency diff --git a/src/thermo/PDSS_IdealGas.cpp b/src/thermo/PDSS_IdealGas.cpp index e251d56228..b228bf5141 100644 --- a/src/thermo/PDSS_IdealGas.cpp +++ b/src/thermo/PDSS_IdealGas.cpp @@ -10,8 +10,6 @@ #include "cantera/thermo/PDSS_IdealGas.h" #include "cantera/thermo/VPStandardStateTP.h" -using namespace std; - namespace Cantera { diff --git a/src/thermo/PDSS_IonsFromNeutral.cpp b/src/thermo/PDSS_IonsFromNeutral.cpp index 11f15a3681..96dc2e4fc3 100644 --- a/src/thermo/PDSS_IonsFromNeutral.cpp +++ b/src/thermo/PDSS_IonsFromNeutral.cpp @@ -11,8 +11,6 @@ #include "cantera/thermo/IonsFromNeutralVPSSTP.h" #include "cantera/base/stringUtils.h" -using namespace std; - namespace Cantera { diff --git a/src/thermo/PDSS_SSVol.cpp b/src/thermo/PDSS_SSVol.cpp index 331890cfe8..4e4ddd56b1 100644 --- a/src/thermo/PDSS_SSVol.cpp +++ b/src/thermo/PDSS_SSVol.cpp @@ -10,8 +10,6 @@ #include "cantera/thermo/PDSS_SSVol.h" #include "cantera/thermo/VPStandardStateTP.h" -using namespace std; - namespace Cantera { diff --git a/src/thermo/PureFluidPhase.cpp b/src/thermo/PureFluidPhase.cpp index 93f8dcee32..bb00baf543 100644 --- a/src/thermo/PureFluidPhase.cpp +++ b/src/thermo/PureFluidPhase.cpp @@ -15,8 +15,6 @@ #include "cantera/base/stringUtils.h" #include "cantera/base/global.h" -using std::string; - namespace Cantera { diff --git a/src/thermo/RedlichKwongMFTP.cpp b/src/thermo/RedlichKwongMFTP.cpp index 78af530121..b430c31b88 100644 --- a/src/thermo/RedlichKwongMFTP.cpp +++ b/src/thermo/RedlichKwongMFTP.cpp @@ -10,9 +10,6 @@ #include -#include - -using namespace std; namespace bmt = boost::math::tools; namespace Cantera diff --git a/src/thermo/SingleSpeciesTP.cpp b/src/thermo/SingleSpeciesTP.cpp index 590f4560fb..cfa1eb2379 100644 --- a/src/thermo/SingleSpeciesTP.cpp +++ b/src/thermo/SingleSpeciesTP.cpp @@ -12,8 +12,6 @@ #include "cantera/base/stringUtils.h" #include "cantera/base/global.h" -using namespace std; - namespace Cantera { diff --git a/src/thermo/Species.cpp b/src/thermo/Species.cpp index b07666a245..2d1f258f48 100644 --- a/src/thermo/Species.cpp +++ b/src/thermo/Species.cpp @@ -12,7 +12,6 @@ #include "cantera/base/global.h" #include #include -#include using namespace std; diff --git a/src/thermo/SpeciesThermoFactory.cpp b/src/thermo/SpeciesThermoFactory.cpp index 632e59602e..826077bd22 100644 --- a/src/thermo/SpeciesThermoFactory.cpp +++ b/src/thermo/SpeciesThermoFactory.cpp @@ -21,8 +21,6 @@ #include "cantera/base/stringUtils.h" #include "cantera/base/Units.h" -using namespace std; - namespace Cantera { diff --git a/src/thermo/SurfPhase.cpp b/src/thermo/SurfPhase.cpp index 8eff803d6a..8340d9a2b3 100644 --- a/src/thermo/SurfPhase.cpp +++ b/src/thermo/SurfPhase.cpp @@ -16,8 +16,6 @@ #include "cantera/base/stringUtils.h" #include "cantera/base/utilities.h" -using namespace std; - namespace Cantera { diff --git a/src/thermo/ThermoFactory.cpp b/src/thermo/ThermoFactory.cpp index 2dc4d1ad72..c12b7a4988 100644 --- a/src/thermo/ThermoFactory.cpp +++ b/src/thermo/ThermoFactory.cpp @@ -39,8 +39,6 @@ #include "cantera/thermo/BinarySolutionTabulatedThermo.h" #include "cantera/base/stringUtils.h" -using namespace std; - namespace Cantera { diff --git a/src/thermo/VPStandardStateTP.cpp b/src/thermo/VPStandardStateTP.cpp index 0b1b5bbc69..cd88833601 100644 --- a/src/thermo/VPStandardStateTP.cpp +++ b/src/thermo/VPStandardStateTP.cpp @@ -15,8 +15,6 @@ #include "cantera/base/utilities.h" #include "cantera/base/global.h" -using namespace std; - namespace Cantera { diff --git a/src/thermo/WaterPropsIAPWSphi.cpp b/src/thermo/WaterPropsIAPWSphi.cpp index 194864a853..2b26610be2 100644 --- a/src/thermo/WaterPropsIAPWSphi.cpp +++ b/src/thermo/WaterPropsIAPWSphi.cpp @@ -11,9 +11,6 @@ #include "cantera/thermo/WaterPropsIAPWSphi.h" #include "cantera/base/global.h" -#include -#include - namespace Cantera { diff --git a/src/thermo/WaterSSTP.cpp b/src/thermo/WaterSSTP.cpp index 9e787ea278..b84a6f3940 100644 --- a/src/thermo/WaterSSTP.cpp +++ b/src/thermo/WaterSSTP.cpp @@ -11,8 +11,6 @@ #include "cantera/thermo/ThermoFactory.h" #include "cantera/base/stringUtils.h" -using namespace std; - namespace Cantera { WaterSSTP::WaterSSTP(const string& inputFile, const string& id) diff --git a/src/tpx/Methane.cpp b/src/tpx/Methane.cpp index 0fe6d34b7d..126ed7988a 100644 --- a/src/tpx/Methane.cpp +++ b/src/tpx/Methane.cpp @@ -6,7 +6,6 @@ #include "Methane.h" #include "cantera/base/stringUtils.h" -using namespace std; using namespace Cantera; namespace tpx diff --git a/src/tpx/Sub.cpp b/src/tpx/Sub.cpp index cf7422e23c..c2dcf79089 100644 --- a/src/tpx/Sub.cpp +++ b/src/tpx/Sub.cpp @@ -11,7 +11,6 @@ #include "cantera/base/stringUtils.h" #include "cantera/base/global.h" -using std::string; using namespace Cantera; namespace { diff --git a/src/transport/DustyGasTransport.cpp b/src/transport/DustyGasTransport.cpp index 37803da529..2ef146e664 100644 --- a/src/transport/DustyGasTransport.cpp +++ b/src/transport/DustyGasTransport.cpp @@ -11,8 +11,6 @@ #include "cantera/base/stringUtils.h" #include "cantera/base/utilities.h" -using namespace std; - namespace Cantera { DustyGasTransport::DustyGasTransport(ThermoPhase* thermo) : diff --git a/src/transport/MMCollisionInt.cpp b/src/transport/MMCollisionInt.cpp index 8fcd37bffe..8bee33d707 100644 --- a/src/transport/MMCollisionInt.cpp +++ b/src/transport/MMCollisionInt.cpp @@ -11,8 +11,6 @@ #include "cantera/base/stringUtils.h" #include "cantera/base/global.h" -using namespace std; - namespace Cantera { const int DeltaDegree = 6; diff --git a/src/transport/MixTransport.cpp b/src/transport/MixTransport.cpp index d151c1fb2f..cbad60b56f 100644 --- a/src/transport/MixTransport.cpp +++ b/src/transport/MixTransport.cpp @@ -11,8 +11,6 @@ #include "cantera/thermo/ThermoPhase.h" #include "cantera/base/utilities.h" -using namespace std; - namespace Cantera { diff --git a/src/transport/Transport.cpp b/src/transport/Transport.cpp index 3c08c7c9ae..4a8fe613b5 100644 --- a/src/transport/Transport.cpp +++ b/src/transport/Transport.cpp @@ -10,8 +10,6 @@ #include "cantera/thermo/ThermoPhase.h" #include "cantera/transport/TransportFactory.h" -using namespace std; - namespace Cantera { Transport::Transport(ThermoPhase* thermo, size_t ndim) : diff --git a/src/transport/TransportData.cpp b/src/transport/TransportData.cpp index a3d471041e..61237b65b4 100644 --- a/src/transport/TransportData.cpp +++ b/src/transport/TransportData.cpp @@ -8,8 +8,6 @@ #include "cantera/base/ctexceptions.h" #include "cantera/base/stringUtils.h" -#include - namespace Cantera { diff --git a/src/transport/TransportFactory.cpp b/src/transport/TransportFactory.cpp index 06115a16b8..314242107b 100644 --- a/src/transport/TransportFactory.cpp +++ b/src/transport/TransportFactory.cpp @@ -15,8 +15,6 @@ #include "cantera/base/stringUtils.h" #include "cantera/base/utilities.h" -using namespace std; - namespace Cantera { TransportFactory* TransportFactory::s_factory = 0; diff --git a/src/transport/WaterTransport.cpp b/src/transport/WaterTransport.cpp index 4e1b083bf5..7738a8e163 100644 --- a/src/transport/WaterTransport.cpp +++ b/src/transport/WaterTransport.cpp @@ -8,8 +8,6 @@ #include "cantera/thermo/PDSS_Water.h" #include "cantera/thermo/WaterSSTP.h" -using namespace std; - namespace { const double Tstar = 647.27; diff --git a/src/zeroD/ConstPressureMoleReactor.cpp b/src/zeroD/ConstPressureMoleReactor.cpp index 917d8b4d32..b58d6abb7e 100644 --- a/src/zeroD/ConstPressureMoleReactor.cpp +++ b/src/zeroD/ConstPressureMoleReactor.cpp @@ -11,8 +11,6 @@ #include "cantera/thermo/SurfPhase.h" #include "cantera/kinetics/Kinetics.h" -using namespace std; - namespace Cantera { diff --git a/src/zeroD/ConstPressureReactor.cpp b/src/zeroD/ConstPressureReactor.cpp index 96d37cbebf..5b792f376e 100644 --- a/src/zeroD/ConstPressureReactor.cpp +++ b/src/zeroD/ConstPressureReactor.cpp @@ -10,8 +10,6 @@ #include "cantera/thermo/SurfPhase.h" #include "cantera/base/utilities.h" -using namespace std; - namespace Cantera { diff --git a/src/zeroD/FlowDeviceFactory.cpp b/src/zeroD/FlowDeviceFactory.cpp index 8f1ddef65a..3d815dbf70 100644 --- a/src/zeroD/FlowDeviceFactory.cpp +++ b/src/zeroD/FlowDeviceFactory.cpp @@ -6,7 +6,6 @@ #include "cantera/zeroD/FlowDeviceFactory.h" #include "cantera/zeroD/flowControllers.h" -using namespace std; namespace Cantera { diff --git a/src/zeroD/IdealGasConstPressureMoleReactor.cpp b/src/zeroD/IdealGasConstPressureMoleReactor.cpp index 800189392d..b3762c137d 100644 --- a/src/zeroD/IdealGasConstPressureMoleReactor.cpp +++ b/src/zeroD/IdealGasConstPressureMoleReactor.cpp @@ -14,8 +14,6 @@ #include "cantera/base/utilities.h" #include -using namespace std; - namespace Cantera { diff --git a/src/zeroD/IdealGasConstPressureReactor.cpp b/src/zeroD/IdealGasConstPressureReactor.cpp index 16f509b86c..dd0188c08a 100644 --- a/src/zeroD/IdealGasConstPressureReactor.cpp +++ b/src/zeroD/IdealGasConstPressureReactor.cpp @@ -10,8 +10,6 @@ #include "cantera/thermo/ThermoPhase.h" #include "cantera/base/utilities.h" -using namespace std; - namespace Cantera { diff --git a/src/zeroD/IdealGasMoleReactor.cpp b/src/zeroD/IdealGasMoleReactor.cpp index 9fa9366004..0089daf9c5 100644 --- a/src/zeroD/IdealGasMoleReactor.cpp +++ b/src/zeroD/IdealGasMoleReactor.cpp @@ -14,8 +14,6 @@ #include "cantera/base/utilities.h" #include -using namespace std; - namespace Cantera { diff --git a/src/zeroD/IdealGasReactor.cpp b/src/zeroD/IdealGasReactor.cpp index 99cd259007..68da06600d 100644 --- a/src/zeroD/IdealGasReactor.cpp +++ b/src/zeroD/IdealGasReactor.cpp @@ -10,8 +10,6 @@ #include "cantera/thermo/ThermoPhase.h" #include "cantera/base/utilities.h" -using namespace std; - namespace Cantera { diff --git a/src/zeroD/ReactorBase.cpp b/src/zeroD/ReactorBase.cpp index 1268b28f8e..94de9a021b 100644 --- a/src/zeroD/ReactorBase.cpp +++ b/src/zeroD/ReactorBase.cpp @@ -9,7 +9,6 @@ #include "cantera/zeroD/ReactorSurface.h" #include "cantera/thermo/ThermoPhase.h" -using namespace std; namespace Cantera { diff --git a/src/zeroD/ReactorFactory.cpp b/src/zeroD/ReactorFactory.cpp index 44a32ca5a9..a401a674e4 100644 --- a/src/zeroD/ReactorFactory.cpp +++ b/src/zeroD/ReactorFactory.cpp @@ -16,12 +16,9 @@ #include "cantera/zeroD/ReactorDelegator.h" #include "cantera/zeroD/IdealGasConstPressureMoleReactor.h" -using namespace std; namespace Cantera { -class Reservoir; - ReactorFactory* ReactorFactory::s_factory = 0; std::mutex ReactorFactory::reactor_mutex; diff --git a/src/zeroD/ReactorNet.cpp b/src/zeroD/ReactorNet.cpp index 7d6ace8770..ef9c0d3e2d 100644 --- a/src/zeroD/ReactorNet.cpp +++ b/src/zeroD/ReactorNet.cpp @@ -10,8 +10,6 @@ #include "cantera/base/Array.h" #include "cantera/numerics/Integrator.h" -using namespace std; - namespace Cantera { diff --git a/src/zeroD/WallFactory.cpp b/src/zeroD/WallFactory.cpp index df32fd9105..98f8e22aba 100644 --- a/src/zeroD/WallFactory.cpp +++ b/src/zeroD/WallFactory.cpp @@ -6,7 +6,6 @@ #include "cantera/zeroD/WallFactory.h" #include "cantera/zeroD/Wall.h" -using namespace std; namespace Cantera {