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

length argument needed for callback.

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9435 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2015-03-30 18:38:56 +00:00
parent 9ca2302555
commit b255de1643
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Phreeqc.h
View File

@ -89,7 +89,7 @@ public:
#ifdef IPHREEQC_NO_FORTRAN_MODULE
void register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, char *str, size_t l));
#else
void register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, char *str));
void register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, char *str, int l));
#endif
LDBLE activity(const char *species_name);
@ -1725,7 +1725,7 @@ protected:
#ifdef IPHREEQC_NO_FORTRAN_MODULE
double (*basic_fortran_callback_ptr) (double *x1, double *x2, char *str, size_t l);
#else
double (*basic_fortran_callback_ptr) (double *x1, double *x2, char *str);
double (*basic_fortran_callback_ptr) (double *x1, double *x2, char *str, int l);
#endif
/* cl1.cpp ------------------------------- */

4
basicsubs.cpp
View File

@ -3918,7 +3918,7 @@ basic_callback(double x1, double x2, char * str)
#ifdef IPHREEQC_NO_FORTRAN_MODULE
return (*basic_fortran_callback_ptr) (&local_x1, &local_x2, str, (int) strlen(str));
#else
return (*basic_fortran_callback_ptr) (&local_x1, &local_x2, str);
return (*basic_fortran_callback_ptr) (&local_x1, &local_x2, str, (int) strlen(str));
#endif
}
return 0;
@ -3939,7 +3939,7 @@ Phreeqc::register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2,
#else
void
Phreeqc::register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, char *str))
Phreeqc::register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, char *str, int l))
{
this->basic_fortran_callback_ptr = fcn;
}