Squashed 'src/phast/PhreeqcRM/' changes from 3020a662..ad80557e

ad80557e Merge commit '7db919d6407dd274a4f4ea328dea94814a1e7b3d' 7db919d6 Squashed 'src/' changes from 164c290b..5b3b2308 git-subtree-dir: src/phast/PhreeqcRM git-subtree-split: ad80557efa2572ba28cfeb2f40a73eb64e05b6d5
usgs-coupled · Nov 19, 2024 · 5d08e4a · 5d08e4a
1 parent c960834
commit 5d08e4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/gases.cpp b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/gases.cpp
@@ -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())

diff --git a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/read.cpp b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/read.cpp
@@ -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
 			{