From f100f492a5750d4998da1daa4a3e9b14b245a0e8 Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Thu, 18 Apr 2024 21:17:18 +0000 Subject: [PATCH] Squashed 'phreeqcpp/' changes from 89d028d..0243c90 0243c90 Updated to build in vs2005 git-subtree-dir: phreeqcpp git-subtree-split: 0243c905af6767a3777640ad6b89de56ec5ab4b7 --- integrate.cpp | 2 +- transport.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/integrate.cpp b/integrate.cpp index f2123696..200909d2 100644 --- a/integrate.cpp +++ b/integrate.cpp @@ -1115,7 +1115,7 @@ calc_psi_avg(cxxSurfaceCharge *charge_ptr, LDBLE surf_chrg_eq, LDBLE nDbl, LDBLE { if (!surf_ptr->Donnan_factors.empty()) { - std::copy(std::begin(surf_ptr->Donnan_factors), std::end(surf_ptr->Donnan_factors), cgc); + std::copy(surf_ptr->Donnan_factors.begin(), surf_ptr->Donnan_factors.end(), cgc); z1 = cgc[0]; z2 = cgc[1]; z_1 = cgc[2]; diff --git a/transport.cpp b/transport.cpp index d6b0535c..109fd662 100644 --- a/transport.cpp +++ b/transport.cpp @@ -6089,8 +6089,8 @@ viscosity(cxxSurface *surf_ptr) s_charge_p = surf_ptr->Get_surface_charges()[i1]; l_water = s_charge_p.Get_mass_water(); z_g_map.insert(s_charge_p.Get_z_gMCD_map().begin(), s_charge_p.Get_z_gMCD_map().end()); - for (auto& x : z_g_map) - x.second *= ratio_surf_aq; + for (std::map::iterator x = z_g_map.begin(); x != z_g_map.end(); ++x) + x->second *= ratio_surf_aq; } else { @@ -6099,11 +6099,11 @@ viscosity(cxxSurface *surf_ptr) for (i = 1; i < i1_last - 1; i++) { s_charge_p = surf_ptr->Get_surface_charges()[i]; - for (auto& x : z_g_map) - x.second += s_charge_p.Get_z_gMCD_map()[x.first]; + for (std::map::iterator x = z_g_map.begin(); x != z_g_map.end(); ++x) + x->second += s_charge_p.Get_z_gMCD_map()[x->first]; } - for (auto& x : z_g_map) - x.second *= ratio_surf_aq; + for (std::map::iterator x = z_g_map.begin(); x != z_g_map.end(); ++x) + x->second *= ratio_surf_aq; l_water = mass_water_surfaces_x; } l_mu_x = eq_plus = eq_min = 0;