From 3fd5b896c90fe029b01f96490c6dc786bcf59f68 Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R" Date: Mon, 18 Nov 2024 18:10:42 -0700 Subject: [PATCH 1/2] 59 compiler error on macos (#60) * Closes usgs-coupled/iphreeqc#59 --- 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 p(name1, name2); std::map, 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 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 { From 80bf22d292021bc23620baa144f0a685fa73a82f Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Tue, 19 Nov 2024 01:17:49 +0000 Subject: [PATCH 2/2] Squashed 'phreeqcpp/' changes from b576c75..c369020 c369020 59 compiler error on macos (#60) git-subtree-dir: phreeqcpp git-subtree-split: c369020dbdaee3179efad614d3e841ed4b470ccf --- gases.cpp | 3 +-- read.cpp | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gases.cpp b/gases.cpp index dea1e551..924be9b8 100644 --- a/gases.cpp +++ b/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 p(name1, name2); std::map, 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/read.cpp b/read.cpp index 1b0bb84d..3ed98d7c 100644 --- a/read.cpp +++ b/read.cpp @@ -2626,11 +2626,8 @@ read_gas_binary_parameters(void) } if (!error) { - std::pair 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 {