From 3e1c0d11a21bedfeb288ed4a8737d0a9287e2e7f Mon Sep 17 00:00:00 2001
From: Darth Vader <darth@empire.com>
Date: Tue, 19 Nov 2024 01:18:43 +0000
Subject: [PATCH] Squashed 'src/' changes from ce34aa5e..7bae85a3

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
---
 phreeqcpp/gases.cpp | 3 +--
 phreeqcpp/read.cpp  | 7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/phreeqcpp/gases.cpp b/phreeqcpp/gases.cpp
index dea1e551..924be9b8 100644
--- a/phreeqcpp/gases.cpp
+++ b/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/phreeqcpp/read.cpp b/phreeqcpp/read.cpp
index 1b0bb84d..3ed98d7c 100644
--- a/phreeqcpp/read.cpp
+++ b/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
 			{