Include common header in relevant *.cpp files

Cantera · Nov 28, 2021 · ea895b6 · ea895b6
1 parent 024b82d
commit ea895b6
Show file tree

Hide file tree

Showing 24 changed files with 48 additions and 38 deletions.
diff --git a/src/base/AnyMap.cpp b/src/base/AnyMap.cpp
@@ -3,7 +3,8 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
-#include "cantera/base/AnyMap.h"
+#include "cantera/base/common.h"
+
 #include "application.h"
 #include "cantera/base/yaml.h"
 #include "cantera/base/stringUtils.h"
@@ -13,8 +14,6 @@
   #include <boost/core/demangle.hpp>
 #endif
 
-#include <boost/algorithm/string.hpp>
-#include <fstream>
 #include <mutex>
 #include <unordered_set>
 

diff --git a/src/base/Solution.cpp b/src/base/Solution.cpp
@@ -6,6 +6,8 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/base/Solution.h"
 #include "cantera/thermo/ThermoPhase.h"
 #include "cantera/thermo/ThermoFactory.h"

diff --git a/src/base/Units.cpp b/src/base/Units.cpp
@@ -3,11 +3,12 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/base/Units.h"
 #include "cantera/base/ctexceptions.h"
 #include "cantera/base/global.h"
 #include "cantera/base/stringUtils.h"
-#include "cantera/base/AnyMap.h"
 #include "cantera/base/utilities.h"
 #include <regex>
 

diff --git a/src/base/YamlWriter.cpp b/src/base/YamlWriter.cpp
@@ -1,8 +1,9 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/base/YamlWriter.h"
-#include "cantera/base/AnyMap.h"
 #include "cantera/base/Solution.h"
 #include "cantera/base/stringUtils.h"
 #include "cantera/thermo/ThermoPhase.h"
@@ -11,8 +12,6 @@
 #include "cantera/kinetics/Reaction.h"
 #include "cantera/transport/TransportBase.h"
 
-#include <set>
-#include <fstream>
 #include <chrono>
 
 namespace Cantera {

diff --git a/src/base/ctexceptions.cpp b/src/base/ctexceptions.cpp
@@ -3,12 +3,12 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/base/ctexceptions.h"
 #include "application.h"
 #include "cantera/base/global.h"
 
-#include <sstream>
-
 namespace Cantera
 {
 

diff --git a/src/base/stringUtils.cpp b/src/base/stringUtils.cpp
@@ -8,6 +8,8 @@
 // at https://cantera.org/license.txt for license and copyright information.
 
 //@{
+#include "cantera/base/common.h"
+
 #include "cantera/base/ct_defs.h"
 
 #ifdef _MSC_VER
@@ -22,9 +24,6 @@
 #include "cantera/base/utilities.h"
 #include "cantera/base/global.h"
 
-#include <boost/algorithm/string.hpp>
-#include <sstream>
-
 namespace ba = boost::algorithm;
 
 namespace Cantera

diff --git a/src/kinetics/Falloff.cpp b/src/kinetics/Falloff.cpp
@@ -6,10 +6,11 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/base/stringUtils.h"
 #include "cantera/base/ctexceptions.h"
 #include "cantera/base/global.h"
-#include "cantera/base/AnyMap.h"
 #include "cantera/kinetics/Falloff.h"
 
 namespace Cantera

diff --git a/src/kinetics/Reaction.cpp b/src/kinetics/Reaction.cpp
@@ -5,6 +5,8 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/kinetics/Reaction.h"
 #include "cantera/kinetics/ReactionFactory.h"
 #include "cantera/kinetics/ReactionRateFactory.h"
@@ -13,13 +15,8 @@
 #include "cantera/thermo/ThermoPhase.h"
 #include "cantera/base/ctml.h"
 #include "cantera/base/Array.h"
-#include "cantera/base/AnyMap.h"
 #include "cantera/base/utilities.h"
 #include "cantera/base/stringUtils.h"
-#include <sstream>
-#include <set>
-
-#include <boost/algorithm/string.hpp>
 
 namespace ba = boost::algorithm;
 

diff --git a/src/kinetics/ReactionFactory.cpp b/src/kinetics/ReactionFactory.cpp
@@ -5,12 +5,13 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/thermo/ThermoPhase.h"
 #include "cantera/kinetics/Reaction.h"
 #include "cantera/kinetics/ReactionFactory.h"
 #include "cantera/kinetics/Kinetics.h"
 #include "cantera/base/ctml.h"
-#include "cantera/base/AnyMap.h"
 #include "cantera/base/stringUtils.h"
 
 namespace Cantera

diff --git a/src/kinetics/ReactionRateFactory.cpp b/src/kinetics/ReactionRateFactory.cpp
@@ -5,11 +5,12 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/kinetics/ReactionRateFactory.h"
 #include "cantera/kinetics/MultiRate.h"
 #include "cantera/thermo/ThermoPhase.h"
 #include "cantera/kinetics/Kinetics.h"
-#include "cantera/base/AnyMap.h"
 
 namespace Cantera
 {

diff --git a/src/kinetics/RxnRates.cpp b/src/kinetics/RxnRates.cpp
@@ -3,8 +3,9 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/kinetics/RxnRates.h"
-#include "cantera/base/AnyMap.h"
 
 namespace Cantera
 {

diff --git a/src/oneD/Domain1D.cpp b/src/oneD/Domain1D.cpp
@@ -5,13 +5,12 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/oneD/Domain1D.h"
 #include "cantera/oneD/MultiJac.h"
 #include "cantera/oneD/refine.h"
 #include "cantera/base/ctml.h"
-#include "cantera/base/AnyMap.h"
-
-#include <set>
 
 using namespace std;
 

diff --git a/src/oneD/OneDim.cpp b/src/oneD/OneDim.cpp
@@ -3,13 +3,13 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/oneD/OneDim.h"
 #include "cantera/numerics/Func1.h"
 #include "cantera/base/ctml.h"
 #include "cantera/oneD/MultiNewton.h"
-#include "cantera/base/AnyMap.h"
 
-#include <fstream>
 #include <ctime>
 
 using namespace std;

diff --git a/src/thermo/ConstCpPoly.cpp b/src/thermo/ConstCpPoly.cpp
@@ -8,8 +8,9 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/thermo/ConstCpPoly.h"
-#include "cantera/base/AnyMap.h"
 
 namespace Cantera
 {

diff --git a/src/thermo/LatticeSolidPhase.cpp b/src/thermo/LatticeSolidPhase.cpp
@@ -9,6 +9,8 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/thermo/LatticeSolidPhase.h"
 #include "cantera/thermo/ThermoFactory.h"
 #include "cantera/thermo/SpeciesThermoFactory.h"
@@ -17,8 +19,6 @@
 #include "cantera/base/stringUtils.h"
 #include "cantera/base/utilities.h"
 
-#include <boost/algorithm/string.hpp>
-
 using namespace std;
 namespace ba = boost::algorithm;
 

diff --git a/src/thermo/Mu0Poly.cpp b/src/thermo/Mu0Poly.cpp
@@ -9,10 +9,11 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/thermo/Mu0Poly.h"
 #include "cantera/base/ctml.h"
 #include "cantera/base/stringUtils.h"
-#include "cantera/base/AnyMap.h"
 
 using namespace std;
 

diff --git a/src/thermo/Nasa9Poly1.cpp b/src/thermo/Nasa9Poly1.cpp
@@ -12,8 +12,9 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/thermo/Nasa9Poly1.h"
-#include "cantera/base/AnyMap.h"
 
 namespace Cantera
 {

diff --git a/src/thermo/Nasa9PolyMultiTempRegion.cpp b/src/thermo/Nasa9PolyMultiTempRegion.cpp
@@ -14,10 +14,11 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/base/ctexceptions.h"
 #include "cantera/thermo/Nasa9PolyMultiTempRegion.h"
 #include "cantera/thermo/speciesThermoTypes.h"
-#include "cantera/base/AnyMap.h"
 
 using namespace std;
 

diff --git a/src/thermo/NasaPoly2.cpp b/src/thermo/NasaPoly2.cpp
@@ -1,10 +1,11 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/thermo/NasaPoly2.h"
 #include "cantera/base/global.h"
 #include "cantera/base/stringUtils.h"
-#include "cantera/base/AnyMap.h"
 
 namespace Cantera {
 

diff --git a/src/thermo/PDSS.cpp b/src/thermo/PDSS.cpp
@@ -8,6 +8,8 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/base/ctml.h"
 #include "cantera/thermo/PDSS.h"
 #include "cantera/thermo/VPStandardStateTP.h"

diff --git a/src/thermo/Species.cpp b/src/thermo/Species.cpp
@@ -1,6 +1,8 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/thermo/Species.h"
 #include "cantera/thermo/SpeciesThermoInterpType.h"
 #include "cantera/thermo/SpeciesThermoFactory.h"
@@ -10,9 +12,7 @@
 #include "cantera/base/ctexceptions.h"
 #include "cantera/base/ctml.h"
 #include "cantera/base/global.h"
-#include <iostream>
 #include <limits>
-#include <set>
 
 namespace Cantera {
 

diff --git a/src/thermo/SpeciesThermoInterpType.cpp b/src/thermo/SpeciesThermoInterpType.cpp
@@ -5,6 +5,8 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/thermo/SpeciesThermoInterpType.h"
 #include "cantera/thermo/PDSS.h"
 

diff --git a/src/thermo/ThermoPhase.cpp b/src/thermo/ThermoPhase.cpp
@@ -8,6 +8,8 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/thermo/ThermoPhase.h"
 #include "cantera/base/stringUtils.h"
 #include "cantera/thermo/ThermoFactory.h"
@@ -18,7 +20,6 @@
 #include "cantera/base/ctml.h"
 
 #include <iomanip>
-#include <fstream>
 #include <numeric>
 
 using namespace std;

diff --git a/src/transport/TransportData.cpp b/src/transport/TransportData.cpp
@@ -3,14 +3,14 @@
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
+#include "cantera/base/common.h"
+
 #include "cantera/transport/TransportData.h"
 #include "cantera/thermo/Species.h"
 #include "cantera/base/ctexceptions.h"
 #include "cantera/base/stringUtils.h"
 #include "cantera/base/ctml.h"
 
-#include <set>
-
 namespace Cantera
 {