Merge commit '5d08e4a250aa0aa2805ef15967eaa77430bce8b1'

Darth Vader · Darth Vader · commit 015f8174a383 · 2024-11-19T01:26:56.000Z
diff --git a/src/phast/PhreeqcRM/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/gases.cpp b/src/phast/PhreeqcRM/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/phast/PhreeqcRM/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/read.cpp b/src/phast/PhreeqcRM/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
 			{

Original file line number	Diff line number	Diff line change
`@@ -2626,11 +2626,8 @@ read_gas_binary_parameters(void)`
`2626`	`2626`	`}`
`2627`	`2627`	`if (!error)`
`2628`	`2628`	`{`
`2629`		`- std::pair<std::string, std::string> p;`
`2630`		`- p = { gas1, gas2 };`
`2631`		`- gas_binary_parameters[p] = d;`
`2632`		`- p = { gas2, gas1 };`
`2633`		`- gas_binary_parameters[p] = d;`
	`2629`	`+ gas_binary_parameters[std::make_pair(gas1, gas2)] = d;`
	`2630`	`+ gas_binary_parameters[std::make_pair(gas2, gas1)] = d;`
`2634`	`2631`	`}`
`2635`	`2632`	`else`
`2636`	`2633`	`{`