From ef0021678399f4031d188b159c31841a9b8831d5 Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Thu, 16 May 2024 01:08:46 +0000 Subject: [PATCH] Squashed 'src/' changes from 07c887a0..cb6d9f49 cb6d9f49 [phreeqci] Fixed phreeqci memory leaks 77df73cf [phreeqci] Fixed memory leak for phreeqci 38a34f79 [phreeqci] Removed trailing whitespace git-subtree-dir: src git-subtree-split: cb6d9f49b0957bc431c0eca2c21711bfde4411e7 --- PBasic.cpp | 4 ++++ PhreeqcKeywords/Keywords.cpp | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/PBasic.cpp b/PBasic.cpp index 8701fde15..f0923558c 100644 --- a/PBasic.cpp +++ b/PBasic.cpp @@ -3247,6 +3247,7 @@ factor(struct LOC_exec * LINK) char* min_name = strexpr(LINK); require(tokrp, LINK); if (parse_all) { + PhreeqcPtr->PHRQ_free(min_name); n.UU.val = 1; break; } @@ -3419,6 +3420,7 @@ factor(struct LOC_exec * LINK) char* min_name = strexpr(LINK); require(tokrp, LINK); if (parse_all) { + PhreeqcPtr->PHRQ_free(min_name); n.UU.val = 1; break; } @@ -3574,6 +3576,7 @@ factor(struct LOC_exec * LINK) char* min_name = strexpr(LINK); require(tokrp, LINK); if (parse_all) { + PhreeqcPtr->PHRQ_free(min_name); n.UU.val = 1; break; } @@ -3668,6 +3671,7 @@ factor(struct LOC_exec * LINK) char* min_name = strexpr(LINK); require(tokrp, LINK); if (parse_all) { + PhreeqcPtr->PHRQ_free(min_name); n.UU.val = 1; break; } diff --git a/PhreeqcKeywords/Keywords.cpp b/PhreeqcKeywords/Keywords.cpp index 8d52bb262..8b0e8c000 100644 --- a/PhreeqcKeywords/Keywords.cpp +++ b/PhreeqcKeywords/Keywords.cpp @@ -229,12 +229,12 @@ std::map::value_type(Keywords::KEY_RATE_P std::map::value_type(Keywords::KEY_RATE_PARAMETERS_SVD, "RATE_PARAMETERS_SVD"), std::map::value_type(Keywords::KEY_RATE_PARAMETERS_HERMANSKA, "RATE_PARAMETERS_HERMANSKA"), std::map::value_type(Keywords::KEY_MEAN_GAMMAS, "RATE_MEAN_GAMMAS"), -std::map::value_type(Keywords::KEY_SOLUTION_MIX, "SOLUTION_MIX"), -std::map::value_type(Keywords::KEY_EXCHANGE_MIX, "EXCHANGE_MIX"), -std::map::value_type(Keywords::KEY_GAS_PHASE_MIX, "GAS_PHASE_MIX"), -std::map::value_type(Keywords::KEY_KINETICS_MIX, "KINETICS_MIX"), +std::map::value_type(Keywords::KEY_SOLUTION_MIX, "SOLUTION_MIX"), +std::map::value_type(Keywords::KEY_EXCHANGE_MIX, "EXCHANGE_MIX"), +std::map::value_type(Keywords::KEY_GAS_PHASE_MIX, "GAS_PHASE_MIX"), +std::map::value_type(Keywords::KEY_KINETICS_MIX, "KINETICS_MIX"), std::map::value_type(Keywords::KEY_PPASSEMBLAGE_MIX, "EQUILIBRIUM_PHASES_MIX"), -std::map::value_type(Keywords::KEY_SSASSEMBLAGE_MIX, "SOLID_SOLUTIONS_MIX"), -std::map::value_type(Keywords::KEY_SURFACE_MIX, "SURFACE_MIX") +std::map::value_type(Keywords::KEY_SSASSEMBLAGE_MIX, "SOLID_SOLUTIONS_MIX"), +std::map::value_type(Keywords::KEY_SURFACE_MIX, "SURFACE_MIX") }; const std::map Keywords::phreeqc_keyword_names(temp_keyword_names, temp_keyword_names + sizeof temp_keyword_names / sizeof temp_keyword_names[0]);