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

Squashed 'src/' changes from ce34aa5e..7bae85a3

Browse Source 
7bae85a3 Merge commit '80bf22d292021bc23620baa144f0a685fa73a82f'
80bf22d2 Squashed 'phreeqcpp/' changes from b576c75..c369020
3fd5b896 59 compiler error on macos (#60)

git-subtree-dir: src
git-subtree-split: 7bae85a32f92ccc7ebb8e658fd4f4d16b20217c0
This commit is contained in:
Darth Vader 2024-11-19 01:18:43 +00:00
parent 21df9497a0
commit 3e1c0d11a2
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;
std::pair < std::string, std::string > p;
p = { name1, name2 };
std::pair<std::string, std::string> p(name1, name2);
std::map<std::pair<std::string, std::string>, double>::const_iterator gas_pair_it;
gas_pair_it = gas_binary_parameters.find(p);
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)
{
std::pair<std::string, std::string> p;
p = { gas1, gas2 };
gas_binary_parameters[p] = d;
p = { gas2, gas1 };
gas_binary_parameters[p] = d;
gas_binary_parameters[std::make_pair(gas1, gas2)] = d;
gas_binary_parameters[std::make_pair(gas2, gas1)] = d;
}
else
{