From c960e059fb00df51df23e96496506384736fd914 Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Wed, 7 Apr 2021 12:35:35 -0600 Subject: [PATCH] builds on vs2005; still needs to initialize class pitz_param* aphi --- Phreeqc.h | 4 ++-- global_structures.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Phreeqc.h b/Phreeqc.h index e71d5597..e1a30274 100644 --- a/Phreeqc.h +++ b/Phreeqc.h @@ -1615,7 +1615,7 @@ protected: PHRQMemHeader* s_pTail; /* Basic */ - PBasic* basic_interpreter = NULL; + PBasic* basic_interpreter; double (*basic_callback_ptr) (double x1, double x2, const char* str, void* cookie); void* basic_callback_cookie; @@ -1716,7 +1716,7 @@ protected: int use_etheta; LDBLE OTEMP, OPRESS; LDBLE A0; - class pitz_param* aphi = NULL; + class pitz_param* aphi/* = NULL*/; std::vector spec; class species** cations, ** anions, ** neutrals; // pointers to spec int count_cations, count_anions, count_neutrals; diff --git a/global_structures.h b/global_structures.h index b4c41468..1ecb2b82 100644 --- a/global_structures.h +++ b/global_structures.h @@ -763,7 +763,7 @@ public: } const char* name; const char* mole_balance; - int in = FALSE; + int in; int number; class master* primary; class master* secondary; @@ -1236,7 +1236,7 @@ public: varbase = NULL; loopbase = NULL; } - const char* name = NULL; + const char* name; std::string commands; int new_def; void* linebase; @@ -1535,7 +1535,7 @@ public: tot_stag = 0; charge = 0; } - const char* name = NULL; + const char* name; LDBLE tot1, tot2, tot_stag, charge; }; class M_S