max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Enable std::map::contains only when cpp >= 20 is defined

Browse Source
This commit is contained in:
Max Luebke 2024-09-10 18:08:55 +02:00
parent 9722151735
commit e3c3e890df
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
poet/include/PhreeqcInit.hpp
View File

@ -102,7 +102,7 @@ public:
* cell. Empty if no exchange is defined.
*/
std::vector<std::string> getExchanger(int id) {
if (this->exchanger.contains(id)) {
if (contains_id(this->exchanger, id)) {
return this->exchanger[id];
}
@ -117,7 +117,7 @@ public:
* cell. Empty if no kinetics are defined.
*/
std::vector<std::string> getKineticsNames(int id) {
if (this->kinetics.contains(id)) {
if (contains_id(this->kinetics, id)) {
return this->kinetics[id];
}
@ -132,7 +132,7 @@ public:
* cell. Empty if no equilibrium is defined.
*/
std::vector<std::string> getEquilibriumNames(int id) {
if (this->equilibrium.contains(id)) {
if (contains_id(this->equilibrium, id)) {
return this->equilibrium[id];
}
@ -147,7 +147,7 @@ public:
* for the cell. Empty if no surface is defined.
*/
std::vector<std::string> getSurfaceCompNames(int id) {
if (this->surface_comps.contains(id)) {
if (contains_id(this->surface_comps, id)) {
return this->surface_comps[id];
}
@ -162,7 +162,7 @@ public:
* the cell. Empty if no surface is defined.
*/
std::vector<std::string> getSurfaceChargeNames(int id) {
if (this->surface_charge.contains(id)) {
if (contains_id(this->surface_charge, id)) {
return this->surface_charge[id];
}
@ -216,6 +216,15 @@ private:
std::map<int, std::vector<std::string>> surface_comps;
std::map<int, std::vector<std::string>> surface_charge;
bool contains_id(const std::map<int, std::vector<std::string>> &map,
int id) const {
#if __cplusplus >= 202002L
return map.contains(id);
#else
return map.find(id) != map.end();
#endif
}
std::set<std::string> surface_primaries;
using RawMap = std::map<int, std::pair<essential_names, std::vector<double>>>;