max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed all fortran string length parameters to be size_t

Browse Source 
simplified fortran wrappers for windows


git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9015 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2014-10-29 01:59:37 +00:00
parent eb41112a91
commit a28ca9a300
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Phreeqc.h
View File

@ -86,7 +86,7 @@ public:
void basic_free(void);
double basic_callback(double x1, double x2, char * str);
void register_basic_callback(double ( *fcn)(double x1, double x2, const char *str, void *cookie), void *cookie1);
void register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, char *str, int l));
void register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, char *str, size_t l));
LDBLE activity(const char *species_name);
LDBLE activity_coefficient(const char *species_name);
@ -1712,7 +1712,7 @@ protected:
PBasic * basic_interpreter;
double (*basic_callback_ptr) (double x1, double x2, const char *str, void *cookie);
void *basic_callback_cookie;
double (*basic_fortran_callback_ptr) (double *x1, double *x2, char *str, int l);
double (*basic_fortran_callback_ptr) (double *x1, double *x2, char *str, size_t l);
/* cl1.cpp ------------------------------- */
LDBLE *x_arg, *res_arg, *scratch;

2
basicsubs.cpp
View File

@ -3663,7 +3663,7 @@ Phreeqc::register_basic_callback(double (*fcn)(double x1, double x2, const char
}
void
Phreeqc::register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, char *str, int l))
Phreeqc::register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, char *str, size_t l))
{
this->basic_fortran_callback_ptr = fcn;
}