Remove unnecessary using and include statements

Cantera · Mar 9, 2023 · da26479 · da26479
1 parent ad6efab
commit da26479
Show file tree

Hide file tree

Showing 93 changed files with 1 addition and 168 deletions.
diff --git a/include/cantera/base/AnyMap.h b/include/cantera/base/AnyMap.h
@@ -11,8 +11,6 @@
 #include "cantera/base/Units.h"
 
 #include <unordered_map>
-#include <functional>
-#include <set>
 #include <filesystem>
 
 namespace boost

diff --git a/include/cantera/base/AnyMap.inl.h b/include/cantera/base/AnyMap.inl.h
@@ -179,7 +179,6 @@ template<class T>
 bool AnyValue::eq_comparer(const boost::any& lhs, const boost::any& rhs)
 {
     using boost::any_cast;
-    using std::vector;
     typedef vector<double> vd;
     typedef vector<long int> vi;
     typedef vector<AnyValue> va;

diff --git 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 <functional>
 
 namespace Cantera
 {

diff --git a/include/cantera/base/FactoryBase.h b/include/cantera/base/FactoryBase.h
@@ -11,7 +11,6 @@
 
 #include <mutex>
 #include <unordered_map>
-#include <functional>
 #include "cantera/base/ctexceptions.h"
 #include "cantera/base/global.h"
 

diff --git a/include/cantera/base/NoExitLogger.h b/include/cantera/base/NoExitLogger.h
@@ -6,7 +6,6 @@
 #ifndef NOEXITLOGGER_H
 #define NOEXITLOGGER_H
 
-#include <string>
 #include "cantera/base/logger.h"
 
 namespace Cantera {

diff --git 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 <set>
 
 #if CT_USE_HDF5
 

diff --git 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 <functional>
 
 namespace Cantera
 {

diff --git 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 <algorithm>
 
 namespace tpx
 {

diff --git a/samples/f77/demo_ftnlib.cpp b/samples/f77/demo_ftnlib.cpp
@@ -36,7 +36,6 @@
 #include <iostream>
 
 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
@@ -15,8 +15,6 @@
 #include <unordered_set>
 
 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
@@ -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
@@ -10,9 +10,6 @@
 namespace Cantera
 {
 
-using std::string;
-using std::vector;
-
 void Interface::setThermo(shared_ptr<ThermoPhase> thermo) {
     Solution::setThermo(thermo);
     auto surf = std::dynamic_pointer_cast<SurfPhase>(thermo);

diff --git 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 <set>
 #include <fstream>
 #include <chrono>
 

diff --git a/src/base/application.cpp b/src/base/application.cpp
@@ -16,8 +16,6 @@
 #include <sstream>
 #include <mutex>
 
-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
@@ -11,7 +11,6 @@
 
 #include <boost/algorithm/string/join.hpp>
 
-#include <set>
 #include <thread>
 
 namespace Cantera

diff --git a/src/base/global.cpp b/src/base/global.cpp
@@ -10,8 +10,6 @@
   #include <boost/core/demangle.hpp>
 #endif
 
-using namespace std;
-
 namespace Cantera
 {
 

diff --git 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<ThermoPhase> ThermoCabinet;

diff --git 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
@@ -12,7 +12,6 @@
 #include "cantera/thermo/ThermoPhase.h"
 #include "clib_utils.h"
 
-using namespace std;
 using namespace Cantera;
 
 typedef Cabinet<MultiPhase> mixCabinet;

diff --git 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<ReactorBase> ReactorCabinet;
 typedef Cabinet<ReactorNet> NetworkCabinet;

diff --git 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<ThermoPhase> ThermoCabinet;

diff --git 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
@@ -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
@@ -12,8 +12,6 @@
 #include <cstdio>
 #include <numeric>
 
-using namespace std;
-
 namespace Cantera
 {
 

diff --git a/src/equil/vcs_MultiPhaseEquil.cpp b/src/equil/vcs_MultiPhaseEquil.cpp
@@ -17,8 +17,6 @@
 
 #include <cstdio>
 
-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
@@ -13,8 +13,6 @@
 #include <cassert>
 #include <cstring>
 
-using namespace std;
-
 namespace Cantera
 {
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -18,7 +18,6 @@
 #include "cantera/base/stringUtils.h"
 #include <boost/algorithm/string/predicate.hpp>
 #include <sstream>
-#include <set>
 
 #include <boost/algorithm/string.hpp>
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -11,10 +11,6 @@
 #include "cantera/base/AnyMap.h"
 #include "cantera/base/SolutionArray.h"
 
-#include <set>
-
-using namespace std;
-
 namespace Cantera
 {
 

diff --git 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
@@ -6,8 +6,6 @@
 #include "cantera/oneD/MultiJac.h"
 #include <ctime>
 
-using namespace std;
-
 namespace Cantera
 {
 

diff --git 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 <set>
-
 using namespace std;
 
 namespace Cantera