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

59 compiler error on macos (#60)

Browse Source 
* Closes usgs-coupled/iphreeqc#59
This commit is contained in:
Charlton, Scott R 2024-11-18 18:10:42 -07:00 committed by GitHub
parent ce34aa5e05
commit 3fd5b896c9
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phreeqcpp/gases.cpp
View File

@ -704,8 +704,7 @@ calc_gas_binary_parameter(std::string name1, std::string name2) const
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
double f = 1.0; double f = 1.0;
std::pair < std::string, std::string > p; std::pair<std::string, std::string> p(name1, name2);
p = { name1, name2 };
std::map<std::pair<std::string, std::string>, double>::const_iterator gas_pair_it; std::map<std::pair<std::string, std::string>, double>::const_iterator gas_pair_it;
gas_pair_it = gas_binary_parameters.find(p); gas_pair_it = gas_binary_parameters.find(p);
if (gas_pair_it != gas_binary_parameters.end()) if (gas_pair_it != gas_binary_parameters.end())

7
phreeqcpp/read.cpp
View File

@ -2626,11 +2626,8 @@ read_gas_binary_parameters(void)
} }
if (!error) if (!error)
{ {
std::pair<std::string, std::string> p; gas_binary_parameters[std::make_pair(gas1, gas2)] = d;
p = { gas1, gas2 }; gas_binary_parameters[std::make_pair(gas2, gas1)] = d;
gas_binary_parameters[p] = d;
p = { gas2, gas1 };
gas_binary_parameters[p] = d;
} }
else else
{ {